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] =?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} + + + + +