面料损耗更新

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

@@ -950,7 +950,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 		// 获取材料出库
 		// 获取委外订单行id,出库物料信息,出库数量
 		List<FabricMoOrderCK> rowOutList = fabricLossMapper.getOmRowOutList(code);
-		rowOutList = rowOutList.stream().filter(e->e.getIQuantityOut()!=0).collect(Collectors.toList());
+		rowOutList = rowOutList.stream().filter(e->e.getIQuantityOut() != null && e.getIQuantityOut()!=0).collect(Collectors.toList());
 		rowOutList.forEach(e->e.setBCurPlan(false));
 		// 委外入库
 		List<FabricMoOrderRK> rowInList = fabricLossMapper.getOmInDetailList(code);
@@ -1765,6 +1765,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 					}else {
 						FabricPoOrderIn formatItem = JSON.parseObject(JSON.toJSONString(itemIn),FabricPoOrderIn.class);
 						formatItem.setCInvName(formatItem.getCInvName()+ " " +formatItem.getCColor());
+						formatItem.setIQuantity(formatItem.getIQuantityInvoice());
 						allInList.add(formatItem);
 
 					}