|
@@ -167,6 +167,22 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
return null;
|
|
|
}
|
|
|
syCostAllocation = list.get(0);
|
|
|
+
|
|
|
+ //查询单证面损数据
|
|
|
+ SyFabricLossReport syLossReport1 = null;
|
|
|
+ QueryWrapper<SyFabricLossReport> queryLossWrapper = new QueryWrapper<>();
|
|
|
+ queryLossWrapper.eq("plan_code", plannum);
|
|
|
+ List<SyFabricLossReport> syLossReportList = syFabricLossReportService.list(queryLossWrapper);
|
|
|
+ if (syLossReportList.size()>0){
|
|
|
+ syLossReport1 = syLossReportList.get(0);
|
|
|
+ }
|
|
|
+
|
|
|
+ FabricLoss fabricLoss1 = null;
|
|
|
+ if (syLossReport1 != null){
|
|
|
+ fabricLoss1 = JSON.parseObject(JSON.toJSONString(syLossReport1.getContent()), FabricLoss.class);
|
|
|
+ syCostAllocation.setFabriccostIncludestax(new BigDecimal(fabricLoss1.getActualMoney()));
|
|
|
+ }
|
|
|
+
|
|
|
/*如果出现多供应商的情况拼接 供应商*/
|
|
|
for (int i=0;i<list.size();i++) {
|
|
|
SyCostAllocation objs = list.get(i);
|