From f56d4941eef3f0304c6cf1a8a84b2aac19ea6016 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 19 Dec 2023 17:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductscrapRequestDetailServiceImpl.java | 2 +- .../ProductscrapRequestMainServiceImpl.java | 39 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java index 25dc7d2b..f4c3b9df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java @@ -139,7 +139,7 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest // 校验--工位基础信息 if(StringUtils.isNotEmpty(detailCreateReqVO.getWorkStationCode())){ WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailCreateReqVO.getWorkStationCode(), productscrapRequestMainDO.getWorkshopCode(), detailCreateReqVO.getProductionLineCode()); - detailCreateReqVO.setFromLocationCode(workstationDO.getFgLocationCode()); + detailCreateReqVO.setFromLocationCode(workstationDO.getRawLocationCode()); } // 校验--uom // validatorUom(detailCreateReqVO.getUom(), itembasic.getUom()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java index 03d97455..012673ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java @@ -179,26 +179,27 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa RawscrapRecordDetailDO rawscrapRecordDetailDO = RawscrapRecordDetailConvert.INSTANCE.convert(rawscrapRequestDetailDO); rawscrapRecordDetailDO.setMasterId(productscrapRecordDetailDO.getId()); rawscrapRecordDetailMapper.insert(rawscrapRecordDetailDO); + //添加库存事务list + TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); + BeanUtils.copyProperties(productscrapRecordDetailDO, transactionCreateReqVO); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); + transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); + transactionCreateReqVO.setItemCode(rawscrapRecordDetailDO.getItemCode()); + transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); + transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); + transactionCreateReqVO.setBusinessType(productscrapRecordMainDO.getBusinessType()); + transactionCreateReqVO.setOwnerCode(productscrapRecordDetailDO.getFromOwnerCode()); + transactionCreateReqVO.setRecordNumber(number); + transactionCreateReqVO.setId(null); + transactionCreateReqVO.setPackingNumber(rawscrapRecordDetailDO.getPackingNumber()); + transactionCreateReqVO.setBatch(rawscrapRecordDetailDO.getBatch()); + transactionCreateReqVO.setInventoryStatus(rawscrapRecordDetailDO.getInventoryStatus()); + transactionCreateReqVO.setContainerNumber(productscrapRecordDetailDO.getContainerNumber()); + transactionCreateReqVO.setAmount(BigDecimal.ZERO); + transactionCreateReqVO.setWarehouseCode(productscrapRecordMainDO.getFromWarehouseCode()); + transactionCreateReqVO.setLocationCode(productscrapRecordDetailDO.getFromLocationCode()); + transactionCreateReqVOList.add(transactionCreateReqVO); } - //添加库存事务list - TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); - BeanUtils.copyProperties(productscrapRecordDetailDO, transactionCreateReqVO); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); - transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); - transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); - transactionCreateReqVO.setBusinessType(productscrapRecordMainDO.getBusinessType()); - transactionCreateReqVO.setOwnerCode(productscrapRecordDetailDO.getFromOwnerCode()); - transactionCreateReqVO.setRecordNumber(number); - transactionCreateReqVO.setId(null); - transactionCreateReqVO.setPackingNumber(""); - transactionCreateReqVO.setBatch(""); - transactionCreateReqVO.setInventoryStatus(""); - transactionCreateReqVO.setContainerNumber(productscrapRecordDetailDO.getContainerNumber()); - transactionCreateReqVO.setAmount(BigDecimal.ZERO); - transactionCreateReqVO.setWarehouseCode(productscrapRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVO.setLocationCode(productscrapRecordDetailDO.getFromLocationCode()); - transactionCreateReqVOList.add(transactionCreateReqVO); } //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList);