面料损耗更新

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FabricLossServiceImpl.java

@@ -992,28 +992,18 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			}
 
 		}while(bFind);
-
-		calCkList.addAll(rowOutList.stream().filter(e->e.getIQuantityOut()!=0.0).collect(Collectors.toList()));
-		// 没计算成本的设置为0
-		for (FabricMoOrderCK item : calCkList){
-			item.setIQuantityOut(DoubleOperation.getScale(item.getIQuantityOut(), 4));
-			if (item.getIMoney() == null){
-				item.setIMoney(0.0);
-			}
-			if (item.getIPrice() == null){
-				item.setIPrice(0.0);
-			}
-			if (item.getIQuantity() == null){
-				item.setIQuantity(item.getIQuantityOut());
-			}
-			if (item.getIQuantityIn() == null){
-				item.setIQuantityIn(item.getIQuantityOut());
-			}
-			if (item.getCSourceInvId() == null){
-				item.setCSourceInvId("");
-			}
-
-		}
+		// 没计算的设置
+		List<FabricMoOrderCK> leftList = rowOutList.stream().filter(e->e.getIQuantityOut()!=0.0).collect(Collectors.toList());
+		leftList.forEach(e->{
+			e.setIQuantityOut(DoubleOperation.getScale(e.getIQuantityOut(), 4));
+			e.setCBusType("其他入库");
+			e.setIMoney(0.0);
+			e.setIPrice(0.0);
+			e.setIQuantity(e.getIQuantityOut());
+			e.setIQuantityIn(e.getIQuantityOut());
+			e.setCSourceInvId("");
+		});
+		calCkList.addAll(leftList);
 		// 设置没计算成本的内容
 		for (FabricOMOrder omOrder : omOrderList){
 			if (omOrder.getFabricMoOrderCKList() == null){
@@ -1575,7 +1565,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 				}
 			}
 			// 设置余纱、损耗
-			poOrder.setIQuantityLeft(poOrder.getFabricPoOrderOutList().stream().mapToDouble(FabricPoOrderOut::getIQuantity).sum());
+			poOrder.setIQuantityLeft(DoubleOperation.getScale(poOrder.getFabricPoOrderOutList().stream().mapToDouble(FabricPoOrderOut::getIQuantity).sum(),4));
 			poOrder.setIQuantityLeftRate(DoubleOperation.div(poOrder.getIQuantityLeft(),poOrder.getIQuantityIn(), 4));
 		}
 		if (toAddpoOrderList.size()>0){