From ca8cc399ccf826d33bbf802d84d7bb28cbf4211d Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Wed, 21 May 2025 18:46:50 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E6=AC=A1=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E6=8C=89=E7=85=A7=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cim/idm/dao/DeliveryDao.java     |  7 +++++++
 .../idm/service/Impl/DeliveryServiceImpl.java |  2 +-
 .../resources/com/cim/idm/dao/DeliveryDao.xml | 20 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java
index 1798356..0d64c45 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java
@@ -145,4 +145,11 @@ public interface DeliveryDao {
                                              @Param("nameList") List<String> nameList,
                                              @Param("typeList") List<String> typeList,
                                              @Param("deliveryName") String deliveryName);
+
+    /**
+     * 获取入库批次
+     */
+    @MapKey("storeCharge")
+    List<Map<String, Object>> getStoreChargeSort(@Param("siteName") String siteName,
+                                             @Param("documentName") String documentName);
 }
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java
index 69b7174..61e25ca 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java
@@ -151,7 +151,7 @@ public class DeliveryServiceImpl implements IDeliveryService {
         List<Map<String, Object>> storeDetail = deliveryDao.getDeliveryStoreDetail(siteName, nameList, ReceiveTypeEnums.getPurchase(), deliveryName);
         receiveDetailVo.setStoreDetail(storeDetail);
         // 批次
-        List<Map<String, Object>> storeCharge = deliveryDao.getStoreCharge(siteName, documentName);
+        List<Map<String, Object>> storeCharge = deliveryDao.getStoreChargeSort(siteName, documentName);
         receiveDetailVo.setStoreCharge(storeCharge);
         return receiveDetailVo;
     }
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 b0924de..a3eb8a9 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
@@ -481,4 +481,24 @@
                                                                                       LEFT JOIN CC ON M.DELIVERYNAME = CC.RECEIVEREQUESTNAME AND M.MATERIALSPECNAME = CC.MATERIALSPECNAME
         WHERE M.DELIVERYNAME = #{deliveryName}
     </select>
+    <select id="getStoreChargeSort" resultType="map">
+        SELECT ROWNUM  SEQ, TTT.*
+        FROM (
+                 SELECT A.RECEIVEREQUESTNAME, A.SITENAME, A.MATERIALPACKINGNAME, A.MATERIALSPECNAME, A.ERPLOCATION, A.ERPFACTORY,
+                        A.LOCATIONNAME, A.CHARGE, A.REMARK, B.DESC_CN, B.DESCRIPTION, A.SDK_ID, SS.SPECNAME, A.PHASE,
+                        A.MATERIALQUANTITY, M.FNAME UNIT, BE.DESCRIPTION ERPLOCATIONDESC, S.DESCRIPTION LOCATIONNAMEDESC,
+                        A.ERPFACTORY ERPFACTROY, o.ORGNAME ERPFACTROYDESC, A.SUPPLIERNAME SUPPLIERNO
+                 FROM MATERIALPACKING A
+                          LEFT JOIN MATERIALSPEC B ON A.MATERIALSPECNAME = B.MATERIALSPECNAME
+                          LEFT JOIN SDK_SPEC SS ON A.SDK_ID = SS.SDK_ID
+                          LEFT JOIN BS_ERPLOCATION BE ON BE.ERPLOCATIONNAME = A.ERPLOCATION
+                          LEFT JOIN STORAGESPEC S ON S.STORAGENAME = A.LOCATIONNAME
+                          LEFT JOIN ORG o ON o.ORGNO = A.ERPFACTORY
+                          LEFT JOIN MATERIALUNIT M ON M.FNUMBER = A.UNIT
+                 WHERE A.SITENAME = #{siteName}
+                   AND A.RECEIVEREQUESTNAME = #{documentName}
+                   AND A.STOCKSTATE = 'Created'
+                 ORDER BY A.CHARGE
+             ) TTT
+    </select>
 </mapper>
\ No newline at end of file