diff --git a/src/main/java/com/vverp/service/MaterialOrderService.java b/src/main/java/com/vverp/service/MaterialOrderService.java index 27eb7c6..dcb7740 100644 --- a/src/main/java/com/vverp/service/MaterialOrderService.java +++ b/src/main/java/com/vverp/service/MaterialOrderService.java @@ -1208,6 +1208,9 @@ public class MaterialOrderService extends BaseOrderService lm.put("line",item.get("line")); lm.put("code",item.get("code")); lm.put("longDescription", item.get("longDescription")); + lm.put("diameterL",item.get("diameterL")); + lm.put("diameterS",item.get("diameterS")); + lm.put("jacketSpec",item.get("jacketSpec")); lm.put("needCount", item.get("needCount")); lm.put("preCount", item.get("preCount")); lm.put("errorMessage", item.get("errorMessage")); @@ -1288,6 +1291,9 @@ public class MaterialOrderService extends BaseOrderService map.put("line",item.getLineAccount()); map.put("code",item.getProductCode()); map.put("longDescription",item.getLongDescription()); + map.put("diameterL",item.getDiameterL()); + map.put("diameterS",item.getDiameterS()); + map.put("jacketSpec",item.getJacketSpec()); map.put("needCount",item.getNeedCount()); map.put("preCount",prevCount); map.put("errorMessage","当前阶段较以往阶段采购数量减少"); @@ -1301,6 +1307,9 @@ public class MaterialOrderService extends BaseOrderService map.put("line",item.getLineAccount()); map.put("code",item.getProductCode()); map.put("longDescription",item.getLongDescription()); + map.put("diameterL",item.getDiameterL()); + map.put("diameterS",item.getDiameterS()); + map.put("jacketSpec",item.getJacketSpec()); map.put("needCount",item.getNeedCount()); map.put("preCount",prevCount); map.put("errorMessage","当前阶段较以往阶段采购数量增加"); @@ -1317,6 +1326,9 @@ public class MaterialOrderService extends BaseOrderService map.put("line",item.getLineAccount()); map.put("code",item.getProductCode()); map.put("longDescription",item.getLongDescription()); + map.put("diameterL",item.getDiameterL()); + map.put("diameterS",item.getDiameterS()); + map.put("jacketSpec",item.getJacketSpec()); map.put("needCount",item.getNeedCount()); map.put("preCount",' '); map.put("errorMessage","当前阶段料单新增采购"); @@ -1393,6 +1405,9 @@ public class MaterialOrderService extends BaseOrderService map.put("line", MaterialOrderItemConsts.getPrevStageLineAccount(materialOrder.getIgnoreLineAccount(), entry.getValue().getLineAccount())); map.put("code",entry.getValue().getProductCode()); map.put("longDescription",entry.getValue().getLongDescription()); + map.put("diameterL",entry.getValue().getDiameterL()); + map.put("diameterS",entry.getValue().getDiameterS()); + map.put("jacketSpec",entry.getValue().getJacketSpec()); map.put("needCount",' '); map.put("preCount",prevMap.get(entry.getKey())); map.put("errorMessage","以往阶段已采购,当前阶段没有采购"); diff --git a/src/main/resources/excel/template/specialMO.xlsx b/src/main/resources/excel/template/specialMO.xlsx index 1c1e72b..8cda3a7 100644 Binary files a/src/main/resources/excel/template/specialMO.xlsx and b/src/main/resources/excel/template/specialMO.xlsx differ diff --git a/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html b/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html index 05fd31e..3e63ea1 100644 --- a/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html +++ b/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html @@ -22,7 +22,7 @@ -
+