Commit 60cefec9 authored by 季圣华's avatar 季圣华
Browse files

给单据增加颜色的展示

parent 38077dff
...@@ -177,6 +177,7 @@ public class DepotItemController { ...@@ -177,6 +177,7 @@ public class DepotItemController {
item.put("name", diEx.getMName()); item.put("name", diEx.getMName());
item.put("standard", diEx.getMStandard()); item.put("standard", diEx.getMStandard());
item.put("model", diEx.getMModel()); item.put("model", diEx.getMModel());
item.put("color", diEx.getMColor());
item.put("materialOther", getOtherInfo(mpArr, diEx)); item.put("materialOther", getOtherInfo(mpArr, diEx));
Integer ratio = diEx.getRatio(); Integer ratio = diEx.getRatio();
BigDecimal stock; BigDecimal stock;
......
...@@ -197,6 +197,7 @@ public class MaterialController { ...@@ -197,6 +197,7 @@ public class MaterialController {
item.put("categoryName", material.getCategoryName()); item.put("categoryName", material.getCategoryName());
item.put("standard", material.getStandard()); item.put("standard", material.getStandard());
item.put("model", material.getModel()); item.put("model", material.getModel());
item.put("color", material.getColor());
item.put("unit", material.getCommodityUnit() + ratio); item.put("unit", material.getCommodityUnit() + ratio);
item.put("sku", material.getSku()); item.put("sku", material.getSku());
item.put("enableSerialNumber", material.getEnableSerialNumber()); item.put("enableSerialNumber", material.getEnableSerialNumber());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment