update 到货单，修改批次信息查询方法，按照批次号排序

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);
 }

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;
     }

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>