|
|
@ -228,8 +228,8 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ |
|
|
|
@Override |
|
|
|
@Transactional |
|
|
|
public String executeInventorymoveJobMain(InventorymoveJobMainUpdateReqVO inventorymoveJobMainUpdateReqVO) { |
|
|
|
RecordsettingDO recordsettingDO = null; |
|
|
|
BusinesstypeDO businesstypeDO = null; |
|
|
|
RecordsettingDO recordsettingDO; |
|
|
|
BusinesstypeDO businesstypeDO; |
|
|
|
String number = ""; |
|
|
|
//查询数据
|
|
|
|
InventorymoveJobMainDO inventorymoveJobMainDO = this.validateInventorymoveJobMainExists(inventorymoveJobMainUpdateReqVO.getId()); |
|
|
@ -328,39 +328,45 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ |
|
|
|
// 入动作
|
|
|
|
TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); |
|
|
|
BeanUtils.copyProperties(inventorymoveRecordDetailDO, transactionCreateReqVO); |
|
|
|
TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(inventorymoveRecordMainDO.getInTransactionType()); |
|
|
|
transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); |
|
|
|
transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); |
|
|
|
transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); |
|
|
|
transactionCreateReqVO.setBusinessType(inventorymoveJobMainDO.getBusinessType()); |
|
|
|
transactionCreateReqVO.setOwnerCode(inventorymoveRecordDetailDO.getToOwnerCode()); |
|
|
|
transactionCreateReqVO.setRecordNumber(inventorymoveRecordMainDO.getNumber()); |
|
|
|
transactionCreateReqVO.setId(null); |
|
|
|
transactionCreateReqVO.setPackingNumber(inventorymoveJobDetailUpdateReqVO.getToPackingNumber()); |
|
|
|
transactionCreateReqVO.setBatch(inventorymoveJobDetailUpdateReqVO.getToBatch()); |
|
|
|
transactionCreateReqVO.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getToContainerNumber()); |
|
|
|
transactionCreateReqVO.setInventoryStatus(inventorymoveJobDetailUpdateReqVO.getToInventoryStatus()); |
|
|
|
transactionCreateReqVO.setAmount(BigDecimal.ZERO); |
|
|
|
transactionCreateReqVO.setLocationCode(inventorymoveJobDetailUpdateReqVO.getToLocationCode()); |
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVO); |
|
|
|
String outTransactionType = businesstypeDO.getOutTransactionType(); |
|
|
|
String inTransactionType = businesstypeDO.getInTransactionType(); |
|
|
|
if(inTransactionType != null && !"".equals(inTransactionType)){ |
|
|
|
TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(inTransactionType); |
|
|
|
transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); |
|
|
|
transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); |
|
|
|
transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); |
|
|
|
transactionCreateReqVO.setBusinessType(inventorymoveJobMainDO.getBusinessType()); |
|
|
|
transactionCreateReqVO.setOwnerCode(inventorymoveRecordDetailDO.getToOwnerCode()); |
|
|
|
transactionCreateReqVO.setRecordNumber(inventorymoveRecordMainDO.getNumber()); |
|
|
|
transactionCreateReqVO.setId(null); |
|
|
|
transactionCreateReqVO.setPackingNumber(inventorymoveJobDetailUpdateReqVO.getToPackingNumber()); |
|
|
|
transactionCreateReqVO.setBatch(inventorymoveJobDetailUpdateReqVO.getToBatch()); |
|
|
|
transactionCreateReqVO.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getToContainerNumber()); |
|
|
|
transactionCreateReqVO.setInventoryStatus(inventorymoveJobDetailUpdateReqVO.getToInventoryStatus()); |
|
|
|
transactionCreateReqVO.setAmount(BigDecimal.ZERO); |
|
|
|
transactionCreateReqVO.setLocationCode(inventorymoveJobDetailUpdateReqVO.getToLocationCode()); |
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVO); |
|
|
|
} |
|
|
|
// 出动作
|
|
|
|
TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO(); |
|
|
|
BeanUtils.copyProperties(inventorymoveRecordDetailDO, transactionCreateReqVOOut); |
|
|
|
TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(inventorymoveRecordMainDO.getOutTransactionType()); |
|
|
|
transactionCreateReqVOOut.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); |
|
|
|
transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction()); |
|
|
|
transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode()); |
|
|
|
transactionCreateReqVOOut.setBusinessType(inventorymoveJobMainDO.getBusinessType()); |
|
|
|
transactionCreateReqVOOut.setOwnerCode(inventorymoveRecordDetailDO.getFromOwnerCode()); |
|
|
|
transactionCreateReqVOOut.setRecordNumber(inventorymoveRecordMainDO.getNumber()); |
|
|
|
transactionCreateReqVOOut.setId(null); |
|
|
|
transactionCreateReqVOOut.setPackingNumber(inventorymoveJobDetailUpdateReqVO.getPackingNumber()); |
|
|
|
transactionCreateReqVOOut.setBatch(inventorymoveJobDetailUpdateReqVO.getBatch()); |
|
|
|
transactionCreateReqVOOut.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getContainerNumber()); |
|
|
|
transactionCreateReqVOOut.setInventoryStatus(inventorymoveJobDetailUpdateReqVO.getInventoryStatus()); |
|
|
|
transactionCreateReqVOOut.setAmount(BigDecimal.ZERO); |
|
|
|
transactionCreateReqVOOut.setLocationCode(inventorymoveJobDetailUpdateReqVO.getFromLocationCode()); |
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVOOut); |
|
|
|
if(outTransactionType != null && !"".equals(outTransactionType)){ |
|
|
|
TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(outTransactionType); |
|
|
|
transactionCreateReqVOOut.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); |
|
|
|
transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction()); |
|
|
|
transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode()); |
|
|
|
transactionCreateReqVOOut.setBusinessType(inventorymoveJobMainDO.getBusinessType()); |
|
|
|
transactionCreateReqVOOut.setOwnerCode(inventorymoveRecordDetailDO.getFromOwnerCode()); |
|
|
|
transactionCreateReqVOOut.setRecordNumber(inventorymoveRecordMainDO.getNumber()); |
|
|
|
transactionCreateReqVOOut.setId(null); |
|
|
|
transactionCreateReqVOOut.setPackingNumber(inventorymoveJobDetailUpdateReqVO.getPackingNumber()); |
|
|
|
transactionCreateReqVOOut.setBatch(inventorymoveJobDetailUpdateReqVO.getBatch()); |
|
|
|
transactionCreateReqVOOut.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getContainerNumber()); |
|
|
|
transactionCreateReqVOOut.setInventoryStatus(inventorymoveRecordDetailDO.getFromInventoryStatus()); |
|
|
|
transactionCreateReqVOOut.setAmount(BigDecimal.ZERO); |
|
|
|
transactionCreateReqVOOut.setLocationCode(inventorymoveJobDetailUpdateReqVO.getFromLocationCode()); |
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVOOut); |
|
|
|
} |
|
|
|
}; |
|
|
|
if(!inventorymoveRecordDetailDOList.isEmpty()){ |
|
|
|
inventorymoveRecordDetailMapper.insertBatch(inventorymoveRecordDetailDOList); |
|
|
|