From d65c48adb340bec4428c67d504e7ff389a4c243e Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Sat, 17 Dec 2022 15:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=BA=97=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=B4=A7=E5=80=BC=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/gdinstorage/GdInstorageGdMapper.java  |  5 ++
 .../biz/gdinstorage/GdInstorageGdService.java | 72 ++++++++++++-------
 2 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdMapper.java
index 2d953d6b..7e778d9b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdMapper.java
@@ -52,4 +52,9 @@ public interface GdInstorageGdMapper extends BaseMapper<GdInstorageGd> {
             " and colb1 IN (SELECT CODE FROM store_index WHERE TYPE='连锁外加盟（销配结算）') " +
             " and colh7 in (select prodCode from gd_rescategory_prod) ")
     List<GdInstorageGd> jmdRkmxList(@Param("orderDate") String oDate);
+
+    @Select("SELECT convert(ifnull(sum(colq16),0),decimal(12,2)) FROM gd_instorage_gd WHERE orderDate=#{orderDate} " +
+            " and colb1 IN (SELECT CODE FROM store_index WHERE TYPE='连锁外加盟（销配结算）') " +
+            " and colh7 in (select prodCode from gd_rescategory_prod) ")
+    double jmdRkmxdValOfDay(@Param("orderDate") String orderDate);
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdService.java
index 74fec3f4..20a1ca29 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdService.java
@@ -73,6 +73,26 @@ public class GdInstorageGdService extends ServiceImpl<GdInstorageGdMapper, GdIns
         return p;
     }
 
+    /**
+     * 加盟店入库明细单
+     *
+     * @param orderDate
+     * @return
+     */
+    public List<GdInstorageGd> jmdRkmxdOfDay(String orderDate) {
+        return baseMapper.jmdRkmxList(orderDate);
+    }
+
+    /**
+     * 加盟店入库明细单货值按天汇总
+     *
+     * @param orderDate
+     * @return
+     */
+    public double jmdRkmxdValOfDay(String orderDate) {
+        return baseMapper.jmdRkmxdValOfDay(orderDate);
+    }
+
     public List<GdInstorageGd> jmdRkmxList(GdRukuQuery rq) {
         String oDate = DateUtil.format(new Date(), "yyyy-MM-dd");
         if (rq != null && StrUtil.isNotBlank(rq.getOrderDate())) {
@@ -102,32 +122,32 @@ public class GdInstorageGdService extends ServiceImpl<GdInstorageGdMapper, GdIns
         File file = FileUtil.file(toFileName);
         ExcelWriter writer = ExcelUtil.getWriter(file);
 
-        writer.addHeaderAlias("cola0","企业组织机构代码证");
-        writer.addHeaderAlias("colb1","仓库/门店编号");
-        writer.addHeaderAlias("colc2","仓库/门店名称");
-        writer.addHeaderAlias("cold3","入库时间");
-        writer.addHeaderAlias("colex","供应商编号");
-        writer.addHeaderAlias("cole4","供应商名称");
-        writer.addHeaderAlias("colf5","单据号");
-        writer.addHeaderAlias("colg6","单据类型");
-        writer.addHeaderAlias("colh7","货号");
-        writer.addHeaderAlias("coli8","商品名称");
-        writer.addHeaderAlias("colj9","商品生产日期");
-        writer.addHeaderAlias("colk10","商品保质期");
-        writer.addHeaderAlias("coll11","商品规格");
-        writer.addHeaderAlias("colm12","类别编号");
-        writer.addHeaderAlias("coln13","类别名称");
-        writer.addHeaderAlias("colo14","一级类别名称");
-        writer.addHeaderAlias("colp15","二级类别名称");
-        writer.addHeaderAlias("colq16","入库金额");
-        writer.addHeaderAlias("colr17","入库数量");
-        writer.addHeaderAlias("cols18","成本金额");
-        writer.addHeaderAlias("colt19","成本税额");
-        writer.addHeaderAlias("colu20","不含税成本");
-        writer.addHeaderAlias("colv21","进项税率");
-        writer.addHeaderAlias("supplierCodeUnified","供货商编码统一");
-        writer.addHeaderAlias("orderDate","单据日期");
-        writer.addHeaderAlias("id","编号");
+        writer.addHeaderAlias("cola0", "企业组织机构代码证");
+        writer.addHeaderAlias("colb1", "仓库/门店编号");
+        writer.addHeaderAlias("colc2", "仓库/门店名称");
+        writer.addHeaderAlias("cold3", "入库时间");
+        writer.addHeaderAlias("colex", "供应商编号");
+        writer.addHeaderAlias("cole4", "供应商名称");
+        writer.addHeaderAlias("colf5", "单据号");
+        writer.addHeaderAlias("colg6", "单据类型");
+        writer.addHeaderAlias("colh7", "货号");
+        writer.addHeaderAlias("coli8", "商品名称");
+        writer.addHeaderAlias("colj9", "商品生产日期");
+        writer.addHeaderAlias("colk10", "商品保质期");
+        writer.addHeaderAlias("coll11", "商品规格");
+        writer.addHeaderAlias("colm12", "类别编号");
+        writer.addHeaderAlias("coln13", "类别名称");
+        writer.addHeaderAlias("colo14", "一级类别名称");
+        writer.addHeaderAlias("colp15", "二级类别名称");
+        writer.addHeaderAlias("colq16", "入库金额");
+        writer.addHeaderAlias("colr17", "入库数量");
+        writer.addHeaderAlias("cols18", "成本金额");
+        writer.addHeaderAlias("colt19", "成本税额");
+        writer.addHeaderAlias("colu20", "不含税成本");
+        writer.addHeaderAlias("colv21", "进项税率");
+        writer.addHeaderAlias("supplierCodeUnified", "供货商编码统一");
+        writer.addHeaderAlias("orderDate", "单据日期");
+        writer.addHeaderAlias("id", "编号");
 
         writer.write(list);
         writer.flush();