diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java index ccecb33..2bf715e 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java +++ b/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)); } /** diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java index 31452a0..796afc8 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java +++ b/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 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(); 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 503324e..f82383c 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 @@ -49,7 +49,7 @@ public interface DeliveryDao { */ @MapKey("storeCharge") List> getStoreCharge(@Param("siteName") String siteName, - @Param("nameList") List nameList); + @Param("documentName") String documentName); /** * 根据 key 获取值 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java index 2b83afd..e437349 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java +++ b/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; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java index 78369ae..abbc8fb 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java +++ b/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 createTime; +// private String descCn; // 订单状态 private String receiveRequestState; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java index 1f2f0a1..e873eb3 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java +++ b/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 nameList, String deliveryName); + ReceiveDetailVo getStoreDetail(String documentName, String siteName, List nameList, String deliveryName); /** * 根据 key 获取值 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 54e6b57..e863f50 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 @@ -56,17 +56,18 @@ public class DeliveryServiceImpl implements IDeliveryService { public PageInfo 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 nameList, String deliveryName) { + public ReceiveDetailVo getStoreDetail(String documentName, String siteName, List nameList, String deliveryName) { ReceiveDetailVo receiveDetailVo = new ReceiveDetailVo(); // 采购单明细 List> storeDetail = deliveryDao.getStoreDetail(siteName, nameList, deliveryName); receiveDetailVo.setStoreDetail(storeDetail); // 批次 - List> storeCharge = deliveryDao.getStoreCharge(siteName, nameList); + List> storeCharge = deliveryDao.getStoreCharge(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 cfc1826..4088b1b 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 @@ -28,9 +28,8 @@ - - - + + @@ -42,7 +41,7 @@