From 5447059846e7cc13bd719116b4b80def84ba788c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Thu, 24 Apr 2025 09:40:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=8E=B0=E5=9C=BA=E4=BB=93=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=B7=B2=E5=85=A5=E5=BA=93=E7=9A=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/controller/SaleOutController.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) 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 b676935..3e4add3 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 @@ -669,11 +669,22 @@ public class SaleOutController { Map hashMap = new HashMap (); hashMap.put("SHIPREQUESTNAME", shipRequestName); - - String sqlGetBox="SELECT m.MATERIALPACKINGNAME,m.MATERIALQUANTITY,DECODE(NVL(m.MATERIALQUANTITY2,0), 0 ,m.MATERIALQUANTITY,m.MATERIALQUANTITY2) MATERIALQUANTITY2 FROM MATERIALPACKING m \r\n" + - " WHERE m.SHIPREQUESTNAME =:SHIPREQUESTNAME\r\n" + - " AND m.STOCKSTATE ='Stocked'\r\n" + - " AND m.MATERIALQUANTITY2 >0"; + + // 关联详情单据，去除当是现场仓时多余已经入库到现场仓的批次条码 + String sqlGetBox="SELECT\n" + + "m.MATERIALPACKINGNAME,\n" + + "m.MATERIALQUANTITY,\n" + + "DECODE(NVL(m.MATERIALQUANTITY2, 0), 0 , m.MATERIALQUANTITY, m.MATERIALQUANTITY2) MATERIALQUANTITY2\n" + + "FROM\n" + + "MATERIALPACKING m\n" + + "LEFT JOIN MATERIALSHIPREQUESTDETAIL mdl ON\n" + + "mdl.SHIPREQUESTNAME=m.SHIPREQUESTNAME \n" + + "AND mdl.MATERIALSPECNAME = m.MATERIALSPECNAME\n" + + "WHERE\n" + + "m.SHIPREQUESTNAME =:SHIPREQUESTNAME\n" + + "AND m.STOCKSTATE = 'Stocked'\n" + + "AND m.MATERIALQUANTITY2 >0\n" + + "AND (m.ERPLOCATION <> mdl.ERPRECEIVELOCATION OR mdl.ERPRECEIVELOCATION IS NULL)"; List> sr = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlGetBox, hashMap); if(sr.size()>0) {