diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java index 4e89796..95f7383 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java @@ -5981,8 +5981,10 @@ public class ToSAPServiceImpl { item.put("BWART",moveType); item.put("MENGE", mm.get("MATERIALQUANTITY")); item.put("MEINS", mm.get("UNIT")); - item.put("UMMAT_KDAUF", mm.get("OLDSALESHIPREQUESTNAME")); - item.put("UMMAT_KDPOS", mm.get("OLDSALESHIPREQUESTDETAILNAME")); + if ("413E".equals(moveType)) { + item.put("UMMAT_KDAUF", mm.get("OLDSALESHIPREQUESTNAME")); + item.put("UMMAT_KDPOS", mm.get("OLDSALESHIPREQUESTDETAILNAME")); + } String insmk = ""; // if("NG".equals(pqcResult) ){ // insmk = "3"; @@ -5990,12 +5992,21 @@ public class ToSAPServiceImpl { // String insmk = StringUtils.equals(mm.get("OQARESULTSTATE").toString(),"END")?"":"X"; item.put("INSMK", insmk); - if("411E".equals(moveType) || "413E".equals(moveType)) { + /*if("411E".equals(moveType) || "413E".equals(moveType)) { item.put("MAT_KDAUF", mm.get("SALESHIPREQUESTNAME")); // 发货销售订单编码 item.put("MAT_KDPOS", mm.get("SALESHIPREQUESTDETAILNAME")); // 发货销售订单项目编码 } else if("413".equals(moveType) || "413E".equals(moveType)) { item.put("UMMAT_KDAUF", SALESHIPREQUESTNAME); // 发货销售订单编码 item.put("UMMAT_KDPOS", SALESHIPREQUESTDETAILNAME); // 发货销售订单项目编码 + }*/ + + if ("411E".equals(moveType)) { + item.put("MAT_KDAUF", mm.get("OLDSALESHIPREQUESTNAME")); // 发货销售订单编码 + item.put("MAT_KDPOS", mm.get("OLDSALESHIPREQUESTDETAILNAME")); // 发货销售订单项目编码 + } + if ("413".equals(moveType) || "413E".equals(moveType)) { + item.put("MAT_KDAUF", mm.get("SALESHIPREQUESTNAME")); // 发货销售订单编码 + item.put("MAT_KDPOS", mm.get("SALESHIPREQUESTDETAILNAME")); // 发货销售订单项目编码 } itemData.add(item); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java index f30d2dd..02f4b2c 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java @@ -360,6 +360,10 @@ public class MaterialReceiveActController { bindMap.put("stockState", "Created"); bindMap.put("materialPackingName", newBoxId); bindMap.put("charge", boxIds.get(0)); + bindMap.put("materialPackingType", "Box"); + bindMap.put("materialType", materialType); + bindMap.put("createUser", user); + bindMap.put("createTime", DateUtil.now()); CreateInfo createInfo = new CreateInfo(); createInfo.setMaterialPackingName(newBoxId); createInfo.setSiteName(auxiliaryOutIn.getSiteName());