Merge remote-tracking branch 'origin/master'

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

@@ -97,13 +97,13 @@ public interface GdInstorageCountMapper extends BaseMapper<GdInstorageCount> {
     List<Map<String, Object>> ycddmxb();
 
     @Select("SELECT CONCAT('[',prs.storeCode,']',prs.storeName) storeName , " +
-            "CONVERT(SUM(prs.price),DECIMAL(12,2)) ddspjz, " +
-            "CONVERT(IFNULL(SUM(giy.colq16),0),DECIMAL(12,2)) colq16, " +
-            "CONVERT(IF(SUM(prs.price)-IFNULL(SUM(giy.colq16),0)>0,SUM(prs.price)-IFNULL(SUM(giy.colq16),0),0),DECIMAL(12,2)) ztprodValue1, " +
-            "CONVERT(IF(IFNULL(SUM(giy.colq16),0)-SUM(prs.price)>0,IFNULL(SUM(giy.colq16),0)-SUM(prs.price),0),DECIMAL(12,2)) ztprodValue2 " +
-            " FROM  `purchase_requisition_store` prs " +
-            "LEFT JOIN `purchase_requisition_tobacco_details` prtd ON prs.sid=prtd.mainsid " +
-            "LEFT JOIN `gd_instorage_yc` giy ON giy.colb1=prs.storeCode " +
-            "GROUP BY prs.storeCode ")
+            "    CONVERT(SUM(prs.price),DECIMAL(12,2)) ddspjz, " +
+            "            (SELECT CONVERT(IFNULL(SUM(giyy.colq16),0),DECIMAL(12,2)) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode)  colq16, " +
+            "    CONVERT(IF(SUM(prs.price)-IFNULL((SELECT SUM(giyy.colq16) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode ),0)>0, " +
+            "    SUM(prs.price)-IFNULL((SELECT SUM(giyy.colq16) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode ),0),0),DECIMAL(12,2)) ztprodValue1, " +
+            "    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) " +
+            "    FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode ),0)-SUM(prs.price),0),DECIMAL(12,2)) ztprodValue2 " +
+            "    FROM  `purchase_requisition_store` prs " +
+            "    GROUP BY prs.storeCode")
     List<Map<String, Object>> ycspdhmxb();
 }

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

@@ -31,6 +31,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Project: yxt_supervise <br/>
  * File: GdInstorageJmdMapper.java <br/>
@@ -51,4 +54,19 @@ public interface GdInstorageJmdMapper extends BaseMapper<GdInstorageJmd> {
 
     @Select("SELECT IFNULL(sum(colq16),0) as amount FROM gd_instorage_jmd where orderDate=#{orderDate} ")
     double amountOfDay(@Param("orderDate") String orderDate);
+
+    @Select("select colb1 storeCode,colc2 name,sum(colq16) amount from gd_instorage_jmd gij where orderDate=#{orderDate} GROUP BY colb1,colc2 ")
+    List<Map<String, Object>> listOfStoreDay(@Param("orderDate") String orderDate);
+
+    @Select("select colc2 name,  " +
+            "       colb1 storeCode,  " +
+            "       colg6 orderType,  " +
+            "       colf5 orderNo,  " +
+            "       colh7 prodCode,  " +
+            "       coli8 prodName,  " +
+            "       colr17 saleNum,  " +
+            "       '无' as salePrice,  " +
+            "       colq16 amount   " +
+            "       from gd_instorage_jmd gij where orderDate=#{orderDate} order by colc2 ")
+    List<Map<String, Object>> listOfProductDay(@Param("orderDate") String orderDate);
 }

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

@@ -28,6 +28,9 @@ package com.yxt.supervise.portal.biz.gdinstorage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Project: yxt_supervise <br/>
  * File: GdInstorageJmdService.java <br/>
@@ -51,4 +54,12 @@ public class GdInstorageJmdService extends ServiceImpl<GdInstorageJmdMapper, GdI
     public double amountOfDay(String orderDate) {
         return baseMapper.amountOfDay(orderDate);
     }
+
+    public List<Map<String, Object>> listOfStoreDay(String orderDate) {
+        return baseMapper.listOfStoreDay(orderDate);
+    }
+
+    public List<Map<String, Object>> listOfProductDay(String orderDate) {
+        return baseMapper.listOfProductDay(orderDate);
+    }
 }

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

@@ -31,6 +31,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Project: yxt_supervise <br/>
  * File: GdInstorageYcMapper.java <br/>
@@ -53,4 +56,22 @@ public interface GdInstorageYcMapper extends BaseMapper<GdInstorageYc> {
             "  select gig.* from gd_instorage_yc gig left join store_index si on gig.colb1=si.code " +
             "  where gig.orderDate=#{orderDate} and si.`type` ='连锁外加盟（销配结算）' ) t ")
     double amountOfDayJmd(@Param("orderDate") String orderDate);
+
+    @Select("select colb1 storeCode,colc2 name,IFNULL(sum(colq16),0) amount from gd_instorage_yc giy where orderDate=#{orderDate}  " +
+            "and colb1 in (select code from store_index si where si.`type`='连锁外加盟（销配结算）') " +
+            "group by colb1,colc2 order by colb1 ")
+    List<Map<String, Object>> listOfJmdStoreDay(@Param("orderDate") String orderDate);
+
+    @Select("select colc2 name,    " +
+            "       colb1 storeCode,   " +
+            "       colg6 orderType,    " +
+            "       colf5 orderNo,    " +
+            "       colh7 prodCode,    " +
+            "       coli8 prodName,    " +
+            "       colr17 saleNum,    " +
+            "       '无' as salePrice,   " +
+            "        colq16 amount  from gd_instorage_yc giy where orderDate=#{orderDate}    " +
+            "and colb1 in (select code from store_index si where si.`type`='连锁外加盟（销配结算）')   " +
+            "order by colb1")
+    List<Map<String, Object>> listOfJmdProductDay(@Param("orderDate")String orderDate);
 }

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

@@ -28,6 +28,9 @@ package com.yxt.supervise.portal.biz.gdinstorage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Project: yxt_supervise <br/>
  * File: GdInstorageYcService.java <br/>
@@ -50,4 +53,12 @@ public class GdInstorageYcService extends ServiceImpl<GdInstorageYcMapper, GdIns
     public double amountOfDayJmd(String orderDate) {
         return baseMapper.amountOfDayJmd( orderDate);
     }
+
+    public List<Map<String, Object>> listOfJmdStoreDay(String orderDate) {
+        return baseMapper.listOfJmdStoreDay(orderDate);
+    }
+
+    public List<Map<String, Object>> listOfJmdProductDay(String orderDate) {
+        return baseMapper.listOfJmdProductDay(orderDate);
+    }
 }

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

@@ -136,11 +136,11 @@ public class GdSalesReportdayService extends ServiceImpl<GdSalesReportdayMapper,
 
         //在途货值
         double zthz = gdInstorageCountService.amountZaitu();
-        rp.setZthzc(0); // 在途货值(元),今天 // 计算
+        rp.setZthzc(zthz); // 在途货值(元),今天 // 计算
 
         //库存货值
         double kzhz = gdInventoryOkService.amountCurrent();
-        rp.setKchzc(0); // 库存货值(元),今天 // 计算
+        rp.setKchzc(kzhz); // 库存货值(元),今天 // 计算
 
         baseMapper.insert(rp);
         return rp;

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

@@ -36,6 +36,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmdService;
+import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageYcService;
 import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProdService;
 import com.yxt.supervise.portal.biz.storeindex.StoreIndexService;
 import com.yxt.supervise.portal.biz.storeinfo.StoreInfoService;
@@ -91,6 +93,10 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
     private StoreIndexService storeIndexService;
     @Autowired
     private GdSalesReportdayService gdSalesReportdayService;
+    @Autowired
+    private GdInstorageJmdService gdInstorageJmdService;
+    @Autowired
+    private GdInstorageYcService gdInstorageYcService;
 
     public ResultBean<GdSalesLog> uploadAndInsert(MultipartFile file) {
         ResultBean rb = ResultBean.fireFail();
@@ -247,6 +253,8 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
         writer.setSheet(1);
         int storeCount = baseMapper.countStoreOnDay(orderDate);
         List<Map<String, Object>> list1 = baseMapper.listOfStoreOnDay(orderDate);
+        List<Map<String, Object>> list1jmd =  gdInstorageJmdService.listOfStoreDay(orderDate);
+        list1.addAll(list1jmd);
         // writer.writeCellValue(0, 1, "编号：mdxsmxb" + dfmt1);
         writer.merge(1, 1, 0, 2, "编号：mdxsmxb" + dfmt1, false);
         writer.writeCellValue(3, 1, "渠道数量：  " + storeCount);
@@ -272,6 +280,8 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
         writer.setSheet(2);
         int productCount = baseMapper.countProductOnDay(orderDate);
         List<Map<String, Object>> list2 = baseMapper.listOfProductOnDay(orderDate);
+        List<Map<String, Object>> list2jmd = gdInstorageJmdService.listOfProductDay(orderDate);
+        list2.addAll(list2jmd);
         // writer.writeCellValue(0, 1, "编号：mdspxsmxb" + dfmt1);
         writer.merge(1, 1, 0, 2, "编号：mdspxsmxb" + dfmt1, false);
         // writer.writeCellValue(3, 1, "商品数量：  " + productCount);
@@ -300,6 +310,8 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
         writer.setSheet(3);
         int storeCountyc = gdSalesYcService.countStoreOnDay(orderDate);
         List<Map<String, Object>> list1yc = gdSalesYcService.listOfStoreOnDay(orderDate);
+        // List<Map<String, Object>> list1ycjmd = gdInstorageYcService.listOfJmdStoreDay(orderDate);
+        // list1yc.addAll(list1ycjmd);
         // writer.writeCellValue(0, 1, "编号：ycmdxsmxb" + dfmt1);
         writer.merge(1, 1, 0, 2, "编号：ycmdxsmxb" + dfmt1, false);
         writer.writeCellValue(3, 1, "渠道数量：  " + storeCountyc);
@@ -325,6 +337,8 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
         writer.setSheet(4);
         int productCountyc = gdSalesYcService.countProductOnDay(orderDate);
         List<Map<String, Object>> list2yc = gdSalesYcService.listOfProductOnDay(orderDate);
+        // List<Map<String, Object>> list2ycjmd = gdInstorageYcService.listOfJmdProductDay(orderDate);
+        // list2yc.addAll(list2ycjmd);
         writer.merge(1, 1, 0, 2, "编号：ycmdspxsmxb" + dfmt1, false);
         writer.merge(1, 1, 3, 4, "商品数量：  " + productCountyc, false);
         writer.merge(1, 1, 5, 7, "上报时间：" + dfmt2, false);
@@ -357,8 +371,8 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
     }
 
     private void xshzrbb(ExcelWriter writer, GdSalesReportday reportday) {
-        writer.writeCellValue(0, 1, "编号：" + reportday.getSerialNumber());
-        writer.writeCellValue(2, 1, "上报时间：" + reportday.getReportTime());
+        writer.merge(1, 1, 0, 1, "编号：" + reportday.getSerialNumber(), false);
+        writer.merge(1, 1, 2, 3, "上报时间：" + reportday.getReportTime(), false);
         writer.writeCellValue(1, 3, reportday.getKmdatea()); // 科目/日,大前天
         writer.writeCellValue(2, 3, reportday.getKmdateb()); // 科目/日,前天
         writer.writeCellValue(3, 3, reportday.getKmdatec()); // 科目/日,昨天