diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java index 2b047235..7a178016 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java @@ -184,7 +184,7 @@ public class TransferreceiptJobMainController { } @PutMapping("/execute") - @Operation(summary = "执行调拨出库任务主") + @Operation(summary = "执行调拨入库任务主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:execute')") public CommonResult executeTransferreceiptJobMain(@Valid @RequestBody TransferreceiptJobMainUpdateReqVO updateReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index b8a5bf0a..8af4b9d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -292,33 +292,28 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain transferreceiptRecordDetailDO.setToLocationCode(locationDO2.getCode()); transferreceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode()); transferreceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode()); - transferreceiptRecordDetailDO.setInventoryStatus(transferreceiptJobDetailUpdateReqVO.getToInventoryStatus());//toInventoryStatus + transferreceiptRecordDetailDO.setInventoryStatus(transferreceiptJobDetailDO.getInventoryStatus());//toInventoryStatus transferreceiptRecordDetailDO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty());//toQty transferreceiptRecordDetailDOList.add(transferreceiptRecordDetailDO); - //添加库存事务list - BalanceDO balanceDO = balanceMapper.getBalanceQty(transferreceiptRecordDetailDO.getFromPackingNumber(), transferreceiptRecordDetailDO.getItemCode(), transferreceiptRecordDetailDO.getFromBatch(), transferreceiptRecordDetailDO.getInventoryStatus(), transferreceiptRecordDetailDO.getFromLocationCode()); TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); BeanUtils.copyProperties(transferreceiptRecordDetailDO, transactionCreateReqVO); //增加业务类型 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(transferreceiptRecordMainDO.getBusinessType()); - transactionCreateReqVO.setLocationCode(transferreceiptRecordDetailDO.getFromLocationCode()); + transactionCreateReqVO.setLocationCode(transferreceiptRecordDetailDO.getToLocationCode()); transactionCreateReqVO.setOwnerCode(transferreceiptRecordDetailDO.getFromOwnerCode()); - transactionCreateReqVO.setPackingNumber(transferreceiptRecordDetailDO.getFromPackingNumber()); + transactionCreateReqVO.setPackingNumber(transferreceiptRecordDetailDO.getToPackingNumber()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVO.setBatch(transferreceiptRecordDetailDO.getFromBatch()); transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); transactionCreateReqVO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty()); transactionCreateReqVO.setRecordNumber(number); - transactionCreateReqVO.setAmount(balanceDO.getAmount()); - transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVO.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVO.setId(null); + transactionCreateReqVO.setAmount(BigDecimal.ZERO); transactionCreateReqVOList.add(transactionCreateReqVO); // if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { // TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();