From c7ac79424d2a6a5f9ba496bdda267067d7cfa28b Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Wed, 28 May 2025 19:13:02 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cim/idm/model/vo/DeliveryReceiveDetailVo.java   |  1 +
 .../main/resources/com/cim/idm/dao/DeliveryDao.xml  | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java
index dd9de98..fb813ca 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java
@@ -10,4 +10,5 @@ public class DeliveryReceiveDetailVo {
 	private String materialSpecName;
 	private double requestQuantity;
 	private double deliveryNum;
+	private String description;
 }
diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
index 4cd7814..61a874c 100644
--- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
+++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
@@ -448,8 +448,7 @@
                                                                           LEFT JOIN BS_ERPLOCATION be ON m.ERPLOCATION = be.ERPLOCATIONNAME
                                                                           LEFT JOIN ORG o ON m2.STOCKORGNO  = o.ORGNO
                                                                           LEFT JOIN STORAGESPEC sss ON m.LOCATIONNAME = sss.STORAGENAME
-                WHERE md.DELIVERYNAME = #{deliveryName})
-
+                WHERE md.DELIVERYNAME = #{deliveryName}  AND m2.RECEIVEREQUESTTYPE IN ('Z001', 'Z002', 'Z003','Z004', 'Z005', 'Z006', 'Z007', 'Z008'))
         SELECT M.DELIVERYNAME, M.MATERIALSPECNAME,
                M.RECEIVETIME,
                M.MAKEDATE,
@@ -511,12 +510,14 @@
     </update>
 
     <select id="getDeliveryReceiveDetail" resultType="com.cim.idm.model.vo.DeliveryReceiveDetailVo">
-        SELECT receiveRequestName, materialSpecName, requestQuantity, requestQuantity - receivedQuantity as deliveryNum, RECEIVEREQUESTDETAILNAME
-        FROM MATERIALRECEIVEREQUESTDETAIL
-        WHERE RECEIVEREQUESTNAME in
+        SELECT RD.receiveRequestName, RD.materialSpecName, RD.requestQuantity, RD.requestQuantity - RD.receivedQuantity as deliveryNum, RD.RECEIVEREQUESTDETAILNAME
+        ,MS.DESCRIPTION AS description
+        FROM MATERIALRECEIVEREQUESTDETAIL RD
+        LEFT JOIN MATERIALSPEC MS ON RD.MATERIALSPECNAME = MS.MATERIALSPECNAME
+        WHERE RD.RECEIVEREQUESTNAME in
         <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
             #{name}
         </foreach>
-        order by RECEIVEREQUESTDETAILNAME
+        order by RD.RECEIVEREQUESTDETAILNAME
     </select>
 </mapper>
\ No newline at end of file