From 59be7d17fa86099d79aa47113ef0f1877d99af19 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Fri, 11 Jul 2025 10:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RefundGoodsServiceImpl.java | 57 ++++++------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java index 6ff84e1..a934536 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java @@ -118,45 +118,6 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService { drpRefundGoodsDetail.setRefundGoodsCode(drpRefundGoods.getRefundGoodsCode()); this.RefundGoodsDetailMapper.insertRefundGoodsDetail(drpRefundGoodsDetail); } - //出库先关代码 -// OutInventoryAddDTO drpOutInventoryAddDTO = new OutInventoryAddDTO(); -// drpOutInventoryAddDTO.setWarehouseId(content.getRefundWarehouseId()); -// drpOutInventoryAddDTO.setFetchUserId(-1L); -// drpOutInventoryAddDTO.setOutDate(content.getRefundTime()); -// drpOutInventoryAddDTO.setTotalAmount(content.getRefundTotalAmount()); -// drpOutInventoryAddDTO.setTotalNum(content.getRefundTotalNum()); -// drpOutInventoryAddDTO.setOutType(OutInventoryTypeEnum.BACK.key()); -// drpOutInventoryAddDTO.setRemark("退货出库"); -// List outDetailList = new ArrayList<>(); -// Iterator iterator2 = content.getDetailList().iterator(); -// while(iterator2.hasNext()) { -// -// RefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = iterator2.next(); -// OutDetailAddDTO drpOutDetailAddDTO = new OutDetailAddDTO(); -// BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpOutDetailAddDTO, new String[0]); -// drpOutDetailAddDTO.setFetchNum(drpRefundGoodsDetailAddDTO.getRefundNum()); -// outDetailList.add(drpOutDetailAddDTO); -// } -// this.drpOutInventoryService.addCommitOutWarehouse(drpOutInventoryAddDTO); -// drpOutInventoryAddDTO.setDetailList(outDetailList); - ImsOutInventoryAdd imsOutInventoryAdd = new ImsOutInventoryAdd(); - imsOutInventoryAdd.setOutDate(content.getRefundTime()); - imsOutInventoryAdd.setFetchUser(content.getRefundContact()); - imsOutInventoryAdd.setWarehouseId(content.getRefundWarehouseId()); - imsOutInventoryAdd.setOutType(Long.valueOf(OutInventoryTypeEnum.BACK.key())); - imsOutInventoryAdd.setStatus(DrpCommitStatusEnum.COMMIT.key()); - Iterator iterator2 = content.getDetailList().iterator(); - List imsOutInventoryDetailAddList = new ArrayList<>(); - while(iterator2.hasNext()) { - RefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = iterator2.next(); - ImsOutInventoryDetailAdd imsOutInventoryDetailAdd = new ImsOutInventoryDetailAdd(); - imsOutInventoryDetailAdd.setInventoryId(drpRefundGoodsDetailAddDTO.getInventoryId()); - imsOutInventoryDetailAdd.setFetchNum(drpRefundGoodsDetailAddDTO.getRefundNum()); - imsOutInventoryDetailAdd.setIntoDetailId(drpRefundGoodsDetailAddDTO.getIntoDetailId()); - imsOutInventoryDetailAddList.add(imsOutInventoryDetailAdd); - } - imsOutInventoryAdd.setImsOutInventoryDetailAddList(imsOutInventoryDetailAddList); - drpOutInventoryService.insertImsOutInventory( imsOutInventoryAdd); return (new RefundGoodsAddVO()).setRefundGoodsId(drpRefundGoods.getRefundGoodsId()); } @@ -192,6 +153,24 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService { drpRefundGoodsDetail.setRefundGoodsCode(drpRefundGoods.getRefundGoodsCode()); this.RefundGoodsDetailMapper.insertRefundGoodsDetail(drpRefundGoodsDetail); } + ImsOutInventoryAdd imsOutInventoryAdd = new ImsOutInventoryAdd(); + imsOutInventoryAdd.setOutDate(content.getRefundTime()); + imsOutInventoryAdd.setFetchUser(content.getRefundContact()); + imsOutInventoryAdd.setWarehouseId(content.getRefundWarehouseId()); + imsOutInventoryAdd.setOutType(Long.valueOf(OutInventoryTypeEnum.BACK.key())); + imsOutInventoryAdd.setStatus(DrpCommitStatusEnum.COMMIT.key()); + Iterator iterator2 = content.getDetailList().iterator(); + List imsOutInventoryDetailAddList = new ArrayList<>(); + while(iterator2.hasNext()) { + RefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = iterator2.next(); + ImsOutInventoryDetailAdd imsOutInventoryDetailAdd = new ImsOutInventoryDetailAdd(); + imsOutInventoryDetailAdd.setInventoryId(drpRefundGoodsDetailAddDTO.getInventoryId()); + imsOutInventoryDetailAdd.setFetchNum(drpRefundGoodsDetailAddDTO.getRefundNum()); + imsOutInventoryDetailAdd.setIntoDetailId(drpRefundGoodsDetailAddDTO.getIntoDetailId()); + imsOutInventoryDetailAddList.add(imsOutInventoryDetailAdd); + } + imsOutInventoryAdd.setImsOutInventoryDetailAddList(imsOutInventoryDetailAddList); + drpOutInventoryService.insertImsOutInventory( imsOutInventoryAdd); return (new RefundGoodsAddVO()).setRefundGoodsId(drpRefundGoods.getRefundGoodsId()); }