|
@@ -220,7 +220,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
}
|
|
|
|
|
|
|
|
|
- //查询U8数据 面料
|
|
|
+ //查询U8数据 辅料
|
|
|
String sqlIngredient = "SELECT cInvName as goodsName,sum(riQuantity) as usageQuantity,sum(biQuantity) as planQuantity,processUnit FROM (" +
|
|
|
"select c.cInvName ,sum(r.iQuantity) as riQuantity,r.cBatch ,b.cSource,b.cPOID,sum(b.iQuantity) as biQuantity,v.cVenName as processUnit" +
|
|
|
" FROM rdrecords11 r" +
|
|
@@ -244,6 +244,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
list4.add(Ingredient);
|
|
|
}
|
|
|
|
|
|
+ //数据整合
|
|
|
List<JSONObject> processUnitList=new ArrayList<>();//子表数据_加工单位集合
|
|
|
//获取主表加工单位,拆分获取对应数据
|
|
|
String[] processUnit=syCostAllocation.getProcessUnit().split(",");
|