From e9514e252df6744dcd1aaae79de9b33d37957238 Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Mon, 31 Mar 2025 14:30:15 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=90=88=E5=B9=B6=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/com/cim/idm/dao/DeliveryDao.xml | 53 +++++++++++++------
 1 file changed, 36 insertions(+), 17 deletions(-)

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 d119825..eb921e5 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
@@ -49,22 +49,31 @@
                     #{name}
                 </foreach>
             GROUP BY m5.MATERIALSPECNAME, m5.RECEIVEREQUESTNAME, m5.SDK_ID, m5.phase
+        ),
+        MAIN AS (
+            SELECT m.MATERIALSPECNAME,
+            SUM( m.REQUESTQUANTITY ) REQUESTQUANTITY,
+            SUM( m.RECEIVEDQUANTITY ) RECEIVEDQUANTITY,
+            SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS RECEIVEDQUANTITY2,
+            SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS MINUSQTY
+            FROM MATERIALRECEIVEREQUESTDETAIL m
+            WHERE RECEIVEREQUESTNAME in
+            <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
+                #{name}
+            </foreach>
+            GROUP BY m.MATERIALSPECNAME
         )
-        SELECT m3.WIDTH AS DESCRIPTION, be.DESCRIPTION AS ERPLOCATION2, m.ERPLOCATION, o.ORGNAME AS ERPFACTORY2,
-                m2.STOCKORGNO AS ERPFACTORY, sss.DESCRIPTION AS LOCATIONNAME2, m.LOCATIONNAME, m2.SUPPLIERNO,
-                '1' RECEIVEREQUESTDETAILNAME, SUM( m.REQUESTQUANTITY ) REQUESTQUANTITY, SUM( m.RECEIVEDQUANTITY ) RECEIVEDQUANTITY,
-                SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS RECEIVEDQUANTITY2,
-                SUM( m.REQUESTQUANTITY - m.RECEIVEDQUANTITY ) AS MINUSQTY, NVL( MAX( BB.QTY ), 0 ) CREATEQTY,
-                NVL( MAX( AA.QTY ), 0 ) STOCKINQTY, m3.DESC_CN, m.MATERIALUNIT, M3.MATERIALUNITDESC,
-                CASE WHEN m3.EXPIRATION_RULES = '0' THEN '入厂保质期'
-                    WHEN m3.EXPIRATION_RULES = '1' THEN '出厂保质期' ELSE '未定义'
-                    END AS REPLACED_VALUE,
-                m.SDK_ID, m3.WIDTH SPECNAME, m3.PHASE, m.MATERIALSPECNAME, m.SITENAME, m.RECEIVEREQUESTNAME,
-                DECODE( m3.IS_BATCH, 'Y', '是' ， '否' ) IS_BATCH, '是' IS_BATCH, DECODE( m4.IQCFLAG, 'Y', '是' ， '否' ) IQCFLAG,
-                max( m.REMARK ) REMARK, max( m.SALESMAN ) SALESPERSON, max( m.SALESASSISTANT ) CAREER_ASSISTANCE,
-                max( m.BUSINESSDIVISION ) BUSINESS_UNIT, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) RECEIVETIME,
-                TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) MAKEDATE
-        FROM MATERIALRECEIVEREQUESTDETAIL m
+        SELECT distinct MAIN.*, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) RECEIVETIME, TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) MAKEDATE, '1' RECEIVEREQUESTDETAILNAME, '是' IS_BATCH,
+        m.MATERIALSPECNAME, m.SITENAME, m.ERPLOCATION, m.LOCATIONNAME, m.MATERIALUNIT, m.SDK_ID,
+        m.REMARK REMARK, m.SALESMAN SALESPERSON, m.SALESASSISTANT CAREER_ASSISTANCE, m.BUSINESSDIVISION BUSINESS_UNIT,
+        m2.STOCKORGNO AS ERPFACTORY, m2.SUPPLIERNO,
+        m3.WIDTH AS DESCRIPTION, m3.MATERIALUNITDESC, m3.WIDTH SPECNAME, m3.PHASE, m3.DESC_CN, DECODE( m3.IS_BATCH, 'Y', '是' , '否' ) IS_BATCH,
+        CASE WHEN m3.EXPIRATION_RULES = '0' THEN '入厂保质期' WHEN m3.EXPIRATION_RULES = '1' THEN '出厂保质期' ELSE '未定义' END AS REPLACED_VALUE,
+        DECODE( m4.IQCFLAG, 'Y', '是', '否' ) IQCFLAG,
+        be.DESCRIPTION AS ERPLOCATION2, o.ORGNAME AS ERPFACTORY2, sss.DESCRIPTION AS LOCATIONNAME2,
+        NVL( BB.QTY, 0 ) CREATEQTY, NVL( AA.QTY, 0 ) STOCKINQTY
+        FROM MAIN
+        LEFT JOIN MATERIALRECEIVEREQUESTDETAIL m ON MAIN.MATERIALSPECNAME = m.MATERIALSPECNAME
         LEFT JOIN MATERIALRECEIVEREQUEST m2 ON m.RECEIVEREQUESTNAME = m2.RECEIVEREQUESTNAME
         LEFT JOIN MATERIALSPEC m3 ON m.MATERIALSPECNAME = m3.MATERIALSPECNAME
         LEFT JOIN BS_MATERIALFACTORY m4 ON m.MATERIALSPECNAME = m4.MATERIALSPECNAME AND m.ERPFACTORY = m4.ERPFACTORY
@@ -118,14 +127,24 @@
     </select>
 
     <select id="getByKey" resultType="com.cim.idm.model.MaterialReceiveRequest">
-        SELECT *
+        SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
+               OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
+               LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
+               ERPID, REMARK, PURCHASER, PURORGNO, ORDERDATE, CLOSERUSER, CLOSEDATE, STOCKORGNO, RETURNFLAG,
+               RECEIVEREQUESTDETAILTYPE, ERPLOCATION, PRODUCTDEPTNO, SOURCEBILLID, EFFECTIVESTARTTIME, EFFECTIVEENDTIME,
+               DELIVERYNAME
         FROM MATERIALRECEIVEREQUEST
         WHERE SITENAME = #{siteName}
         AND RECEIVEREQUESTNAME = #{receiveRequestName}
     </select>
 
     <select id="getReceiveByDelivery" resultType="com.cim.idm.model.MaterialReceiveRequest">
-        SELECT *
+        SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
+               OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
+               LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
+               ERPID, REMARK, PURCHASER, PURORGNO, ORDERDATE, CLOSERUSER, CLOSEDATE, STOCKORGNO, RETURNFLAG,
+               RECEIVEREQUESTDETAILTYPE, ERPLOCATION, PRODUCTDEPTNO, SOURCEBILLID, EFFECTIVESTARTTIME, EFFECTIVEENDTIME,
+               DELIVERYNAME
         FROM MATERIALRECEIVEREQUEST
         WHERE SITENAME = #{siteName}
         AND DELIVERYNAME = #{receiveRequestName}