|
|
@ -258,7 +258,6 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { |
|
|
|
@Override |
|
|
|
@Transactional |
|
|
|
public String executeDeliverJobMain(DeliverJobMainUpdateReqVO deliverJobMainUpdateReqVO) { |
|
|
|
BigDecimal zero = BigDecimal.ZERO; |
|
|
|
//查询数据
|
|
|
|
DeliverJobMainDO deliverJobMainDO = this.validateDeliverJobMainExists(deliverJobMainUpdateReqVO.getId()); |
|
|
|
List<DeliverJobDetailDO> subList = deliverJobDetailService.selectList(deliverJobMainDO.getId()); |
|
|
@ -390,6 +389,26 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { |
|
|
|
transactionCreateReqVO.setId(null); |
|
|
|
transactionCreateReqVO.setAmount(BigDecimal.ZERO); |
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVO); |
|
|
|
if(businesstypeDO.getInTransactionType() != null && "".equals(businesstypeDO.getInTransactionType())){ |
|
|
|
//添加库存事务list
|
|
|
|
TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); |
|
|
|
BeanUtils.copyProperties(deliverRecordDetailDO, transactionCreateReqVO); |
|
|
|
//增加业务类型
|
|
|
|
transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); |
|
|
|
TransactiontypeDO transactionCreateReqVOInDo = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); |
|
|
|
transactionCreateReqVOIn.setInventoryAction(transactionCreateReqVOInDo.getInventoryAction()); |
|
|
|
transactionCreateReqVOIn.setTransactionType(transactionCreateReqVOInDo.getCode()); |
|
|
|
transactionCreateReqVOIn.setBusinessType(deliverRecordMainDO.getBusinessType()); |
|
|
|
transactionCreateReqVOIn.setLocationCode(deliverRecordDetailDO.getToLocationCode()); |
|
|
|
transactionCreateReqVOIn.setOwnerCode(deliverRecordDetailDO.getToOwnerCode()); |
|
|
|
transactionCreateReqVOIn.setRecordNumber(number); |
|
|
|
transactionCreateReqVOIn.setBatch(deliverRecordDetailDO.getBatch()); |
|
|
|
transactionCreateReqVOIn.setPackingNumber(deliverRecordDetailDO.getPackingNumber()); |
|
|
|
transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); |
|
|
|
transactionCreateReqVOIn.setId(null); |
|
|
|
transactionCreateReqVOIn.setAmount(BigDecimal.ZERO); |
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVOIn); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
}); |
|
|
|