在途计算的修改

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java

@@ -89,21 +89,34 @@ public interface GdInstorageCountMapper extends BaseMapper<GdInstorageCount> {
      *
      * @return
      */
-    @Select("SELECT prs.storeName storeName ,prt.code code ,CONVERT(SUM(prs.price),DECIMAL(12,2)) price,prt.purchaseDate purchaseDate, " +
+    @Select("select t1.code, t1.ddje,t1.purchasedate,t1.arrivalDate, " +
-            "prt.arrivalDate arrivalDate " +
+            "       IFNULL(t2.dddhjz,0) dddhjz, " +
-            " FROM purchase_requisition_store prs " +
+            "       IF((t1.ddje-IFNULL(t2.dddhjz,0))>0,(t1.ddje-IFNULL(t2.dddhjz,0)),0) zthjz " +
-            "LEFT JOIN `purchase_requisition_tobacco` prt ON prt.sid=prs.mainsid " +
+            "       from  " +
-            "GROUP BY prs.storeCode ORDER BY prs.storeName ")
+            "( select  prt.code,prt.purchasedate,CONVERT(sum(prs.price),DECIMAL(12,2)) ddje,prt.arrivalDate " +
+            "  from `purchase_requisition_store` prs  left join `purchase_requisition_tobacco` prt on prt.sid=prs.mainsid  " +
+            "  group by prt.purchasedate " +
+            ") t1 left join  " +
+            "( select purchasedate pp, CONVERT(sum(giyy.colq16),DECIMAL(12,2)) dddhjz    " +
+            "  from `gd_instorage_yc` giyy where giyy.purchasedate>'2023.01.04' " +
+            "  group by purchasedate " +
+            ") t2 on t1.purchasedate = t2.pp ")
     List<Map<String, Object>> ycddmxb();
 
-    @Select("SELECT CONCAT('[',prs.storeCode,']',prs.storeName) storeName , " +
+    @Select("select t1.storeCode, " +
-            "    CONVERT(SUM(prs.price),DECIMAL(12,2)) ddspjz, " +
+            "       t2.colc2 xsqd, " +
-            "            (SELECT CONVERT(IFNULL(SUM(giyy.colq16),0),DECIMAL(12,2)) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode)  colq16, " +
+            "       t1.ddspjz, " +
-            "    CONVERT(IF(SUM(prs.price)-IFNULL((SELECT SUM(giyy.colq16) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode ),0)>0, " +
+            "       t2.sjdhjz, " +
-            "    SUM(prs.price)-IFNULL((SELECT SUM(giyy.colq16) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode ),0),0),DECIMAL(12,2)) ztprodValue1, " +
+            "       IF((t1.ddspjz-t2.sjdhjz)>0,(t1.ddspjz-t2.sjdhjz),0) zthjz, " +
-            "    CONVERT(IF(IFNULL((SELECT SUM(giyy.colq16) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode ),0)-SUM(prs.price)>0,IFNULL((SELECT SUM(giyy.colq16) " +
+            "       IF((t2.sjdhjz-t1.ddspjz)>0,(t2.sjdhjz-t1.ddspjz),0) cchjz " +
-            "    FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode ),0)-SUM(prs.price),0),DECIMAL(12,2)) ztprodValue2 " +
+            " from  " +
-            "    FROM  `purchase_requisition_store` prs " +
+            "( select  prs.storeCode,CONVERT(sum(prs.price),DECIMAL(12,2)) ddspjz  " +
-            "    GROUP BY prs.storeCode")
+            "  from `purchase_requisition_store` prs  " +
+            "  group by prs.storeCode  " +
+            ") t1 left join  " +
+            "( select colb1,colc2, CONVERT(sum(giyy.colq16),DECIMAL(12,2)) sjdhjz   " +
+            "  from `gd_instorage_yc` giyy  where giyy.purchasedate>'2023.01.04'  " +
+            "  group by colb1,colc2 " +
+            ") t2 on t1.storeCode = t2.colb1")
     List<Map<String, Object>> ycspdhmxb();
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java

@@ -217,17 +217,16 @@ public class GdInstorageCountService extends ServiceImpl<GdInstorageCountMapper,
             double ccddspjz = 0, cccolq16 = 0, ccztprodValue1 = 0, ccztprodValue2 = 0;
             for (int y = 3; y < countRow4; y++) {
                 Map<String, Object> map = list4.get(y - 3);
-
                 writer.writeCellValue(0, y, "市烟草");
-                writer.writeCellValue(1, y, map.get("storeName"));
+                writer.writeCellValue(1, y, map.get("xsqd"));
                 writer.writeCellValue(2, y, map.get("ddspjz"));
                 ccddspjz = ccddspjz + ExcelTool.toDouble(map.get("ddspjz"));
-                writer.writeCellValue(3, y, map.get("colq16"));
+                writer.writeCellValue(3, y, map.get("sjdhjz"));
-                cccolq16 = cccolq16 + ExcelTool.toDouble(map.get("colq16"));
+                cccolq16 = cccolq16 + ExcelTool.toDouble(map.get("sjdhjz"));
-                writer.writeCellValue(4, y, map.get("ztprodValue1"));
+                writer.writeCellValue(4, y, map.get("zthjz"));
-                ccztprodValue1 = ccztprodValue1 + ExcelTool.toDouble(map.get("ztprodValue1"));
+                ccztprodValue1 = ccztprodValue1 + ExcelTool.toDouble(map.get("zthjz"));
-                writer.writeCellValue(5, y, map.get("ztprodValue2"));
+                writer.writeCellValue(5, y, map.get("cchjz"));
-                ccztprodValue2 = ccztprodValue2 + ExcelTool.toDouble(map.get("ztprodValue2"));
+                ccztprodValue2 = ccztprodValue2 + ExcelTool.toDouble(map.get("cchjz"));
             }
             writer.writeCellValue(1, countRow4, "合计");
             writer.writeCellValue(2, countRow4, ccddspjz);
@@ -239,26 +238,33 @@ public class GdInstorageCountService extends ServiceImpl<GdInstorageCountMapper,
         // 烟草订单明细表
         writer.setSheet(4);
         writer.writeCellValue(0, 1, "编号：ycddmxb" + dfmt1);
-        writer.writeCellValue(4, 1, "数据时间：" + dfmt);
+        writer.writeCellValue(7, 1, "数据时间：" + dfmt);
         List<Map<String, Object>> list5 = baseMapper.ycddmxb();
         if (list5 != null && !list5.isEmpty()) {
             int size5 = list5.size();
             int countRow5 = size5 + 3;
             xh = 0;
-            double cPrice = 0;
+            double cPrice = 0,cghje=0,cztje=0;
             for (int y = 3; y < countRow5; y++) {
                 Map<String, Object> map = list5.get(y - 3);
                 xh++;
                 writer.writeCellValue(0, y, xh);
-                writer.writeCellValue(1, y, map.get("storeName"));
+                writer.writeCellValue(1, y, "市烟草");
                 writer.writeCellValue(2, y, map.get("code"));
-                writer.writeCellValue(3, y, map.get("price"));
+                writer.writeCellValue(3, y, map.get("ddje"));
-                cPrice = cPrice + ExcelTool.toDouble(map.get("price"));
+                writer.writeCellValue(4, y, map.get("ddje"));
-                writer.writeCellValue(4, y, map.get("purchaseDate"));
+                cPrice = cPrice + ExcelTool.toDouble(map.get("ddje"));
-                writer.writeCellValue(5, y, map.get("arrivalDate"));
+                writer.writeCellValue(5, y, map.get("purchasedate"));
+                writer.writeCellValue(6, y, map.get("arrivalDate"));
+                writer.writeCellValue(7, y, map.get("dddhjz"));
+                cghje = cghje + ExcelTool.toDouble(map.get("dddhjz"));
+                writer.writeCellValue(8, y, map.get("zthjz"));
+                cztje = cztje + ExcelTool.toDouble(map.get("zthjz"));
             }
             writer.writeCellValue(1, countRow5, "合计金额");
-            writer.writeCellValue(3, countRow5, cPrice);
+            writer.writeCellValue(4, countRow5, cPrice);
+            writer.writeCellValue(7, countRow5, cghje);
+            writer.writeCellValue(8, countRow5, cztje);
         }
 
         writer.flush();
@@ -276,4 +282,13 @@ public class GdInstorageCountService extends ServiceImpl<GdInstorageCountMapper,
         }
         return wdhjz;
     }
+
+    public double amountZaituYc() {
+        double wdhjz = 0;
+        List<Map<String, Object>> list = baseMapper.ycddmxb();
+        for (Map<String, Object> map : list) {
+            wdhjz = wdhjz + ExcelTool.toDouble(map.get("zthjz"));
+        }
+        return wdhjz;
+    }
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java

@@ -206,7 +206,7 @@ public class GdInstorageService extends ServiceImpl<GdInstorageMapper, GdInstora
                 String srdDate = "20" + inOrderNo.substring(4, 10);
                 DateTime sdate = DateUtil.parse(srdDate, "yyyyMMdd");
                 DateTime tdate = DateUtil.offsetDay(sdate, -1);
-                return DateUtil.format(tdate, "yyyyMMdd");
+                return DateUtil.format(tdate, "yyyy.MM.dd");
                 // return "20" + inOrderNo.substring(4, 10);
                 // return "20" + inOrderNo.substring(4, 6) + "." + inOrderNo.substring(6, 8) + "." + inOrderNo.substring(8, 10);
             }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java

@@ -36,6 +36,8 @@ public class GdSalesReportdayService extends ServiceImpl<GdSalesReportdayMapper,
     private GdInstorageCountService gdInstorageCountService;
     @Autowired
     private GdInventoryYcService gdInventoryYcService;
+    @Autowired
+    private SalesDataDailySummaryService salesDataDailySummaryService;
 
     public GdSalesReportday clearAndInitByOrderDate(String orderDate) {
         this.clearByOrderDate(orderDate);  // 清除数据日的数据
@@ -140,7 +142,8 @@ public class GdSalesReportdayService extends ServiceImpl<GdSalesReportdayMapper,
 
         //在途货值
         double zthz = gdInstorageCountService.amountZaitu();
-        rp.setZthzc(zthz); // 在途货值(元),今天 // 计算
+        double zthzyc = gdInstorageCountService.amountZaituYc();
+        rp.setZthzc(zthz + zthzyc); // 在途货值(元),今天 // 计算
 
         //库存货值
         double kzhz = gdInventoryOkService.amountCurrent();
@@ -150,6 +153,7 @@ public class GdSalesReportdayService extends ServiceImpl<GdSalesReportdayMapper,
         rp.setKchzc(kzhz1); // 库存货值(元),今天 // 计算
 
         baseMapper.insert(rp);
+        salesDataDailySummaryService.clearAndInsertBySalesReportday(rp);
         return rp;
     }
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java

@@ -71,5 +71,13 @@ public interface GdSalesYcMapper extends BaseMapper<GdSalesYc> {
     List<Map<String, Object>> listOfProductOnDay(@Param("dataDate") String orderDate);
 
     @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate}")
-    double amountOfDay(String orderDate);
+    double amountOfDay(@Param("dataDate") String orderDate);
+
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " +
+            " and storeCode in (select code from store_index si where si.`type`='连网连锁店') ")
+    double amountOfLwlsdDay(@Param("dataDate") String orderDate);
+
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " +
+            " and storeCode in (select code from store_index si where si.`type`='连锁内加盟') ")
+    double amountOfLsnjmDay(String orderDate);
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java

@@ -70,4 +70,12 @@ public class GdSalesYcService extends ServiceImpl<GdSalesYcMapper, GdSalesYc> {
     public double amountOfDay(String orderDate) {
         return baseMapper.amountOfDay(orderDate);
     }
+
+    public double amountOfLwlsdDay(String orderDate) {
+        return baseMapper.amountOfLwlsdDay(orderDate);
+    }
+
+    public double amountOfLsnjmDay(String orderDate) {
+        return baseMapper.amountOfLsnjmDay(orderDate);
+    }
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/SalesDataDailySummary.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.gdsales;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: SalesDataDailySummary.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdsales.SalesDataDailySummary <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023/1/13 2:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("sales_data_daily_summary")
+public class SalesDataDailySummary extends BaseEntity {
+    public SalesDataDailySummary() {
+    }
+
+    public SalesDataDailySummary(String summaryDate) {
+        this.summaryDate = summaryDate;
+    }
+
+    public SalesDataDailySummary(String summaryDate, String salesChannelCode, String salesTerritoryCode) {
+        this.summaryDate = summaryDate;
+        this.salesChannelCode = salesChannelCode;
+        this.salesTerritoryCode = salesTerritoryCode;
+    }
+
+    private String summaryDate; // 汇总日期
+    private String salesChannelCode; // 销售渠道代码01.连网连锁店02.连锁内加盟03.配送中心04.连锁外加盟（销配结算）
+    private String salesTerritoryCode; // 销售领域代码01.常规商品02.烟草
+    private double salesAmount = 0; //销售金额
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/SalesDataDailySummaryMapper.java

@@ -0,0 +1,51 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.gdsales;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: SalesDataDailySummaryMapper.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdsales.SalesDataDailySummaryMapper <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023/1/13 2:31 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SalesDataDailySummaryMapper extends BaseMapper<SalesDataDailySummary> {
+
+    @Delete("delete from sales_data_daily_summary where summaryDate=#{summaryDate}")
+    void clearByOrderDate(@Param("summaryDate") String orderDate);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/SalesDataDailySummaryService.java

@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.gdsales;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.xml.ws.Action;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: SalesDataDailySummaryService.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdsales.SalesDataDailySummaryService <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023/1/13 2:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SalesDataDailySummaryService extends MybatisBaseService<SalesDataDailySummaryMapper, SalesDataDailySummary> {
+
+    @Autowired
+    private GdSalesYcService gdSalesYcService;
+
+
+    public void clearAndInsertBySalesReportday(GdSalesReportday rp) {
+        String orderDate = rp.getOrderDate();
+
+        List<SalesDataDailySummary> toInsertList = new ArrayList<>();
+
+        SalesDataDailySummary sd0101 = new SalesDataDailySummary(orderDate);
+        sd0101.setSalesChannelCode("01");
+        sd0101.setSalesTerritoryCode("01");
+        sd0101.setSalesAmount(rp.getLwlsdze());
+        toInsertList.add(sd0101);
+
+        SalesDataDailySummary sd0102 = new SalesDataDailySummary(orderDate,"01","02");
+        double lwlsdyc = gdSalesYcService.amountOfLwlsdDay(orderDate);
+        sd0102.setSalesAmount(lwlsdyc);
+        toInsertList.add(sd0102);
+
+
+        SalesDataDailySummary sd0201 = new SalesDataDailySummary(orderDate,"02","01");
+        sd0201.setSalesAmount(rp.getLsnjmze());
+        toInsertList.add(sd0201);
+
+        SalesDataDailySummary sd0202 = new SalesDataDailySummary(orderDate,"02","02");
+        double lsnjmyc = gdSalesYcService.amountOfLsnjmDay(orderDate);
+        sd0202.setSalesAmount(lsnjmyc);
+        toInsertList.add(sd0202);
+
+        SalesDataDailySummary sd0301 = new SalesDataDailySummary(orderDate,"03","01");
+        sd0301.setSalesAmount(rp.getPszxze());
+        toInsertList.add(sd0301);
+
+        SalesDataDailySummary sd0302 = new SalesDataDailySummary(orderDate,"03","02");
+        sd0302.setSalesAmount(0);
+        toInsertList.add(sd0302);
+
+
+        SalesDataDailySummary sd0401 = new SalesDataDailySummary(orderDate,"04","01");
+        sd0401.setSalesAmount(rp.getLswjmze());
+        toInsertList.add(sd0401);
+
+
+        SalesDataDailySummary sd0402 = new SalesDataDailySummary(orderDate,"04","02");
+        sd0402.setSalesAmount(rp.getYcjmdze());
+        toInsertList.add(sd0402);
+
+        clearByOrderDate(orderDate);
+        super.saveBatch(toInsertList);
+    }
+
+    private void clearByOrderDate(String orderDate) {
+        baseMapper.clearByOrderDate(orderDate);
+    }
+}