|
|
@ -62,6 +62,8 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
|
|
|
|
private VoucherMapper voucherMapper;
|
|
|
|
private VoucherMapper voucherMapper;
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private ProductWarehouseService productWarehouseService;
|
|
|
|
private ProductWarehouseService productWarehouseService;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private BusinessCargoService businessCargoService;
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<ReceiptOrderEntity> getList(ReceiptOrderPagination receiptOrderPagination){
|
|
|
|
public List<ReceiptOrderEntity> getList(ReceiptOrderPagination receiptOrderPagination){
|
|
|
|
return getTypeList(receiptOrderPagination,receiptOrderPagination.getDataType());
|
|
|
|
return getTypeList(receiptOrderPagination,receiptOrderPagination.getDataType());
|
|
|
@ -500,8 +502,9 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
|
|
|
|
entitys.setOrderId(entity.getId());
|
|
|
|
entitys.setOrderId(entity.getId());
|
|
|
|
if(isSave && entity.getReceiptType().equals("1")){
|
|
|
|
if(isSave && entity.getReceiptType().equals("1")){
|
|
|
|
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getInfo(entitys.getProductId());
|
|
|
|
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getInfo(entitys.getProductId());
|
|
|
|
if (ObjectUtil.isNotEmpty(productWarehouseEntity) && productWarehouseEntity.getInventoryType().equals("1")){
|
|
|
|
BusinessCargoEntity businessCargoEntity = businessCargoService.getById(entitys.getCargoId());
|
|
|
|
entitys.setBatchNo(productWarehouseEntity.getCode());
|
|
|
|
if (ObjectUtil.isNotEmpty(productWarehouseEntity) && productWarehouseEntity.getInventoryType().equals("1") && ObjectUtil.isNotEmpty(businessCargoEntity)){
|
|
|
|
|
|
|
|
entitys.setBatchNo(businessCargoEntity.getId());
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
entitys.setBatchNo(generaterSwapUtil.getBillNumber("batch", false));
|
|
|
|
entitys.setBatchNo(generaterSwapUtil.getBillNumber("batch", false));
|
|
|
|
}
|
|
|
|
}
|
|
|
|