成本报表 查询单证面损数据

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

@@ -2,10 +2,8 @@ package org.jeecg.modules.cost.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.gson.JsonObject;
 import org.apache.poi.ss.formula.functions.T;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
@@ -14,15 +12,17 @@ import org.jeecg.modules.cost.mapper.*;
 import org.jeecg.modules.cost.service.*;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceOne;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceThree;
-import org.jeecg.modules.system.util.JsonChangeUtils;
+import org.jeecg.modules.report.entity.FabricLoss;
+import org.jeecg.modules.report.entity.FabricMoOrderCK;
+import org.jeecg.modules.report.entity.FabricOMOrder;
+import org.jeecg.modules.report.entity.SyFabricLossReport;
+import org.jeecg.modules.report.service.ISyFabricLossReportService;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import springfox.documentation.spring.web.json.Json;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -65,6 +65,8 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
     @Autowired
     private ISyCostAllocationShipdetailService syCostAllocationShipdetailService;
     @Autowired
+    private ISyFabricLossReportService syFabricLossReportService;
+    @Autowired
     private static ISenYuDataSourceOne senYuDataSourceOne;
     @Autowired
     private static ISenYuDataSourceThree senYuDataSourceThree;
@@ -172,6 +174,26 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
             }
         }
 
+        //查询单证面损数据
+//        SyFabricLossReport syFabricLossReport = null;
+//        QueryWrapper<SyFabricLossReport> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("plan_code", plannum);
+//        List<SyFabricLossReport> syFabricLossReportList = syFabricLossReportService.list(queryWrapper);
+//        if (syFabricLossReportList.size()>0){
+//            syFabricLossReport = syFabricLossReportList.get(0);
+//        }
+//
+//        FabricLoss fabricLoss = null;
+//        if (syFabricLossReport != null){
+//            fabricLoss = JSON.parseObject(JSON.toJSONString(syFabricLossReport.getContent()), FabricLoss.class);
+//        }
+//        List<FabricMoOrderCK> fabricMoOrderCK = new ArrayList<>();
+//        for (FabricOMOrder fabricOMOrder:fabricLoss.getFabricOMOrderList2()) {
+//            for (FabricMoOrderCK f:fabricOMOrder.getFabricMoOrderCKList()) {
+//                fabricMoOrderCK.add(f);
+//            }
+//        }
+
         /*查询U8数据 面料*/
         List<SyCostAllocationFabric> list3 = syCostAllocationFabricMapper.queryByCostFabric(plannum);
         for (int i=0;i<list3.size();i++) {