分配问题修改;
This commit is contained in:
+11
@@ -844,6 +844,7 @@ public class StockOutOrderApplicationService {
|
|||||||
List<OutMaterialDetailDO> returnOutMaterialDetailDOChildList = new ArrayList<>();
|
List<OutMaterialDetailDO> returnOutMaterialDetailDOChildList = new ArrayList<>();
|
||||||
List<OutMaterialDetailDO> outMaterialDetailDOChildList = outMaterialDetailDO.getChildren();
|
List<OutMaterialDetailDO> outMaterialDetailDOChildList = outMaterialDetailDO.getChildren();
|
||||||
if (!CollectionUtils.isEmpty(outMaterialDetailDOChildList)){
|
if (!CollectionUtils.isEmpty(outMaterialDetailDOChildList)){
|
||||||
|
BigDecimal totalNowAllocationQuantity = BigDecimal.ZERO;//当前作业分配数量
|
||||||
for (OutMaterialDetailDO outMaterialDetailDOChild : outMaterialDetailDOChildList){
|
for (OutMaterialDetailDO outMaterialDetailDOChild : outMaterialDetailDOChildList){
|
||||||
OutMaterialDetailPO outMaterialDetailPOChildDb = outMaterialDetailDbMap.get(outMaterialDetailDOChild.getMaterialDetailId());
|
OutMaterialDetailPO outMaterialDetailPOChildDb = outMaterialDetailDbMap.get(outMaterialDetailDOChild.getMaterialDetailId());
|
||||||
if (outMaterialDetailPOChildDb != null){
|
if (outMaterialDetailPOChildDb != null){
|
||||||
@@ -867,6 +868,16 @@ public class StockOutOrderApplicationService {
|
|||||||
returnOutMaterialDetailDOChild.setParentUniqueId(outMaterialDetailPO.getUniqueId());
|
returnOutMaterialDetailDOChild.setParentUniqueId(outMaterialDetailPO.getUniqueId());
|
||||||
returnOutMaterialDetailDOChildList.add(returnOutMaterialDetailDOChild);
|
returnOutMaterialDetailDOChildList.add(returnOutMaterialDetailDOChild);
|
||||||
totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity());
|
totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity());
|
||||||
|
BigDecimal allocationQuantity1 = returnOutMaterialDetailDOChild.getAllocationQuantity();
|
||||||
|
BigDecimal alreadyAllocationQuantity1 = returnOutMaterialDetailDOChild.getAlreadyAllocationQuantity();
|
||||||
|
if (allocationQuantity1 == null) {
|
||||||
|
allocationQuantity1 = BigDecimal.ZERO;
|
||||||
|
}
|
||||||
|
if (alreadyAllocationQuantity1 == null) {
|
||||||
|
alreadyAllocationQuantity1 = BigDecimal.ZERO;
|
||||||
|
}
|
||||||
|
BigDecimal nowAllocationQuantity1 = allocationQuantity1.subtract(alreadyAllocationQuantity1);
|
||||||
|
totalNowAllocationQuantity = totalNowAllocationQuantity.add(nowAllocationQuantity1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//主单当分配作业数量和
|
//主单当分配作业数量和
|
||||||
|
|||||||
Reference in New Issue
Block a user