Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
60cefec9
Commit
60cefec9
authored
Oct 11, 2021
by
季圣华
Browse files
给单据增加颜色的展示
parent
38077dff
Changes
2
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @
60cefec9
...
...
@@ -177,6 +177,7 @@ public class DepotItemController {
item
.
put
(
"name"
,
diEx
.
getMName
());
item
.
put
(
"standard"
,
diEx
.
getMStandard
());
item
.
put
(
"model"
,
diEx
.
getMModel
());
item
.
put
(
"color"
,
diEx
.
getMColor
());
item
.
put
(
"materialOther"
,
getOtherInfo
(
mpArr
,
diEx
));
Integer
ratio
=
diEx
.
getRatio
();
BigDecimal
stock
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View file @
60cefec9
...
...
@@ -197,6 +197,7 @@ public class MaterialController {
item
.
put
(
"categoryName"
,
material
.
getCategoryName
());
item
.
put
(
"standard"
,
material
.
getStandard
());
item
.
put
(
"model"
,
material
.
getModel
());
item
.
put
(
"color"
,
material
.
getColor
());
item
.
put
(
"unit"
,
material
.
getCommodityUnit
()
+
ratio
);
item
.
put
(
"sku"
,
material
.
getSku
());
item
.
put
(
"enableSerialNumber"
,
material
.
getEnableSerialNumber
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment