|
|
@ -237,17 +237,16 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve |
|
|
|
throw new BusinessException("新增库存报损失败,该物料无库存数据"); |
|
|
|
} |
|
|
|
WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(damageChild); |
|
|
|
// inquiryDetail.setInventoryHistoricalType("9");
|
|
|
|
int detailInsertResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); |
|
|
|
if(detailInsertResult<=0){ |
|
|
|
throw new BusinessException("新增库存历史失败!"); |
|
|
|
} |
|
|
|
// BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum();
|
|
|
|
// reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity());
|
|
|
|
// inventoryInquiry.setReportDamageNum(reportDamageNum);
|
|
|
|
// BigDecimal availableNum = inventoryInquiry.getAvailableStockNum();
|
|
|
|
// availableNum = availableNum.subtract(damageChild.getActualScrapQuantity());
|
|
|
|
// inventoryInquiry.setAvailableStockNum(availableNum);
|
|
|
|
Integer reportDamageNum = Optional.ofNullable(inventoryInquiry.getReportDamageNum()).orElse(0); |
|
|
|
reportDamageNum = reportDamageNum + damageChild.getActualScrapQuantity(); |
|
|
|
inventoryInquiry.setReportDamageNum(reportDamageNum); |
|
|
|
Integer availableNum = Optional.ofNullable(inventoryInquiry.getAvailableStockNum()).orElse(0); |
|
|
|
availableNum = availableNum - damageChild.getActualScrapQuantity(); |
|
|
|
inventoryInquiry.setAvailableStockNum(availableNum); |
|
|
|
inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); |
|
|
|
inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); |
|
|
|
return inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry); |
|
|
@ -257,15 +256,13 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve |
|
|
|
public WarehouseInventoryInquiryDetail createWarehouseInventoryInquiryDetail(WarehouseInventoryReportDamageChild damageChild){ |
|
|
|
WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); |
|
|
|
inquiryDetail.setMaterialNo(damageChild.getMaterialNo()); |
|
|
|
// inquiryDetail.setMaterialName(damageChild.getMaterialName());
|
|
|
|
// inquiryDetail.setMaterialBrand(damageChild.getMaterialBrand());
|
|
|
|
// inquiryDetail.setMaterialPhotourl(damageChild.getMaterialPhotourl());
|
|
|
|
// inquiryDetail.setMaterialDescribe(damageChild.getMaterialDescribe());
|
|
|
|
// inquiryDetail.setMaterialUnit(damageChild.getMaterialUnit());
|
|
|
|
// inquiryDetail.setMaterialType(damageChild.getMaterialType());
|
|
|
|
inquiryDetail.setInventoryIncreaseDecrease("0"); |
|
|
|
Integer decreaseNum = damageChild.getActualScrapQuantity(); |
|
|
|
// inquiryDetail.setAvailableStockNum(decreaseNum);
|
|
|
|
inquiryDetail.setIncreaseDecreaseNum(decreaseNum); |
|
|
|
inquiryDetail.setInquiryBusinessType("8"); |
|
|
|
inquiryDetail.setInquiryOrderType("16"); |
|
|
|
inquiryDetail.setInquiryWarehouseType("17"); |
|
|
|
inquiryDetail.setCorrelationCode(damageChild.getReportDamageCode()); |
|
|
|
inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); |
|
|
|
inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); |
|
|
|
inquiryDetail.setCreateTime(DateUtils.getNowDate()); |
|
|
|