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 nameList, @Param("typeList") List typeList, @Param("deliveryName") String deliveryName); + + /** + * 获取入库批次 + */ + @MapKey("storeCharge") + List> 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> storeDetail = deliveryDao.getDeliveryStoreDetail(siteName, nameList, ReceiveTypeEnums.getPurchase(), deliveryName); receiveDetailVo.setStoreDetail(storeDetail); // 批次 - List> storeCharge = deliveryDao.getStoreCharge(siteName, documentName); + List> 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} + \ No newline at end of file