feat 批次详情

zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java

@@ -86,7 +86,7 @@ public class DeliveryController {
 		}
 		// 获取采购单明细及批次
 		return AjaxResult.me().setSuccess(true).setResultObj(
-				deliveryService.getStoreDetail(storeDetailDto.getSiteName(), nameList, deliveryName));
+				deliveryService.getStoreDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName));
 	}
 
 	/**

zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java

@@ -176,15 +176,6 @@ public class MaterialReceiveActController {
 		String receiveRequestDetailName = box.getReceiveRequestDetailName();
 		// 单据
 		String receiveRequestName = boxs.getReceiveRequestName();
-		// 判断是否是倒库单据
-		/*MaterialReceiveRequest byKey = deliveryService.getByKey(boxs.getSiteName(), boxs.getReceiveRequestName());
-		if (byKey.getReceiveRequestType().equals(ReceiveTypeEnums.DK.getCode())) {
-			// 检索该到库订单下该物料的采购订单的 name
-			List<MaterialReceiveRequest> collect = deliveryService.getReceiveByDelivery(boxs.getSiteName(), boxs.getReceiveRequestName())
-					.stream().filter(item -> item.getMaterialSpecName().equals(materialSpecName)).collect(Collectors.toList());
-			// 检查剩余数量
-			// @TODO
-		}*/
 		String remark = box.getRemark();
 		String sdkid = box.getSdkid() == null ? "" : box.getSdkid();
 		String shipRequestDetailName = box.getShipRequestDetailName();

zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java

@@ -49,7 +49,7 @@ public interface DeliveryDao {
      */
     @MapKey("storeCharge")
     List<Map<String, Object>> getStoreCharge(@Param("siteName") String siteName,
-                                             @Param("nameList") List<String> nameList);
+                                             @Param("documentName") String documentName);
 
     /**
      * 根据 key 获取值

zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java

@@ -27,4 +27,7 @@ public class PurchaseDto {
 
 	// 结束时间
 	private String toDate;
+
+	// 到货单类型
+	private String deliveryType;
 }

zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java

@@ -30,11 +30,9 @@ public class MaterialReceiveRequestVo {
 	// 组织(CN)
 	private String orgName;
 	// 料号
-	private String materialSpecName;
+//	private String materialSpecName;
 	// 品名
-	private String descCn;
+//	private String descCn;
-	// 创建日期
-	private String createTime;
 	// 订单状态
 	private String receiveRequestState;
 

zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java

@@ -31,12 +31,13 @@ public interface IDeliveryService {
 
     /**
      * 获取采购单明细及批次
+     * @param documentName 单据名称
      * @param siteName 组织
      * @param nameList 名称
      * @param deliveryName 到库单号
      * @return 采购订单
      */
-    ReceiveDetailVo getStoreDetail(String siteName, List<String> nameList, String deliveryName);
+    ReceiveDetailVo getStoreDetail(String documentName, String siteName, List<String> nameList, String deliveryName);
 
     /**
      * 根据 key 获取值

zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java

@@ -56,17 +56,18 @@ public class DeliveryServiceImpl implements IDeliveryService {
     public PageInfo<MaterialReceiveRequestVo> getReceiveList(PageDto dto) {
         PageMethod.startPage(dto.getPageNum(), dto.getPageSize());
         PurchaseDto purchaseDto = JSON.toJavaObject(dto.getParams(), PurchaseDto.class);
+        // @TODO 区分辅材和批次
         return new PageInfo<>(deliveryDao.getReceiveList(purchaseDto, ReceiveTypeEnums.getPurchase()));
     }
 
     @Override
-    public ReceiveDetailVo getStoreDetail(String siteName, List<String> nameList, String deliveryName) {
+    public ReceiveDetailVo getStoreDetail(String documentName, String siteName, List<String> nameList, String deliveryName) {
         ReceiveDetailVo receiveDetailVo = new ReceiveDetailVo();
         // 采购单明细
         List<Map<String, Object>> storeDetail = deliveryDao.getStoreDetail(siteName, nameList, deliveryName);
         receiveDetailVo.setStoreDetail(storeDetail);
         // 批次
-        List<Map<String, Object>> storeCharge = deliveryDao.getStoreCharge(siteName, nameList);
+        List<Map<String, Object>> storeCharge = deliveryDao.getStoreCharge(siteName, documentName);
         receiveDetailVo.setStoreCharge(storeCharge);
         return receiveDetailVo;
     }

zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml

@@ -28,9 +28,8 @@
         <result property="supplierName" column="SUPPLIERNAME" />
         <result property="erpFactory" column="ERPFACTORY" />
         <result property="orgName" column="ORGNAME" />
-        <result property="materialSpecName" column="MATERIALSPECNAME" />
+<!--        <result property="materialSpecName" column="MATERIALSPECNAME" />-->
-        <result property="descCn" column="DESC_CN" />
+<!--        <result property="descCn" column="DESC_CN" />-->
-        <result property="createTime" column="CREATETIME" />
         <result property="receiveRequestState" column="RECEIVEREQUESTSTATE" />
         <result property="oemSiteName" column="OEMSITENAME" />
         <result property="oemSiteInCharge" column="OEMSITEINCHARGE" />
@@ -42,7 +41,7 @@
     <select id="getReceiveList" resultMap="MaterialReceiveRequestVo">
         SELECT DISTINCT m.SITENAME, m.RECEIVEREQUESTNAME, m.RECEIVEREQUESTTYPE, m.ORDERDATE, m.SUPPLIERNO,
                         m.LASTEVENTNAME, m.LASTEVENTTIME, m.LASTEVENTUSER, m.LASTEVENTCOMMENT, s.SUPPLIERNAME,
-                        STOCKORGNO ERPFACTORY, o.ORGNAME, ms.MATERIALSPECNAME, ms.DESC_CN, d.CREATETIME,
+                        STOCKORGNO ERPFACTORY, o.ORGNAME,
                         CASE WHEN m.RECEIVEREQUESTSTATE = 'Completed' THEN '完成' ELSE '未完成' END RECEIVEREQUESTSTATE,
                         m.OEMSITENAME, m.OEMSITEINCHARGE, m.LASTEVENTTIMEKEY, m.SYSTEMTYPE, m.PURCHASEORDERGROUP
         FROM MATERIALRECEIVEREQUEST m
@@ -183,10 +182,7 @@
                 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 in
+            AND A.RECEIVEREQUESTNAME = #{documentName}
-            <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
-                #{name}
-            </foreach>
             AND A.STOCKSTATE = 'Created'
             ORDER BY A.MATERIALSPECNAME, A.SDK_ID, A.PHASE
         ) TTT