From e99987296ef9f7e6740de4e89345c7a2089621b5 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 19 Dec 2023 18:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...roductrepairRequestDetailaServiceImpl.java | 2 +- .../ProductrepairRequestMainServiceImpl.java | 39 ++++++++++--------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java index a9ff5e87..e6faa050 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java @@ -101,7 +101,7 @@ public class ProductrepairRequestDetailaServiceImpl implements ProductrepairRequ // 校验--工位基础信息 if(StringUtils.isNotEmpty(detailDo.getWorkStationCode())){ WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailDo.getWorkStationCode(), mainDO.getWorkshopCode(), detailDo.getProductionLineCode()); - detailDo.setFromLocationCode(workstationDO.getFgLocationCode()); + detailDo.setFromLocationCode(workstationDO.getRawLocationCode()); } // 校验--库存余额 TB——>TB1 validateBalance(detailDo,mainDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java index 4a7b5510..b1ce5e48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java @@ -171,25 +171,28 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest ConsumeRecordDetailbDO consumeRecordDetailbDO = ConsumeRecordDetailbConvert.INSTANCE.convert(productrepairRequestDetailbDO); consumeRecordDetailbDO.setMasterId(productrepairRecordDetailDO.getId()); consumeRecordDetailbMapper.insert(consumeRecordDetailbDO); + + //添加库存事务list + TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); + BeanUtils.copyProperties(productrepairRecordDetailDO, transactionCreateReqVO); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); + transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); + transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); + transactionCreateReqVO.setBusinessType(productrepairRecordMainDO.getBusinessType()); + transactionCreateReqVO.setOwnerCode(productrepairRecordDetailDO.getFromOwnerCode()); + transactionCreateReqVO.setItemCode(consumeRecordDetailbDO.getItemCode()); + transactionCreateReqVO.setRecordNumber(number); + transactionCreateReqVO.setId(null); + transactionCreateReqVO.setPackingNumber(consumeRecordDetailbDO.getPackingNumber()); + transactionCreateReqVO.setBatch(consumeRecordDetailbDO.getBatch()); + transactionCreateReqVO.setContainerNumber(null); + transactionCreateReqVO.setAmount(BigDecimal.ZERO); + transactionCreateReqVO.setWarehouseCode(productrepairRecordMainDO.getFromWarehouseCode()); + transactionCreateReqVO.setLocationCode(productrepairRecordDetailDO.getToLocationCode()); + transactionCreateReqVOList.add(transactionCreateReqVO); } - //添加库存事务list - TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); - BeanUtils.copyProperties(productrepairRecordDetailDO, transactionCreateReqVO); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); - transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); - transactionCreateReqVO.setBusinessType(productrepairRecordMainDO.getBusinessType()); - transactionCreateReqVO.setOwnerCode(productrepairRecordDetailDO.getFromOwnerCode()); - transactionCreateReqVO.setRecordNumber(number); - transactionCreateReqVO.setId(null); - transactionCreateReqVO.setPackingNumber(productrepairRecordDetailDO.getPackingNumber()); - transactionCreateReqVO.setBatch(productrepairRecordDetailDO.getBatch()); - transactionCreateReqVO.setContainerNumber(productrepairRecordDetailDO.getContainerNumber()); - transactionCreateReqVO.setAmount(BigDecimal.ZERO); - transactionCreateReqVO.setWarehouseCode(productrepairRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVO.setLocationCode(productrepairRecordDetailDO.getToLocationCode()); - transactionCreateReqVOList.add(transactionCreateReqVO); + } //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList);