From f5d105e40b993785a87f802015f5cc33b6a6baad Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Wed, 30 Apr 2025 15:17:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=87=E8=B4=A7=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=82=B9=E5=87=BB=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99MATERIALPACKINGSUB=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cim/idm/controller/SaleOutController.java   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 44a0e8e..6d412df 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
@@ -712,6 +712,7 @@ public class SaleOutController {
 		hashMap.put("SHIPREQUESTNAME", shipRequestName);
 
 		// 关联详情单据，去除当是现场仓时多余已经入库到现场仓的批次条码
+		/*
 		String sqlGetBox="SELECT\n" +
 				"m.MATERIALPACKINGNAME,\n" +
 				"m.MATERIALQUANTITY,\n" +
@@ -726,6 +727,22 @@ public class SaleOutController {
 				"AND m.STOCKSTATE = 'Stocked'\n" +
 				"AND m.MATERIALQUANTITY2 >0\n" +
 				"AND (m.ERPLOCATION <> mdl.ERPRECEIVELOCATION OR mdl.ERPRECEIVELOCATION IS NULL)";
+				*/
+
+		String sqlGetBox = " SELECT m.MATERIALPACKINGNAME,\n" +
+				"       m.MATERIALQUANTITY,\n" +
+				"       DECODE(NVL(m.MATERIALQUANTITY2, 0), 0 , m.MATERIALQUANTITY, m.MATERIALQUANTITY2) MATERIALQUANTITY2\n" +
+				"FROM MATERIALPACKING m\n" +
+				"WHERE " +
+				"m.SHIPREQUESTNAME =:SHIPREQUESTNAME\n" +
+				"AND m.STOCKSTATE = 'Stocked'\n" +
+				"AND m.MATERIALQUANTITY2 > 0\n" +
+				"AND NOT EXISTS (\n" +
+				"    SELECT 1 FROM MATERIALSHIPREQUESTDETAIL mdl\n" +
+				"    WHERE mdl.SHIPREQUESTNAME = m.SHIPREQUESTNAME\n" +
+				"    AND mdl.MATERIALSPECNAME = m.MATERIALSPECNAME\n" +
+				"    AND (m.ERPLOCATION = mdl.ERPRECEIVELOCATION AND mdl.ERPRECEIVELOCATION IS NOT NULL)\n" +
+				") ";
 		List<Map<String, Object>> sr = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlGetBox, hashMap);
 		if(sr.size()>0) 
 		{