111

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

@@ -31,7 +31,7 @@ public class ReportStockDayProduct extends EntityWithId {
 
     private String reportStoreSid; // 报表仓库记录Sid',
 
-    private int prodNumber = 0; // 货物数量',
+    private double prodNumber = 0; // 货物数量',
     private double prodPrice = 0; // 货物单价',
     private double prodAmount = 0; // 货物货值',
 }

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

@@ -43,10 +43,11 @@ public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, Rep
 
     public ReportStockDay buildReportByProjectAndDay(String projectSid) {
         // TODO: 根据项目Sid获取关联仓库，根据仓库Sid获取库存数据
+        //获取该项目详细信息
         ProjectInfo pi = crmMapper.fetchBySid(projectSid);
+        //获取该项目下仓库信息
         List<StoreHouse> shList = warehouseMapper.listStoreHouseByProjectSid(projectSid);
 
-
         Date currentDate = new Date();
         String orderDate = DateUtil.format(currentDate, "yyyy-MM-dd");
         String reportTime = DateUtil.format(currentDate, "yyyy-MM-dd HH:mm");
@@ -56,33 +57,37 @@ public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, Rep
         rsd.setStockNumber(shList.size());
 
         double countAmount = 0;
-
         List<ReportStockDayStore> insertStoreList = new ArrayList<>();
         List<ReportStockDayProduct> insertProductList = new ArrayList<>();
-
-        L.info("PPPPPP:{},{}", pi.getSid(), pi.getEntryName());
         for (StoreHouse sh : shList) {
-
             ReportStockDayStore rsds = new ReportStockDayStore();
-
             double amount = warehouseMapper.sumAmount(sh.getSid());
             rsds.setProductAmount(amount);
-
+            rsds.setProjectSid(pi.getSid());
+            rsds.setProjectName(pi.getEntryName());
+            rsds.setReportSid(rsd.getSid());
+            rsds.setStoreSid(sh.getSid());
+            rsds.setStoreName(sh.getName());
             insertStoreList.add(rsds);
-
-
             List<ProdStock> prodStockList = warehouseMapper.listStock(sh.getSid());
             for (ProdStock ps : prodStockList) {
                 ReportStockDayProduct rsdp = new ReportStockDayProduct();
+                rsdp.setProjectSid(pi.getSid());
+                rsdp.setProjectName(pi.getEntryName());
+                rsdp.setReportSid(rsd.getSid());
+                rsdp.setStoreSid(sh.getSid());
+                rsdp.setStoreName(sh.getName());
+                rsdp.setProductSid(null);
+                rsdp.setProductName(ps.getPro_name());
                 rsdp.setReportStoreSid(rsds.getSid());
-
+                rsdp.setProdNumber(ps.getNum());
+                rsdp.setProdPrice(ps.getConfirmed_price());
+                rsdp.setProdAmount(ps.getCalculated_value());
                 insertProductList.add(rsdp);
             }
-
             countAmount = countAmount + amount;
         }
-
+        rsd.setCountAmount(countAmount);
-
         baseMapper.insert(rsd);
         reportStockDayStoreService.saveBatch(insertStoreList);
         reportStockDayProductService.saveBatch(insertProductList);