From 7a381c4d68d09603eecc3b9cd3af64fc1fce6166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Wed, 12 Mar 2025 11:41:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=8B=E5=8F=91=E5=8F=96=E9=98=B6?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/data/MaterialShipRequestDetail.java | 13 +++++++++++-- zi-wms-environment/builders/package_dev.bat | 2 +- .../com/cim/idm/controller/SAPToWMSController.java | 9 +++++++++ .../cim/idm/service/Impl/InvoiceServiceImpl.java | 8 ++++++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java index 0a4cc84..df742d8 100644 --- a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java +++ b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java @@ -164,6 +164,8 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo @UserColumnMark private String charge; @UserColumnMark + private String phase; + @UserColumnMark private String erpLocation; @UserColumnMark private String reasonCode; @@ -255,6 +257,13 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo public void setCharge(String charge) { this.charge = charge; } + + public String getPhase() { + return phase; + } + public void setPhase(String phase) { + this.phase = phase; + } public String getErpLocation() { return erpLocation; } @@ -304,6 +313,6 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo public void setErpFactoryName(String erpFactoryName) { this.erpFactoryName = erpFactoryName; } - - + + } diff --git a/zi-wms-environment/builders/package_dev.bat b/zi-wms-environment/builders/package_dev.bat index b541c26..d48b776 100644 --- a/zi-wms-environment/builders/package_dev.bat +++ b/zi-wms-environment/builders/package_dev.bat @@ -3,7 +3,7 @@ rem --------------------------------------------------------------------------- rem deploy script for the MWMS Server rem --------------------------------------------------------------------------- setlocal -set "RAR=D:\Program Files\7-Zip\7z.exe" +set "RAR=C:\Program Files\7-Zip\7z.exe" set "WMS_VERSION=1.0.0" rem Guess WORKSPACE_HOME if not defined diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java index 5e4cda9..a7738ff 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java @@ -1087,6 +1087,13 @@ public class SAPToWMSController { IDMFrameServiceProxy.getSqlTemplate().update(sql, obj); }else { + // 根据料号获取阶段 + String materialSql = "SELECT m.PHASE FROM MATERIALSPEC m WHERE MATERIALSPECNAME = :MATERIALSPECNAME"; + Map materialMap= new HashMap(); + materialMap.put("MATERIALSPECNAME", materialSpecName); + List> phaseList = IDMFrameServiceProxy.getSqlTemplate().queryForList(materialSql, materialMap); + String phase = phaseList.get(0).get("PHASE") != null ? phaseList.get(0).get("PHASE").toString() : ""; + String sqlItemCheck ="SELECT * FROM materialshiprequestdetail WHERE shiprequestname =:SHIPREQUESTNAME and shiprequestdetailname = :SHIPREQUESTDETAILNAME"; Map selectItemMap= new HashMap(); @@ -1133,6 +1140,7 @@ public class SAPToWMSController { bindMapItem.put("receiveSalesOrderDetailNo", receiveSalesOrderDetailNo); bindMapItem.put("causeOfMovement", causeOfMovement); bindMapItem.put("goalMaterialSpec", ummat); + bindMapItem.put("phase", phase); createInfo.setUserColumns(bindMapItem); EventInfo eventInfo = new EventInfo(); @@ -1172,6 +1180,7 @@ public class SAPToWMSController { bindMapItem.put("receiveSalesOrderDetailNo", receiveSalesOrderDetailNo); bindMapItem.put("causeOfMovement", causeOfMovement); bindMapItem.put("goalMaterialSpec", ummat); + bindMapItem.put("phase", phase); nonPrimaryKeyValueInfo.setUserColumns(bindMapItem); EventInfo eventInfo = new EventInfo(); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java index 1c9d2dd..01f2ffd 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java @@ -1094,7 +1094,9 @@ public class InvoiceServiceImpl implements InvoiceService { // BigDecimal QTY = new BigDecimal(materialQuantity); String updateSql= " UPDATE MATERIALSHIPREQUESTDETAIL m SET m.ASSIGNEDQUANTITY = m.ASSIGNEDQUANTITY + :QTY WHERE m.SITENAME = :SITENAME" + " AND m.SHIPREQUESTNAME = :SHIPREQUESTNAME AND m.MATERIALSPECNAME = :MATERIALSPECNAME " - + " AND (:SDK_ID IS NULL OR SDK_ID = :SDK_ID) AND (:PHASE IS NULL OR PHASE = :PHASE) AND ROWNUM = 1 "; + + " AND (:SDK_ID IS NULL OR SDK_ID = :SDK_ID) " + +// "AND (:PHASE IS NULL OR PHASE = :PHASE) " + + "AND ROWNUM = 1 "; Map bindMap = new HashMap(); bindMap.put("QTY", queryForList.get(0).get("MATERIALQUANTITY").toString()); bindMap.put("SITENAME", siteName); @@ -1161,7 +1163,9 @@ public class InvoiceServiceImpl implements InvoiceService { String updateSql= " UPDATE MATERIALSHIPREQUESTDETAIL m SET m.ASSIGNEDQUANTITY = m.ASSIGNEDQUANTITY - :QTY WHERE m.SITENAME = :SITENAME" + " AND m.SHIPREQUESTNAME = :SHIPREQUESTNAME AND m.MATERIALSPECNAME = :MATERIALSPECNAME " - + "AND (:SDK_ID IS NULL OR SDK_ID = :SDK_ID) AND (:PHASE IS NULL OR PHASE = :PHASE) AND ROWNUM = 1 "; + + "AND (:SDK_ID IS NULL OR SDK_ID = :SDK_ID) " + +// "AND (:PHASE IS NULL OR PHASE = :PHASE)" + + " AND ROWNUM = 1 "; Map bindMap = new HashMap(); //bindMap.put("QTY", materialQuantity2); bindMap.put("QTY", queryForList.get(0).get("MATERIALQUANTITY2").toString());