From 893e9720eeae0db9edb85b72121711af832d20b4 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Mon, 12 May 2025 19:27:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20=E5=A4=87=E8=B4=A7=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2MES=E5=B7=A5=E5=8D=95=E7=BB=B4=E6=8A=A4=E8=A1=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AFSQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/Impl/InvoiceServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) 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 8143c54..e62b3c1 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 @@ -3051,16 +3051,26 @@ public class InvoiceServiceImpl implements InvoiceService { String ERPRECEIVEFACTORY = receiveList.get(0).get("ERPRECEIVEFACTORY") == null ? "" : receiveList.get(0).get("ERPRECEIVEFACTORY").toString(); //判断是否为MES需要二次接收的物料 - String sqlc=" SELECT e.ENUMVALUE FROM MES_ENUMDEFVALUE e \r\n" + + /*String sqlc=" SELECT e.ENUMVALUE FROM MES_ENUMDEFVALUE e \r\n" + " WHERE e.ENUMNAME ='ConfirmReceiveArea'\r\n" + " AND e.ENUMVALUE in(\r\n" + " SELECT p.AREANAME FROM MES_PRODUCTREQUEST p \r\n" + " WHERE p.PRODUCTREQUESTNAME =(SELECT m.RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m \r\n" + - " WHERE m.SHIPREQUESTNAME=:SHIPREQUESTNAME AND RECEIVEPRODUCTIONORDERNUMBER IS NOT NULL AND ROWNUM=1))"; - - List> src=IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlc, bpc); - - + " WHERE m.SHIPREQUESTNAME=:SHIPREQUESTNAME AND RECEIVEPRODUCTIONORDERNUMBER IS NOT NULL AND ROWNUM=1))";*/ + List> src = new ArrayList>(); + String sqlQuery = " SELECT m.RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m " + + " WHERE m.SHIPREQUESTNAME=:SHIPREQUESTNAME AND RECEIVEPRODUCTIONORDERNUMBER IS NOT NULL AND ROWNUM=1"; + List> materialShipRequestDetailList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlQuery, bpc); + if (null != materialShipRequestDetailList && !materialShipRequestDetailList.isEmpty()){ + String productRequestName = materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER") == null ? "" : materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER").toString(); + String sqlc = " SELECT e.ENUMVALUE FROM ENUMDEFVALUE@MES_PRODUCTREQUEST e \r\n" + + " WHERE e.ENUMNAME ='ConfirmReceiveArea'\r\n" + + " AND e.ENUMVALUE in(\r\n" + + " SELECT p.AREANAME FROM PRODUCTREQUEST@MES_PRODUCTREQUEST p \r\n" + + " WHERE p.PRODUCTREQUESTNAME =:PRODUCTREQUESTNAME)"; + bpc.put("PRODUCTREQUESTNAME", productRequestName); + src = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlc, bpc); + } //MES需要接收，则只抛送数据。 或如果是现场仓,先移到现场仓 if(src.size()>0) { billCode="Y"; From a3cf3bf9b3e8fad2a91a523a5a4b45f8eda8a103 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Mon, 12 May 2025 19:57:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20=E5=A4=87=E8=B4=A7=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2MES?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=BB=B4=E6=8A=A4=E8=A1=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E6=88=AA=E5=8F=96=E5=B7=A5=E5=8D=95=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e62b3c1..121e1c9 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 @@ -3062,7 +3062,7 @@ public class InvoiceServiceImpl implements InvoiceService { " WHERE m.SHIPREQUESTNAME=:SHIPREQUESTNAME AND RECEIVEPRODUCTIONORDERNUMBER IS NOT NULL AND ROWNUM=1"; List> materialShipRequestDetailList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlQuery, bpc); if (null != materialShipRequestDetailList && !materialShipRequestDetailList.isEmpty()){ - String productRequestName = materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER") == null ? "" : materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER").toString(); + String productRequestName = materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER") == null ? "" : materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER").toString().substring(4); String sqlc = " SELECT e.ENUMVALUE FROM ENUMDEFVALUE@MES_PRODUCTREQUEST e \r\n" + " WHERE e.ENUMNAME ='ConfirmReceiveArea'\r\n" + " AND e.ENUMVALUE in(\r\n" + From 1623d00256f88e1df9590e9efce533b8b2dca6c5 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Mon, 12 May 2025 20:01:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20=E5=A4=87=E8=B4=A7=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2MES?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zi-wms-environment/launch/CNMsvr.run.xml | 10 ---------- .../java/com/cim/idm/controller/SaleOutController.java | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 zi-wms-environment/launch/CNMsvr.run.xml diff --git a/zi-wms-environment/launch/CNMsvr.run.xml b/zi-wms-environment/launch/CNMsvr.run.xml deleted file mode 100644 index 70ab03e..0000000 --- a/zi-wms-environment/launch/CNMsvr.run.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java index 34b58e5..f3e4744 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java @@ -1182,6 +1182,6 @@ public class SaleOutController { if (sendERPStockOut == null || "".equals(sendERPStockOut)) { return AjaxResult.me().setSuccess(false).setMessage("过账失败"); } - return AjaxResult.me().setResultObj(null); + return AjaxResult.me().setSuccess(true).setErrorCode(200); } } From 1b730f657f76f44c327b90b5cdbbc79307259403 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Tue, 13 May 2025 09:53:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20ConstantMap=E5=A2=9E=E5=8A=A0MATER?= =?UTF-8?q?IALPACKING=5FSTOCKSTATE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/wmsextend/generic/master/ConstantMap.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/zi-wms-generic/src/main/java/com/cim/idm/wmsextend/generic/master/ConstantMap.java b/zi-wms-generic/src/main/java/com/cim/idm/wmsextend/generic/master/ConstantMap.java index 95bf456..877c032 100644 --- a/zi-wms-generic/src/main/java/com/cim/idm/wmsextend/generic/master/ConstantMap.java +++ b/zi-wms-generic/src/main/java/com/cim/idm/wmsextend/generic/master/ConstantMap.java @@ -335,6 +335,16 @@ public class ConstantMap extends com.cim.idm.wmspackage.generic.master.ConstantM public String BMDT_ManualStockIn_KOSTL = "2000PA0500"; public CharSequence Factory_All = "ALL"; + + /** + * MATERIALPACKING_STOCKSTATE + */ + public String STOCKSTATE_CREATED = "Created"; + public String STOCKSTATE_STOCKED = "Stocked"; + public String STOCKSTATE_STOCKOUT = "StockOut"; + public String STOCKSTATE_RELEASED = "Released"; + + private Map constantDefsMap = new HashMap(); private ApplicationContext ac;