From a6caafc3dcb68fb209db30aef18e9608d47fe52a Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Thu, 10 Apr 2025 20:09:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat=20=E6=89=B9=E6=AC=A1=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cim/idm/controller/DeliveryController.java | 2 +- .../idm/controller/MaterialReceiveActController.java | 9 --------- .../src/main/java/com/cim/idm/dao/DeliveryDao.java | 2 +- .../main/java/com/cim/idm/model/dto/PurchaseDto.java | 3 +++ .../cim/idm/model/vo/MaterialReceiveRequestVo.java | 6 ++---- .../java/com/cim/idm/service/IDeliveryService.java | 3 ++- .../cim/idm/service/Impl/DeliveryServiceImpl.java | 5 +++-- .../main/resources/com/cim/idm/dao/DeliveryDao.xml | 12 ++++-------- 8 files changed, 16 insertions(+), 26 deletions(-) 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 @@ - SELECT md.DELIVERYNAME, md.DELIVERYNUM, md.RECEIVEREQUESTNAME, md.MATERIALSPECNAME FROM MATERIALDELIVERYRECEIVE md WHERE md.DELIVERYNAME = #{dto.documentName} + + + SELECT * FROM MATERIALPACKING m + WHERE MATERIALSPECNAME = #{dto.materialSpecName} + + AND PHASE = #{dto.phase} + + + AND RECEIVEREQUESTNAME = #{dto.receiveRequestName} + + + AND SDK_ID = #{dto.sdkId} + + AND STOCKSTATE = 'Created' + + \ No newline at end of file From 72480250c8b4238cc3761ce36749a595a5297685 Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Fri, 11 Apr 2025 13:37:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/constants/receive/IsBatchEnums.java | 17 +++++++++++++++++ .../MaterialReceiveActController.java | 11 +++++++++++ .../main/java/com/cim/idm/dao/DeliveryDao.java | 10 +++++++++- .../idm/model/dto/delivery/DeliveryEditDto.java | 15 +++++++++++++++ .../com/cim/idm/service/IDeliveryService.java | 8 ++++++++ .../idm/service/Impl/DeliveryServiceImpl.java | 15 +++++++++++++-- .../resources/com/cim/idm/dao/DeliveryDao.xml | 6 ++++++ 7 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/receive/IsBatchEnums.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryEditDto.java diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/receive/IsBatchEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/receive/IsBatchEnums.java new file mode 100644 index 0000000..bcf8bba --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/receive/IsBatchEnums.java @@ -0,0 +1,17 @@ +package com.cim.idm.constants.receive; + +import lombok.Getter; + +@Getter +public enum IsBatchEnums { + Y("Y", "是批次"), + N("N", "不是批次"); + + private final String code; + private final String info; + + IsBatchEnums(String code, String info) { + this.code = code; + this.info = info; + } +} 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 a66351b..adc7839 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 @@ -2,8 +2,10 @@ package com.cim.idm.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.cim.idm.constants.delivery.DeliveryStateEnums; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.data.EventInfo; +import com.cim.idm.model.dto.delivery.DeliveryEditDto; import com.cim.idm.model.dto.delivery.StoreDetailDto; import com.cim.idm.model.dto.packing.MaterialPackingListDto; import com.cim.idm.model.po.MaterialReceiveRequest; @@ -540,6 +542,15 @@ public class MaterialReceiveActController { SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoId,commitDate); SDKMaterialPackingServiceImpl.updateStockState( makeEventInfo, undoId,opCode); } + // 到货单据更新状态 + if (Objects.nonNull(materialDelivery)) { + DeliveryEditDto deliveryEditDto = new DeliveryEditDto(); + deliveryEditDto.setDeliveryName(trackOutBoDto.getReceiveRequestName()); + deliveryEditDto.setSiteName(trackOutBoDto.getSiteName()); + // @TODO 完成状态下，更新为 DeliveryStateEnums.FINISH + deliveryEditDto.setDeliveryState(DeliveryStateEnums.DOING.getCode()); + deliveryService.editDelivery(deliveryEditDto); + } return AjaxResult.me().setResultObj(null); } 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 3457b32..4154f1a 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 @@ -34,7 +34,8 @@ public interface DeliveryDao { * 获取采购订单 */ List getReceiveList(@Param("dto") PurchaseDto dto, - @Param("typeList") List typeList); + @Param("typeList") List typeList, + @Param("isBatch") String isBatch); /** * 获取入库详情 @@ -100,4 +101,11 @@ public interface DeliveryDao { * @return 结果 */ int delDeliveryRel(@Param("dto") DeliveryDelDto deliveryDelDto); + + /** + * 更新到货单 + * @param deliveryEditDto 请求 + * @return 结果 + */ + int editDelivery(@Param("dto") DeliveryEditDto deliveryEditDto); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryEditDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryEditDto.java new file mode 100644 index 0000000..30b8567 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryEditDto.java @@ -0,0 +1,15 @@ +package com.cim.idm.model.dto.delivery; + +import lombok.Data; + +@Data +public class DeliveryEditDto { + // siteName + private String siteName; + + // 到货单名称 + private String deliveryName; + + // 到货单状态 + private String deliveryState; +} 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 be10991..6823a9b 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 @@ -2,6 +2,7 @@ package com.cim.idm.service; import com.cim.idm.model.dto.delivery.DeliveryDelDto; import com.cim.idm.model.dto.delivery.DeliveryDto; +import com.cim.idm.model.dto.delivery.DeliveryEditDto; import com.cim.idm.model.dto.delivery.StoreDetailDto; import com.cim.idm.model.po.delivery.MaterialDelivery; import com.cim.idm.model.po.delivery.MaterialDeliveryReceive; @@ -87,4 +88,11 @@ public interface IDeliveryService { * @return 结果 */ int delDelivery(DeliveryDelDto deliveryDelDto); + + /** + * 更新到货单 + * @param deliveryEditDto 请求 + * @return 结果 + */ + int editDelivery(DeliveryEditDto deliveryEditDto); } 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 37dd8d2..b2fc411 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 @@ -2,6 +2,8 @@ package com.cim.idm.service.Impl; import com.alibaba.fastjson.JSON; import com.cim.idm.constants.delivery.DeliveryStateEnums; +import com.cim.idm.constants.delivery.DeliveryTypeEnums; +import com.cim.idm.constants.receive.IsBatchEnums; import com.cim.idm.constants.receive.ReceiveTypeEnums; import com.cim.idm.dao.DeliveryDao; import com.cim.idm.exception.GlobalException; @@ -56,8 +58,12 @@ 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())); + // 区分是辅材还是批次 + String isBatch = IsBatchEnums.N.getCode(); + if (purchaseDto.getDeliveryType().equals(DeliveryTypeEnums.BATCH.getCode())) { + isBatch = IsBatchEnums.Y.getCode(); + } + return new PageInfo<>(deliveryDao.getReceiveList(purchaseDto, ReceiveTypeEnums.getPurchase(), isBatch)); } @Override @@ -114,4 +120,9 @@ public class DeliveryServiceImpl implements IDeliveryService { // 移除到货单 return deliveryDao.delDelivery(deliveryDelDto); } + + @Override + public int editDelivery(DeliveryEditDto deliveryEditDto) { + return deliveryDao.editDelivery(deliveryEditDto); + } } 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 f01d56f..b93b83b 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 @@ -50,6 +50,7 @@ LEFT JOIN MATERIALSPEC ms ON d.MATERIALSPECNAME = ms.MATERIALSPECNAME LEFT JOIN ORG o ON STOCKORGNO = o.ORGNO WHERE m.SITENAME = #{dto.siteName} + ANd ms.is_batch = #{isBatch} AND m.RECEIVEREQUESTTYPE IN #{type} @@ -260,4 +261,9 @@ delete from MATERIALDELIVERYRECEIVE where DELIVERYNAME = #{dto.deliveryName} + + + UPDATE MATERIALDELIVERY SET DELIVERYSTATE = #{dto.deliveryState} + WHERE SITENAME = #{dto.siteName} AND DELIVERYNAME = #{dto.deliveryName} + \ No newline at end of file From a08a86b2bf8104ab69e96dec952ddf62c56fe844 Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Fri, 11 Apr 2025 17:00:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat=20=E8=BE=85=E6=9D=90=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=81=9A=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/controller/DeliveryController.java | 13 +++- .../java/com/cim/idm/dao/DeliveryDao.java | 10 +++ .../com/cim/idm/service/IDeliveryService.java | 11 +++ .../idm/service/Impl/DeliveryServiceImpl.java | 7 +- .../resources/com/cim/idm/dao/DeliveryDao.xml | 73 ++++++++++++++++++- 5 files changed, 110 insertions(+), 4 deletions(-) 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 6f1902d..e93a424 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 @@ -2,6 +2,7 @@ package com.cim.idm.controller; import com.alibaba.fastjson.JSONObject; import com.cim.idm.constants.delivery.DeliveryStateEnums; +import com.cim.idm.constants.delivery.DeliveryTypeEnums; import com.cim.idm.exception.GlobalException; import com.cim.idm.model.dto.delivery.DeliveryDelDto; import com.cim.idm.model.dto.delivery.DeliveryDto; @@ -85,8 +86,16 @@ public class DeliveryController { throw new GlobalException("不存在该单据"); } // 获取采购单明细及批次 - return AjaxResult.me().setSuccess(true).setResultObj( - deliveryService.getStoreDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName)); + String deliveryType = params.get("deliveryType"); + if (deliveryType.equals(DeliveryTypeEnums.BATCH.getCode())) { + // 批次 + return AjaxResult.me().setSuccess(true).setResultObj( + deliveryService.getStoreDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName)); + } else { + // 辅材 + return AjaxResult.me().setSuccess(true).setResultObj( + deliveryService.getMaterialDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName)); + } } /** 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 4154f1a..86a6419 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 @@ -43,6 +43,16 @@ public interface DeliveryDao { @MapKey("storeDetail") List> getStoreDetail(@Param("siteName") String siteName, @Param("nameList") List nameList, + @Param("typeList") List typeList, + @Param("deliveryName") String deliveryName); + + /** + * 获取入库详情 + */ + @MapKey("materialDetail") + List> getMaterialDetail(@Param("siteName") String siteName, + @Param("nameList") List nameList, + @Param("typeList") List typeList, @Param("deliveryName") String deliveryName); /** 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 6823a9b..72a3108 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 @@ -14,6 +14,7 @@ import com.cim.idm.model.vo.ReceiveDetailVo; import com.github.pagehelper.PageInfo; import java.util.List; +import java.util.Map; public interface IDeliveryService { /** @@ -40,6 +41,16 @@ public interface IDeliveryService { */ ReceiveDetailVo getStoreDetail(String documentName, String siteName, List nameList, String deliveryName); + /** + * 获取辅材明细及批次 + * @param documentName 单据名称 + * @param siteName 组织 + * @param nameList 名称 + * @param deliveryName 到库单号 + * @return 采购订单 + */ + List> getMaterialDetail(String documentName, String siteName, List nameList, String deliveryName); + /** * 根据 key 获取值 * @param storeDetailDto 单据请求 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 b2fc411..a93232b 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 @@ -70,7 +70,7 @@ public class DeliveryServiceImpl implements IDeliveryService { public ReceiveDetailVo getStoreDetail(String documentName, String siteName, List nameList, String deliveryName) { ReceiveDetailVo receiveDetailVo = new ReceiveDetailVo(); // 采购单明细 - List> storeDetail = deliveryDao.getStoreDetail(siteName, nameList, deliveryName); + List> storeDetail = deliveryDao.getStoreDetail(siteName, nameList, ReceiveTypeEnums.getPurchase(), deliveryName); receiveDetailVo.setStoreDetail(storeDetail); // 批次 List> storeCharge = deliveryDao.getStoreCharge(siteName, documentName); @@ -78,6 +78,11 @@ public class DeliveryServiceImpl implements IDeliveryService { return receiveDetailVo; } + @Override + public List> getMaterialDetail(String documentName, String siteName, List nameList, String deliveryName) { + return deliveryDao.getMaterialDetail(siteName, nameList, ReceiveTypeEnums.getPurchase(), deliveryName); + } + @Override public MaterialDelivery getByKey(StoreDetailDto storeDetailDto) { return deliveryDao.getByKey(storeDetailDto); 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 b93b83b..2a181ba 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 @@ -164,7 +164,78 @@ #{name} AND m.SITENAME = #{siteName} - AND m2.RECEIVEREQUESTTYPE IN ( 'ZK4A', '45', '4C', 'Z001', 'Z002', 'Z003', 'Z004' ) + AND m2.RECEIVEREQUESTTYPE IN + + #{type} + + + + +