diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index d05c2f3a0..e79777b2d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -391,11 +391,27 @@ public class StructivtServiceImpl implements StructivtService { mp.put("生产时长", json.getString("produce_age")); mp.put("产品实际幅宽", json.getString("width")); mp.put("客户要求幅宽", json.getString("width_standard")); + mp.put("物料标准厚度", json.getString("thickness_request")); mp.put("产品厚度", json.getString("thickness")); mp.put("单位面积重量", json.getString("mass_per_unit_area")); mp.put("净重", json.getString("net_weight")); mp.put("毛重", json.getString("box_weight")); mp.put("长度", json.getString("length")); + mp.put("管件类型", json.getString("paper_type")); + mp.put("管件编码", json.getString("paper_code")); + mp.put("管件描述", json.getString("paper_name")); + if ("1".equals(json.getString("remark"))) { + mp.put("超期原因", "客户原因"); + } else if ("2".equals(json.getString("remark"))) { + mp.put("超期原因", "生产质量原因"); + } else if ("3".equals(json.getString("remark"))) { + mp.put("超期原因", "市场原因"); + } else { + mp.put("超期原因", ""); + } + mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否"); + mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel")); + mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox")); mp.put("接头数", json.getString("joint_type")); mp.put("计划外分切的子卷", json.getString("is_un_plan_production")); String unPlanProductProperty1 = json.getString("un_plan_product_property1"); @@ -414,22 +430,6 @@ public class StructivtServiceImpl implements StructivtService { } mp.put("子卷的物性值2", json.getString("un_plan_product_property2")); mp.put("子卷的物性值3", json.getString("un_plan_product_property3")); - if ("1".equals(json.getString("remark"))) { - mp.put("超期原因", "客户原因"); - } else if ("2".equals(json.getString("remark"))) { - mp.put("超期原因", "生产质量原因"); - } else if ("3".equals(json.getString("remark"))) { - mp.put("超期原因", "市场原因"); - } else { - mp.put("超期原因", ""); - } - mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否"); - mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel")); - mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox")); - mp.put("物料标准厚度", json.getString("thickness_request")); - mp.put("管件类型", json.getString("paper_type")); - mp.put("管件编码", json.getString("paper_code")); - mp.put("管件描述", json.getString("paper_name")); list.add(mp); } FileUtil.downloadExcel(list, response);