From 737f74255ec8834b0cbcefe88441fde75d426d73 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Thu, 22 May 2025 13:41:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9C=AA=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/controller/DeliveryController.java | 9 +++++++++ .../java/com/cim/idm/dao/DeliveryDao.java | 11 +++++++++-- .../com/cim/idm/service/IDeliveryService.java | 7 ++++++- .../idm/service/Impl/DeliveryServiceImpl.java | 13 +++++++++++-- .../resources/com/cim/idm/dao/DeliveryDao.xml | 19 +++++++++++++++---- 5 files changed, 50 insertions(+), 9 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 5373899..9470d9b 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 @@ -205,4 +205,13 @@ public class DeliveryController { } return AjaxResult.me().setErrorCode(-1).setMessage("修改失败"); } + + /** + * 获取采购订单详情 + */ + @PostMapping(value = "/getDeliveryReceiveDetail") + public AjaxResult GetDeliveryReceiveDetail(@RequestBody JSONObject in) { + List nameList = (List) in.get("nameList"); + return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getDeliveryReceiveDetail(nameList)); + } } 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 bc9a5fa..55bf78f 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 @@ -109,6 +109,13 @@ public interface DeliveryDao { */ List getReceiveDetail(@Param("nameList") List nameList); + /** + * 根据到库单获取采购单名称 + * @param nameList 到库单 + * @return 采购单名称列表 + */ + List getDeliveryReceiveDetail(@Param("nameList") List nameList); + /** * 获取到货单 * @param dto 请求 @@ -155,8 +162,8 @@ public interface DeliveryDao { /** * 更新入库单数量 - * @param receiveList + * @param relationDto * @return */ - int updateMaterialReceiveRequestDetailQty(@Param("receiveList") List receiveList); + int updateMaterialReceiveRequestDetailQty(@Param("dto") DeliveryRelationDto relationDto); } 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 f7e9469..2ad0651 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 @@ -95,7 +95,12 @@ public interface IDeliveryService { * @return 采购单名称列表 */ List getReceiveDetail(List nameList); - + /** + * 根据到库单获取采购单名称 + * @param nameList 到库单 + * @return 采购单名称列表 + */ + List getDeliveryReceiveDetail(List nameList); /** * 获取到货单 * @param dto 请求 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 0665074..a24daf6 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 @@ -51,9 +51,13 @@ public class DeliveryServiceImpl implements IDeliveryService { throw new GlobalException("添加到库单关系失败"); } //更新采购订单行项的已入库数量 - if (deliveryDao.updateMaterialReceiveRequestDetailQty(res) <= 0){ - throw new GlobalException("更新采购单入库数量失败"); + for (DeliveryRelationDto re : res) { + if (deliveryDao.updateMaterialReceiveRequestDetailQty(re) <= 0){ + throw new GlobalException("更新采购单入库数量失败"); + } } + + // 添加到库单 return deliveryDao.createDelivery(dto, DeliveryStateEnums.CREATE.getCode()); } @@ -124,6 +128,11 @@ public class DeliveryServiceImpl implements IDeliveryService { return deliveryDao.getReceiveDetail(nameList); } + @Override + public List getDeliveryReceiveDetail(List nameList) { + return deliveryDao.getDeliveryReceiveDetail(nameList); + } + @Override public PageInfo getDeliveryList(PageDto dto) { PageMethod.startPage(dto.getPageNum(), dto.getPageSize()); 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 457a1ca..43b62b4 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 @@ -503,9 +503,20 @@ - - update MATERIALRECEIVEREQUESTDETAIL set RECEIVEDQUANTITY = #{item.deliveryNum} where RECEIVEREQUESTNAME = #{item.receiveRequestName} and RECEIVEREQUESTDETAILNAME = #{item.receiveRequestDetailName} and MATERIALSPECNAME = #{item.materialSpecName} - INTO MATERIALDELIVERYRECEIVE (RECEIVEREQUESTNAME, DELIVERYNAME, DELIVERYNUM, MATERIALSPECNAME, RECEIVEREQUESTDETAILNAME) VALUES (#{item.receiveRequestName}, #{item.deliveryName}, #{item.deliveryNum}, #{item.materialSpecName}, #{item.receiveRequestDetailName}) - + UPDATE MATERIALRECEIVEREQUESTDETAIL + SET RECEIVEDQUANTITY = #{dto.deliveryNum} + WHERE RECEIVEREQUESTNAME = #{dto.receiveRequestName} + AND RECEIVEREQUESTDETAILNAME = #{dto.receiveRequestDetailName} + AND MATERIALSPECNAME = #{dto.materialSpecName} + + \ No newline at end of file