zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调拨入库执行bug修复

master
赵雪冰 2 years ago
parent
07d54e0227
commit
cf569813e3
2 changed files with 6 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java
  2. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java
View File

@ -184,7 +184,7 @@ public class TransferreceiptJobMainController {
} }
@PutMapping("/execute") @PutMapping("/execute")
@Operation(summary = "执行调拨出库任务主") @Operation(summary = "执行调拨入库任务主")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:execute')") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:execute')")
public CommonResult<String> executeTransferreceiptJobMain(@Valid @RequestBody TransferreceiptJobMainUpdateReqVO updateReqVO) { public CommonResult<String> executeTransferreceiptJobMain(@Valid @RequestBody TransferreceiptJobMainUpdateReqVO updateReqVO) {

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java
View File

@ -292,33 +292,28 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain
transferreceiptRecordDetailDO.setToLocationCode(locationDO2.getCode()); transferreceiptRecordDetailDO.setToLocationCode(locationDO2.getCode());
transferreceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode()); transferreceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode());
transferreceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode()); transferreceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
transferreceiptRecordDetailDO.setInventoryStatus(transferreceiptJobDetailUpdateReqVO.getToInventoryStatus());//toInventoryStatus transferreceiptRecordDetailDO.setInventoryStatus(transferreceiptJobDetailDO.getInventoryStatus());//toInventoryStatus
transferreceiptRecordDetailDO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty());//toQty transferreceiptRecordDetailDO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty());//toQty
transferreceiptRecordDetailDOList.add(transferreceiptRecordDetailDO); transferreceiptRecordDetailDOList.add(transferreceiptRecordDetailDO);
//添加库存事务list
BalanceDO balanceDO = balanceMapper.getBalanceQty(transferreceiptRecordDetailDO.getFromPackingNumber(), transferreceiptRecordDetailDO.getItemCode(), transferreceiptRecordDetailDO.getFromBatch(), transferreceiptRecordDetailDO.getInventoryStatus(), transferreceiptRecordDetailDO.getFromLocationCode());
TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
BeanUtils.copyProperties(transferreceiptRecordDetailDO, transactionCreateReqVO); BeanUtils.copyProperties(transferreceiptRecordDetailDO, transactionCreateReqVO);
//增加业务类型 //增加业务类型
transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); transactionCreateReqVO.setBusinessType(businesstypeDO.getCode());
TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
transactionCreateReqVO.setBusinessType(transferreceiptRecordMainDO.getBusinessType()); transactionCreateReqVO.setBusinessType(transferreceiptRecordMainDO.getBusinessType());
transactionCreateReqVO.setLocationCode(transferreceiptRecordDetailDO.getFromLocationCode()); transactionCreateReqVO.setLocationCode(transferreceiptRecordDetailDO.getToLocationCode());
transactionCreateReqVO.setOwnerCode(transferreceiptRecordDetailDO.getFromOwnerCode()); transactionCreateReqVO.setOwnerCode(transferreceiptRecordDetailDO.getFromOwnerCode());
transactionCreateReqVO.setPackingNumber(transferreceiptRecordDetailDO.getFromPackingNumber()); transactionCreateReqVO.setPackingNumber(transferreceiptRecordDetailDO.getToPackingNumber());
transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
transactionCreateReqVO.setBatch(transferreceiptRecordDetailDO.getFromBatch()); transactionCreateReqVO.setBatch(transferreceiptRecordDetailDO.getFromBatch());
transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode());
transactionCreateReqVO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty()); transactionCreateReqVO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty());
transactionCreateReqVO.setRecordNumber(number); transactionCreateReqVO.setRecordNumber(number);
transactionCreateReqVO.setAmount(balanceDO.getAmount());
transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate());
transactionCreateReqVO.setProduceDate(balanceDO.getProduceDate());
transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
transactionCreateReqVO.setId(null); transactionCreateReqVO.setId(null);
transactionCreateReqVO.setAmount(BigDecimal.ZERO);
transactionCreateReqVOList.add(transactionCreateReqVO); transactionCreateReqVOList.add(transactionCreateReqVO);
// if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { // if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) {
// TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); // TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();

Write Preview
Loading…
Cancel
Save