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] =?UTF-8?q?update=20=E5=A4=87=E8=B4=A7=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?MES=E5=B7=A5=E5=8D=95=E7=BB=B4=E6=8A=A4=E8=A1=A8=E4=BF=A1?= =?UTF-8?q?=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";