8-2

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java

@@ -3,19 +3,27 @@ package com.yxt.supervise.report.biz.stock;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yxt.supervise.report.ds.crm.CrmMapper;
 import com.yxt.supervise.report.ds.crm.ProjectInfo;
 import com.yxt.supervise.report.ds.warehouse.ProdStock;
 import com.yxt.supervise.report.ds.warehouse.StoreHouse;
 import com.yxt.supervise.report.ds.warehouse.WarehouseMapper;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, ReportStockDay> {
@@ -68,6 +76,7 @@ public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, Rep
             rsds.setReportSid(rsd.getSid());
             rsds.setStoreSid(sh.getSid());
             rsds.setStoreName(sh.getName());
+            rsds.setOrderDate(orderDate);
             insertStoreList.add(rsds);
             List<ProdStock> prodStockList = warehouseMapper.listStock(sh.getSid());
             for (ProdStock ps : prodStockList) {
@@ -77,12 +86,13 @@ public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, Rep
                 rsdp.setReportSid(rsd.getSid());
                 rsdp.setStoreSid(sh.getSid());
                 rsdp.setStoreName(sh.getName());
-                rsdp.setProductSid(null);
+                rsdp.setProductSid(ps.getSid());
                 rsdp.setProductName(ps.getPro_name());
                 rsdp.setReportStoreSid(rsds.getSid());
                 rsdp.setProdNumber(ps.getNum());
                 rsdp.setProdPrice(ps.getConfirmed_price());
                 rsdp.setProdAmount(ps.getCalculated_value());
+                rsdp.setOrderDate(orderDate);
                 insertProductList.add(rsdp);
             }
             countAmount = countAmount + amount;
@@ -91,7 +101,11 @@ public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, Rep
         baseMapper.insert(rsd);
         reportStockDayStoreService.saveBatch(insertStoreList);
         reportStockDayProductService.saveBatch(insertProductList);
+        try {
 
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return null;
     }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/ProdStock.java

@@ -6,6 +6,7 @@ import lombok.Data;
 @Data
 @TableName("prod_stock")
 public class ProdStock {
+    private String sid;
     private String pro_name;
     private double num;
     private double confirmed_price;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/WarehouseMapper.java

@@ -18,9 +18,9 @@ public interface WarehouseMapper extends BaseMapper<StoreHouse> {
             "where sp.project_sid =#{projectSid} ")
     List<StoreHouse> listStoreHouseByProjectSid(@Param("projectSid") String projectSid);
 
-    @Select("select sum(calculated_value) from prod_stock where calculated_value store_house_sid=#{sid}")
+    @Select("select sum(calculated_value) from prod_stock where store_house_sid=#{sid}")
     double sumAmount(String sid);
 
-    @Select("select pro_name,num,confirmed_price,calculated_value from prod_stock where calculated_value store_house_sid=#{sid}")
+    @Select("select sid,pro_name,num,confirmed_price,calculated_value from prod_stock where store_house_sid=#{sid}")
     List<ProdStock> listStock(String sid);
 }