diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index f6ce0daa..f65eed1f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index 367b6e44..fafea574 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -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());