|
|
@ -474,15 +474,15 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque |
|
|
|
detailDo.setItemDesc2(itembasicDO.getDesc2()); |
|
|
|
detailDo.setItemName(itembasicDO.getName()); |
|
|
|
detailDo.setProjectCode(itembasicDO.getProject()); |
|
|
|
this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom()); |
|
|
|
validatorLocation(detailDo.getFromLocationCode()); |
|
|
|
if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) { |
|
|
|
PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); |
|
|
|
PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); |
|
|
|
mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); |
|
|
|
mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); |
|
|
|
ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); |
|
|
|
} |
|
|
|
// this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom());
|
|
|
|
// validatorLocation(detailDo.getFromLocationCode());
|
|
|
|
// if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) {
|
|
|
|
// PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
|
|
|
|
// PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
|
|
|
|
// mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
|
|
|
|
// mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
|
|
|
|
// ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
|
|
|
|
// }
|
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); |
|
|
|
List<String> inventoryStatusList = Arrays.asList(businesstypeDO.getOutInventoryStatuses().split(",")); |
|
|
|
BigDecimal bigDecimal = validatorBalance(detailDo, mainDo, inventoryStatusList); |
|
|
|