From 5264cf0915ee9901cb9520fdcc6b8cdd5ecd4837 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 20 八月 2025 10:50:03 +0800 Subject: [PATCH] 库存调整功能界面优化 库存调整接口功能开发 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 121 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java index fb49c49..de0ec9c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java @@ -13,10 +13,12 @@ import com.vincent.rsf.server.manager.controller.dto.LocStockDto; import com.vincent.rsf.server.manager.entity.*; import com.vincent.rsf.server.manager.enums.CompanysType; +import com.vincent.rsf.server.manager.enums.OrderSourceType; import com.vincent.rsf.server.manager.enums.OrderType; import com.vincent.rsf.server.manager.enums.OrderWorkType; import com.vincent.rsf.server.manager.service.*; import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl; +import com.vincent.rsf.server.manager.service.impl.TransferItemServiceImpl; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.entity.Fields; import com.vincent.rsf.server.system.service.FieldsItemService; @@ -73,6 +75,16 @@ private WarehouseService warehouseService; @Autowired private CompanysService companysService; + @Autowired + private TransferService transferService; + @Autowired + private TransferItemService transferItemService; + @Autowired + private LocReviseService locReviseService; + @Autowired + private ReviseLogService reviseLogService; + @Autowired + private ReviseLogItemService reviseLogItemService; /** @@ -411,4 +423,113 @@ return R.ok(); } + /** + * @author Ryan + * @date 2025/8/19 + * @description: 璋冩嫈鍗曟嵁鍚屾 + * @version 1.0 + */ + @Override + @Transactional(timeout = 60, rollbackFor = Exception.class) + public R syncTransfer(SyncTransferParams transferParams) { + Transfer transfer = new Transfer(); + WarehouseAreas warehouseAreas = warehouseAreasService + .getOne(new LambdaQueryWrapper<WarehouseAreas>() + .eq(WarehouseAreas::getName, transfer.getOrgAreaName())); + if (Objects.isNull(warehouseAreas)) { + throw new CoolException("鍘熷簱鍖轰笉瀛樺湪锛侊紒"); + } + + WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>() + .eq(WarehouseAreas::getName, transfer.getTarAreaName())); + if (Objects.isNull(warehouseAreas1)) { + throw new CoolException("鐩爣搴撳尯涓嶅瓨鍦紒锛�"); + } + + transfer.setOrgAreaName(warehouseAreas.getName()) + .setOrgAreaId(warehouseAreas.getId()) + .setOrgWareName(warehouseAreas.getWarehouseId$()) + .setOrgWareId(warehouseAreas.getWarehouseId()) + .setTarWareName(warehouseAreas1.getWarehouseId$()) + .setTarAreaName(warehouseAreas1.getName()) + .setTarAreaId(warehouseAreas1.getId()) + .setTarWareName(warehouseAreas1.getWarehouseId$()) + .setTarWareId(warehouseAreas1.getWarehouseId()) + .setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val); + + if (!transferService.save(transfer)) { + throw new CoolException("璋冩嫈鍗曟嵁淇濆瓨澶辫触锛侊紒"); + } + + transferParams.getItems().forEach(item -> { + TransferItem transferItem = new TransferItem(); + BeanUtils.copyProperties(item, transferItem); + Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode())); + if (Objects.isNull(matnr)) { + throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�"); + } + transferItem.setMatnrId(matnr.getId()) + .setTransferId(transfer.getId()) + .setTransferCode(transfer.getCode()); + + if (!transferItemService.save(transferItem)) { + throw new CoolException("璋冩嫈鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�"); + } + }); + + return R.ok(); + } + + /** + * @author Ryan + * @date 2025/8/20 + * @description: 搴撳瓨璋冩暣鍗曞悓姝� + * @version 1.0 + */ + @Override + @Transactional(timeout = 60, rollbackFor = Exception.class) + public R syncLocRevise(SyncLocReviseParams reviseParams) { + LocRevise locRevise = new LocRevise(); + if (Objects.isNull(reviseParams.getAreaName())) { + throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒"); + } + WarehouseAreas warehouseAreas = warehouseAreasService + .getOne(new LambdaQueryWrapper<WarehouseAreas>() + .eq(WarehouseAreas::getName, reviseParams.getAreaName())); + if (Objects.isNull(warehouseAreas)) { + throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�"); + } + locRevise.setAreaName(locRevise.getAreaName()) + .setAreaId(warehouseAreas.getId()); + locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null)); + + if (!locReviseService.save(locRevise)) { + throw new CoolException("搴撳瓨璋冩暣鍗曚繚瀛樺け璐ワ紒锛�"); + } + + reviseParams.getItems().forEach(revise -> { + Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode())); + ReviseLog reviseLog = new ReviseLog(); + BeanUtils.copyProperties(loc, reviseLog); + reviseLog.setReviseId(locRevise.getId()).setReviseCode(locRevise.getCode()); + if (!reviseLogService.save(reviseLog)) { + throw new CoolException("搴撳瓨璋冩暣鍗曚笉鑳戒负绌猴紒锛�"); + } + revise.getItems().forEach(reviseItem -> { + ReviseLogItem logItem = new ReviseLogItem(); + BeanUtils.copyProperties(reviseItem, logItem); + logItem.setLocId(loc.getId()) + .setLocCode(loc.getCode()) + .setId(null) + .setReviseQty(reviseItem.getAnfme()); + + if (!reviseLogItemService.save(logItem)) { + throw new CoolException("璋冩暣搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + }); + }); + + return R.ok(); + } + } -- Gitblit v1.9.1