Browse Source

成本报表 多供应商问题

liuchaohui 2 years ago
parent
commit
4c440086f9

+ 9 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -914,12 +914,15 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         for(int i=0;i<processUnit.length;i++){
             String unit=processUnit[i];
             JSONObject jSONObject=new JSONObject();
-            List<SyCostAllocationFabric> list3b = list3.stream().filter(t -> t.getProcessUnit().equals(unit)).collect(Collectors.toList());
-            List<SyCostAllocationIngredient> list4b = list4.stream().filter(t -> t.getProcessUnit().equals(unit)).collect(Collectors.toList());
-            List<SyCostAllocationShipdetail> list5b = Shipdetails.stream().filter(t -> t.getProcessUnit().equals(unit)).collect(Collectors.toList());
-            jSONObject.put("syCostAllocationFabricList", list3b);
-            jSONObject.put("syCostAllocationIngredientList",list4b);
-            jSONObject.put("syCostAllocationShipdetail",list5b);
+//            List<SyCostAllocationFabric> list3b = list3.stream().filter(t -> t.getProcessUnit().equals(unit)).collect(Collectors.toList());
+//            List<SyCostAllocationIngredient> list4b = list4.stream().filter(t -> t.getProcessUnit().equals(unit)).collect(Collectors.toList());
+//            List<SyCostAllocationShipdetail> list5b = Shipdetails.stream().filter(t -> t.getProcessUnit().equals(unit)).collect(Collectors.toList());
+//            jSONObject.put("syCostAllocationFabricList", list3b);
+//            jSONObject.put("syCostAllocationIngredientList",list4b);
+//            jSONObject.put("syCostAllocationShipdetail",list5b);
+            jSONObject.put("syCostAllocationFabricList", list3);
+            jSONObject.put("syCostAllocationIngredientList",list4);
+            jSONObject.put("syCostAllocationShipdetail",Shipdetails);
             processUnitList.add(jSONObject);
         }
         syCostAllocation.setProcessUnitList(processUnitList);