From afc6e6f3622c78caf484242730346a8d74115f0f Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Thu, 29 Dec 2022 15:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B1=87=E6=80=BB=20?=
 =?UTF-8?q?=E7=83=9F=E8=8D=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base-ui/src/api/kucun/kucun.js                |   8 +
 base-ui/src/views/kucun/kcxxcx/index.vue      |  22 +-
 .../biz/gdinstorage/GdInstorageGdMapper.java  |   4 +
 .../biz/gdinstorage/GdInstorageGdService.java |   4 +
 .../biz/gdinstorage/GdInstorageMapper.java    |   5 +
 .../biz/gdinstorage/GdInstorageService.java   |   7 +
 .../biz/gdinventory/GdInventoryRest.java      |   7 +
 .../biz/gdinventory/GdInventoryService.java   |  97 ++--
 .../portal/biz/gdinventory/GdInventoryYc.java |  59 +++
 .../biz/gdinventory/GdInventoryYcMapper.java  |  65 +++
 .../biz/gdinventory/GdInventoryYcService.java | 140 ++++++
 .../biz/storeinfo/StoreInfoService.java       | 422 ++++++++++--------
 .../src/main/resources/application-devv.yml   |   2 +-
 .../xlsx-tmpl/库存汇总表-烟草.xlsx     | Bin 0 -> 15827 bytes
 14 files changed, 618 insertions(+), 224 deletions(-)
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcMapper.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcService.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/库存汇总表-烟草.xlsx

diff --git a/base-ui/src/api/kucun/kucun.js b/base-ui/src/api/kucun/kucun.js
index d47a2144..1d716e51 100644
--- a/base-ui/src/api/kucun/kucun.js
+++ b/base-ui/src/api/kucun/kucun.js
@@ -9,6 +9,14 @@ export function kchz(data) {
   })
 }
 // 条件查询
+export function kchzyc(data) {
+  return request({
+    url: '/kucun/kchzyc',
+    method: 'get',
+    data: data
+  })
+}
+// 条件查询
 export function downloadhz(parm) {
   return request({
     url: '/kucun/downloadhz',
diff --git a/base-ui/src/views/kucun/kcxxcx/index.vue b/base-ui/src/views/kucun/kcxxcx/index.vue
index c3e52f6b..b602e81b 100644
--- a/base-ui/src/views/kucun/kcxxcx/index.vue
+++ b/base-ui/src/views/kucun/kcxxcx/index.vue
@@ -32,7 +32,10 @@
         <h3>库存汇总数据</h3>
         <el-card class="box-card">
           <div>{{ hzResultMesssage }}</div>
-          <div><el-button :disabled="!hzFilePath" size="small" type="primary" @click="doDownloadHz">下载汇总文件</el-button></div>
+          <div>
+            <el-button :disabled="!hzFilePath" size="small" type="primary" @click="doDownloadHz">下载汇总文件</el-button>
+            <el-button :disabled="!ychzFilePath" size="small" type="primary" @click="doDownloadHzYc">下载烟草汇总文件</el-button>
+          </div>
         </el-card>
       </div>
     </el-card>
@@ -40,7 +43,7 @@
 </template>
 
 <script>
-import { kchz } from '@/api/kucun/kucun'
+import { kchz, kchzyc } from '@/api/kucun/kucun'
 export default {
   name: 'KucunKcxxcxIndex',
   // components: {  },
@@ -52,6 +55,7 @@ export default {
       uploadResultMesssage: '',
       hzResultMesssage: '',
       hzFilePath: '',
+      ychzFilePath: '',
       fullscreenloading: null
     }
   },
@@ -119,6 +123,17 @@ export default {
           if (this.fullscreenloading) this.fullscreenloading.close()
           this.fullscreenloading = null
         })
+      kchzyc()
+        .then(res => {
+          if (this.fullscreenloading) this.fullscreenloading.close()
+          this.fullscreenloading = null
+          console.log('444', res)
+          _this.ychzFilePath = res.data
+        })
+        .catch(e => {
+          if (this.fullscreenloading) this.fullscreenloading.close()
+          this.fullscreenloading = null
+        })
     },
     doDownloadHz() {
       window.open(this.hzFilePath, '_blank')
@@ -136,6 +151,9 @@ export default {
       //     .catch(e => {
       //       console.log(e)
       //     })
+    },
+    doDownloadHzYc() {
+      window.open(this.ychzFilePath, '_blank')
     }
   }
 }
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 7e778d9b..fa051903 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
@@ -26,6 +26,7 @@
 package com.yxt.supervise.portal.biz.gdinstorage;
 
 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;
 import org.apache.ibatis.annotations.Select;
@@ -57,4 +58,7 @@ 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) ")
     double jmdRkmxdValOfDay(@Param("orderDate") String orderDate);
+
+    @Delete("delete from gd_instorage_gd where orderDate=#{orderDate} ")
+    void clearByOrderDate(@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 20a1ca29..e172b2c3 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
@@ -155,4 +155,8 @@ public class GdInstorageGdService extends ServiceImpl<GdInstorageGdMapper, GdIns
 
         return url;
     }
+
+    public void clearByOrderDate(String orderDate) {
+        baseMapper.clearByOrderDate(orderDate);
+    }
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageMapper.java
index 68378e3e..18ce8354 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageMapper.java
@@ -26,7 +26,9 @@
 package com.yxt.supervise.portal.biz.gdinstorage;
 
 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/>
@@ -43,4 +45,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GdInstorageMapper extends BaseMapper<GdInstorage> {
+
+    @Delete("delete from gd_instorage where orderDate=#{orderDate} ")
+    void clearByOrderDate(@Param("orderDate") String orderDate);
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java
index 26f45060..22688c65 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java
@@ -221,9 +221,13 @@ public class GdInstorageService extends ServiceImpl<GdInstorageMapper, GdInstora
             @Override
             public void doAfterAllAnalysed() {
                 if (toInsertListGd != null && !toInsertListGd.isEmpty()) {
+                    GdInstorageGd gdInstorageGd = toInsertListGd.get(0);
+                    gdInstorageGdService.clearByOrderDate(gdInstorageGd.getOrderDate());
                     gdInstorageGdService.saveBatch(toInsertListGd);
                 }
                 if (toInsertList != null && !toInsertList.isEmpty()) {
+                    GdInstorage gdInstorage = toInsertList.get(0);
+                    GdInstorageService.this.clearByOrderDate(gdInstorage.getOrderDate());
                     GdInstorageService.this.saveBatch(toInsertList);
                 }
                 if (errList != null && !errList.isEmpty()) {
@@ -248,4 +252,7 @@ public class GdInstorageService extends ServiceImpl<GdInstorageMapper, GdInstora
         PagerVo<GdInstorage> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    public void clearByOrderDate(String orderDate) {
+        baseMapper.clearByOrderDate(orderDate);
+    }
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java
index 91723ceb..fb361a81 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java
@@ -59,6 +59,8 @@ public class GdInventoryRest {
     private GdInventoryService gdInventoryService;
     @Autowired
     private GdInventoryOkService gdInventoryOkService;
+    @Autowired
+    private GdInventoryYcService gdInventoryYcService;
 
     @GetMapping("/implgd")
     public ResultBean implInventory() {
@@ -81,6 +83,11 @@ public class GdInventoryRest {
         return gdInventoryOkService.kchz();
     }
 
+    @GetMapping("/kchzyc")
+    public ResultBean kchzyc() {
+        return gdInventoryYcService.kchzyc();
+    }
+
     @GetMapping("/downloadhz")
     public void downloadhz(HttpServletResponse response, @RequestParam("filepath") String filepath) throws IOException {
         System.out.println("XXXX:  " + filepath);
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java
index f39b28b2..dc6c516d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java
@@ -37,6 +37,7 @@ 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.storeindex.StoreIndexService;
+import com.yxt.supervise.portal.biz.storeinfo.StoreInfoService;
 import com.yxt.supervise.portal.extexcel.CsvTool;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,10 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
     private GdInventoryLogService gdInventoryLogService;
     @Autowired
     private GdInventoryLogErrService gdInventoryLogErrService;
+    @Autowired
+    private GdInventoryYcService gdInventoryYcService;
+    @Autowired
+    private StoreInfoService storeInfoService;
 
     public void doCheck() {
 
@@ -289,11 +294,44 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
         return new RowHandler() {
 
             private List<GdInventoryOk> toInsertList = new ArrayList<>();
+            private List<GdInventoryYc> toInsertListYc = new ArrayList<>();
             private List<GdInventoryLogErr> errList = new ArrayList<>();
-            private int x = 0, y = 0, errnum = 0;
-            private int num = 0;
+            private int x = 0, y = 0, z = 0, errnum = 0;
+            private int num = 0, numyc = 0;
             private String odate = null;
 
+            private Map<String, Object> readMapFromRow(List<Object> r) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("orgCode", r.get(0));// 企业组织机构代码证
+                map.put("warehouseCode", "" + r.get(1));// 仓库/门店编号
+                map.put("warehouseName", r.get(2)); // 仓库/门店名称
+                map.put("prodCode", "" + r.get(3)); // 商品编码
+                map.put("prodBarCode", r.get(4));// 商品条码
+                map.put("prodName", r.get(5)); // 商品名称
+                map.put("warehouseType", r.get(6)); // 仓库类型
+                map.put("prodNum", r.get(7)); // 商品数量
+                map.put("prodValue", r.get(8)); // 商品货值
+                map.put("suppliderName", r.get(9)); // 供应商
+                map.put("datadate", r.get(10)); // 数据日期
+                return map;
+            }
+
+            private GdInventoryLogErr createErrorInfo(List<Object> r, String errInfo) {
+                GdInventoryLogErr gile = new GdInventoryLogErr();
+                gile.setRowNum(x + 1);
+                gile.setErrInfo(errInfo);
+                gile.setFileFullPath(gdlog.getFileFullPath());
+                gile.setRowContent(JSONUtil.toJsonStr(r));
+                gile.setProdCode("" + r.get(3));
+                gile.setProdName("" + r.get(5));
+                gile.setProdNum("" + r.get(7));
+                gile.setProdValue("" + r.get(8));
+                gile.setSupplierCode("");
+                gile.setSupplierName("" + r.get(9));
+                gile.setOrderDate(odate);
+                return gile;
+            }
+
             @Override
             public void handle(int sheetIndex, long rowIndex, List<Object> r) {
                 if (rowIndex > 0) {
@@ -307,18 +345,7 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
 
                     if (gdRescategoryProdService.containsCode(prodCode) && storeIndexService.containsCodeWithOneNoJmd(warehouseCode)) {
                         GdInventoryOk ok = new GdInventoryOk();
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("orgCode", r.get(0));// 企业组织机构代码证
-                        map.put("warehouseCode", warehouseCode);// 仓库/门店编号
-                        map.put("warehouseName", r.get(2)); // 仓库/门店名称
-                        map.put("prodCode", prodCode); // 商品编码
-                        map.put("prodBarCode", r.get(4));// 商品条码
-                        map.put("prodName", r.get(5)); // 商品名称
-                        map.put("warehouseType", r.get(6)); // 仓库类型
-                        map.put("prodNum", r.get(7)); // 商品数量
-                        map.put("prodValue", r.get(8)); // 商品货值
-                        map.put("suppliderName", r.get(9)); // 供应商
-                        map.put("datadate", r.get(10)); // 数据日期
+                        Map<String, Object> map = readMapFromRow(r);
 
                         try {
                             BeanUtil.fillBeanWithMap(map, ok, true);
@@ -326,22 +353,11 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
                             y++;
                         } catch (Exception e) {
                             errnum++;
-                            GdInventoryLogErr gile = new GdInventoryLogErr();
-                            gile.setRowNum(x + 1);
-                            gile.setErrInfo(e.getMessage());
-                            gile.setFileFullPath(gdlog.getFileFullPath());
-                            gile.setRowContent(JSONUtil.toJsonStr(r));
-                            gile.setProdCode(prodCode);
-                            gile.setProdName(""+r.get(5));
-                            gile.setProdNum(""+r.get(7));
-                            gile.setProdValue(""+r.get(8));
-                            gile.setSupplierCode("");
-                            gile.setSupplierName(""+r.get(9));
-                            gile.setOrderDate(odate);
+                            GdInventoryLogErr gile = createErrorInfo(r, e.getMessage());
                             errList.add(gile);
                         }
 
-                        if (999 == num) {
+                        if (990 == num) {
                             gdInventoryOkService.saveBatch(toInsertList);
                             num = 0;
                             toInsertList.clear();
@@ -349,6 +365,29 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
                             num++;
                         }
                     }
+
+                    if ("0811".equals(prodCode.substring(0, 4)) && storeInfoService.containsCodeOfYc(warehouseCode)) {
+                        GdInventoryYc yc = new GdInventoryYc();
+                        Map<String, Object> map = readMapFromRow(r);
+
+                        try {
+                            BeanUtil.fillBeanWithMap(map, yc, true);
+                            toInsertListYc.add(yc);
+                            z++;
+                        } catch (Exception e) {
+                            errnum++;
+                            GdInventoryLogErr gile = createErrorInfo(r, e.getMessage());
+                            errList.add(gile);
+                        }
+
+                        if (990 == numyc) {
+                            gdInventoryYcService.saveBatch(toInsertListYc);
+                            numyc = 0;
+                            toInsertListYc.clear();
+                        } else {
+                            numyc++;
+                        }
+                    }
                     x++;
 //                    System.out.println(",X:" + x + ",Y:" + y);
                 }
@@ -364,6 +403,9 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
                 if (toInsertList != null && !toInsertList.isEmpty()) {
                     gdInventoryOkService.saveBatch(toInsertList);
                 }
+                if (toInsertListYc != null && !toInsertListYc.isEmpty()) {
+                    gdInventoryYcService.saveBatch(toInsertListYc);
+                }
                 if (errList != null && !errList.isEmpty()) {
                     gdInventoryLogErrService.saveBatch(errList);
                 }
@@ -385,6 +427,7 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
 
         long millis = System.currentTimeMillis();
         gdInventoryOkService.clearData();
+        gdInventoryYcService.clearData();
         GdInventoryLog gdlog = new GdInventoryLog(fp);
         ExcelUtil.read07BySax(fp, -1, createRowHandler(gdlog));
 //        System.out.println("用时:" + (System.currentTimeMillis() - millis));
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java
new file mode 100644
index 00000000..97503351
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.gdinventory;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdInventoryYc.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinventory.GdInventoryYc <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/29 10:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_inventory_yc")
+public class GdInventoryYc extends EntityWithId {
+    private String orgCode; // 企业组织机构代码证
+    private String warehouseCode; // 仓库/门店编号
+    private String warehouseName; // 仓库/门店名称
+    private String prodCode; // 商品编码
+    private String prodBarCode; // 商品条码
+    private String prodName; // 商品名称
+    private int warehouseType; // 仓库类型
+    private int prodNum; // 商品数量
+    private double prodValue; // 商品货值
+    private String suppliderName; // 供应商
+    private String datadate; // 数据日期
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcMapper.java
new file mode 100644
index 00000000..7a68c97d
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.gdinventory;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdInventoryYcMapper.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinventory.GdInventoryYcMapper <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/29 10:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface GdInventoryYcMapper extends BaseMapper<GdInventoryYc> {
+
+    @Delete("delete from gd_inventory_yc where 1=1")
+    void clearData();
+
+    @Select("select IFNULL(count(1),0) FROM (SELECT DISTINCT prodCode from gd_inventory_yc) t ")
+    int countProd2();
+
+    @Select("select IFNULL(sum(prodValue),0) from gd_inventory_yc")
+    double countVal2();
+    @Select("select warehouseName,warehouseType,IFNULL(count(1),0) as coun,IFNULL(sum(prodValue),0) as su from gd_inventory_yc gio group by warehouseName,warehouseType order by warehouseType")
+    List<Map<String, Object>> listOfWarehouse();
+
+    @Select("select warehouseCode, warehouseName, warehouseType, prodCode, prodBarCode, prodName, prodNum, prodValue from gd_inventory_yc order by warehouseType")
+    List<Map<String, Object>> listOfProd();
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcService.java
new file mode 100644
index 00000000..2f71c007
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcService.java
@@ -0,0 +1,140 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.gdinventory;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdInventoryYcService.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinventory.GdInventoryYcService <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/29 10:24 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class GdInventoryYcService extends ServiceImpl<GdInventoryYcMapper, GdInventoryYc> {
+    @Value("${image.upload.path:static/upload/}")
+    private String uploadPath;
+    @Value("${image.url.prefix:http://127.0.0.1:8080/upload/}")
+    private String urlPrefix;
+    @Value("${image.xlsxtmplyc:static/upload/}")
+    private String xlsxtmplPath;
+    public void clearData() {
+        baseMapper.clearData();
+    }
+
+    public ResultBean kchzyc() {
+        ResultBean rb = ResultBean.fireFail();
+
+        int prod2 = baseMapper.countProd2();
+        double val2 = baseMapper.countVal2();
+
+        Date curDate = new Date();
+        String timestr = DateUtil.format(curDate, "yyyyMMddHHmmssSSS");
+        String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        String datefmt1 = DateUtil.format(curDate, "yyyy-MM-dd HH:mm");
+        String datefmt2 = DateUtil.format(curDate, "yyyy/MM/dd HH:mm");
+
+        // URL resource = ResourceUtil.getResource("xlsx-tmpl/库存汇总表.xlsx");
+        String xlsxpath = xlsxtmplPath + "库存汇总表-烟草.xlsx";
+        File srcFile = FileUtil.file(xlsxpath);
+        String tfile = "kchzb/库存汇总表-烟草" + dfmt + ".xlsx";
+        String url = urlPrefix + tfile;
+        String toFileName = uploadPath + tfile;
+        File file = FileUtil.file(toFileName);
+        // FileUtil.copy(FileUtil.file(resource), file, true);
+        FileUtil.copy(srcFile, file, true);
+        ExcelWriter writer = ExcelUtil.getWriter(file);
+        writer.setSheet(0);
+        writer.writeCellValue(0, 1, "编号：" + timestr);
+        writer.writeCellValue(3, 1, datefmt1);
+
+        writer.writeCellValue(2, 3, prod2);
+        writer.writeCellValue(3, 3, val2);
+        // writer.flush();
+        // writer.close();
+
+        List<Map<String, Object>> list = baseMapper.listOfWarehouse();
+        // writer = ExcelUtil.getWriter(file);
+        writer.setSheet(1);
+        writer.writeCellValue(0, 1, "编号：" + timestr);
+        writer.writeCellValue(3, 1, datefmt1);
+        int size = list.size();
+        int countRow = size + 3;
+        for (int y = 3; y < countRow; y++) {
+            Map<String, Object> map = list.get(y - 3);
+            writer.writeCellValue(0, y, map.get("warehouseName"));
+            writer.writeCellValue(1, y, map.get("warehouseType"));
+            writer.writeCellValue(2, y, map.get("coun"));
+            writer.writeCellValue(3, y, map.get("su"));
+        }
+        writer.writeCellValue(0, countRow, "合计");
+        // writer.flush();
+        // writer.close();
+
+        List<Map<String, Object>> listp = baseMapper.listOfProd();
+        // writer = ExcelUtil.getWriter(file);
+        writer.setSheet(2);
+        writer.writeCellValue(0, 1, "编号：" + timestr);
+        writer.writeCellValue(6, 1, datefmt2);
+        int sizep = listp.size();
+        int countRowp = sizep + 3;
+        for (int y = 3; y < countRowp; y++) {
+            Map<String, Object> map = listp.get(y - 3);
+            writer.writeCellValue(0, y, map.get("warehouseCode"));
+            writer.writeCellValue(1, y, map.get("warehouseName"));
+            writer.writeCellValue(2, y, map.get("warehouseType"));
+            writer.writeCellValue(3, y, map.get("prodCode"));
+            writer.writeCellValue(4, y, map.get("prodBarCode"));
+            writer.writeCellValue(5, y, map.get("prodName"));
+            writer.writeCellValue(6, y, map.get("prodNum"));
+            writer.writeCellValue(7, y, map.get("prodValue"));
+        }
+        writer.flush();
+        writer.close();
+
+
+        return rb.success().setData(url);
+    }
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java
index 7619de8e..fc247b14 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java
@@ -30,14 +30,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.supervise.portal.api.salesdata.SalesData;
 import com.yxt.supervise.portal.api.storeinfo.*;
+import com.yxt.supervise.portal.biz.storeindex.StoreIndex;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -68,209 +67,244 @@ import java.util.List;
 @Slf4j
 @Service
 public class StoreInfoService extends MybatisBaseService<StoreInfoMapper, StoreInfo> {
-	private QueryWrapper<StoreInfo> createQueryWrapper(StoreInfoQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<StoreInfo> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<StoreInfoVo> listPageVo(PagerQuery<StoreInfoQuery> pq) {
-		StoreInfoQuery query = pq.getParams();
-		QueryWrapper<StoreInfo> qw = createQueryWrapper(query);
-		IPage<StoreInfo> page = PagerUtil.queryToPage(pq);
-		IPage<StoreInfoVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<StoreInfoVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(StoreInfoDto dto){
+    private QueryWrapper<StoreInfo> createQueryWrapper(StoreInfoQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<StoreInfo> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<StoreInfoVo> listPageVo(PagerQuery<StoreInfoQuery> pq) {
+        StoreInfoQuery query = pq.getParams();
+        QueryWrapper<StoreInfo> qw = createQueryWrapper(query);
+        IPage<StoreInfo> page = PagerUtil.queryToPage(pq);
+        IPage<StoreInfoVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<StoreInfoVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(StoreInfoDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(StoreInfoDto dto){
-		StoreInfo entity = new StoreInfo();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(StoreInfoDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(StoreInfoDto dto) {
+        StoreInfo entity = new StoreInfo();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(StoreInfoDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		StoreInfo entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public StoreInfoDetailsVo fetchDetailsVoBySid(String sid){
-		StoreInfo entity = fetchBySid(sid);
-		StoreInfoDetailsVo vo = new StoreInfoDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        StoreInfo entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public StoreInfoDetailsVo fetchDetailsVoBySid(String sid) {
+        StoreInfo entity = fetchBySid(sid);
+        StoreInfoDetailsVo vo = new StoreInfoDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
 
     public StoreInfo selectByCode(String storeCode) {
-		return baseMapper.selectByCode(storeCode);
+        return baseMapper.selectByCode(storeCode);
     }
-	public void readBrandPeriodSorXls1(InputStream is, String sid)  {
-		HSSFWorkbook hssfWorkbook = null;
-		try {
-			hssfWorkbook = new HSSFWorkbook(is);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		List<String> lisss=new ArrayList<>();
-		List<String> lisss2=new ArrayList<>();
-		HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
-		// 循环行Row
-		for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
-			StoreInfo sd=new StoreInfo();
-			HSSFRow hssfRow = hssfSheet.getRow(rowNum);
-			int i = 0;
-			try{
-				if(rowNum>=1){
-					for ( ; i < hssfRow.getLastCellNum(); i++) {
-						HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
-						if(brandIdHSSFCell!=null){
-							if (i == 1) {//代码
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									StoreInfo storeInfo = baseMapper.selectByCode(value);
-									if(storeInfo!=null){
-										sd=storeInfo;
+
+    public void readBrandPeriodSorXls1(InputStream is, String sid) {
+        HSSFWorkbook hssfWorkbook = null;
+        try {
+            hssfWorkbook = new HSSFWorkbook(is);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<String> lisss = new ArrayList<>();
+        List<String> lisss2 = new ArrayList<>();
+        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
+        // 循环行Row
+        for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
+            StoreInfo sd = new StoreInfo();
+            HSSFRow hssfRow = hssfSheet.getRow(rowNum);
+            int i = 0;
+            try {
+                if (rowNum >= 1) {
+                    for (; i < hssfRow.getLastCellNum(); i++) {
+                        HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
+                        if (brandIdHSSFCell != null) {
+                            if (i == 1) {//代码
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    StoreInfo storeInfo = baseMapper.selectByCode(value);
+                                    if (storeInfo != null) {
+                                        sd = storeInfo;
 //										sd.setIsJoin("1");
-										sd.setIsSjz("1");
-									}else{
-										sd.setCode(value);
-									}
-								}
-							}
-							if (i == 2) {//中文名称
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									if(value.indexOf("]")>=0){
-										String[] split = value.split("]");
-										value = split[1];
-									}
-									sd.setName(value);
-								}
-							}
-							if (i == 3) {//单位类型
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									sd.setType(value);
-								}
-							}
-							if (i == 4) {//联系人
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									sd.setContacts(value);
-								}
-							}
-							if (i == 5) {//电话
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									sd.setTelephone(value);
-								}
-							}
-							if (i == 6) {//地址信息1
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								String value = brandIdHSSFCell.getStringCellValue();
-								value=value.trim();
-								sd.setAddress(value);
-							}
-							if (i == 7) {//经度
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								String value = brandIdHSSFCell.getStringCellValue();
-								value=value.trim();
-								sd.setLongitude(value);
-							}
-							if (i == 8) {//纬度
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								String value = brandIdHSSFCell.getStringCellValue();
-								value=value.trim();
-								sd.setLatitude(value);
-							}
-							if (i == 9) {//配货价
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									sd.setProductPrice(value);
-								}
-							}
-							if (i == 10) {//区域
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									sd.setRegion(value);
-								}
-							}
-							if (i == 11) {//门店经营商品方案
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									sd.setProgramme(value);
-								}
-							}
-							if (i == 12) {//组代码
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									value=value.trim();
-									sd.setGroupCode(value);
-								}
-							}
-						}else{
-							System.err.println("rowNum="+rowNum+",i="+i+",value=null");
-						}
-					}
-				}
-			}catch(Exception e){
-				e.printStackTrace();
-				System.err.println("i="+i+",value=null");
-			}
+                                        sd.setIsSjz("1");
+                                    } else {
+                                        sd.setCode(value);
+                                    }
+                                }
+                            }
+                            if (i == 2) {//中文名称
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    if (value.indexOf("]") >= 0) {
+                                        String[] split = value.split("]");
+                                        value = split[1];
+                                    }
+                                    sd.setName(value);
+                                }
+                            }
+                            if (i == 3) {//单位类型
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    sd.setType(value);
+                                }
+                            }
+                            if (i == 4) {//联系人
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    sd.setContacts(value);
+                                }
+                            }
+                            if (i == 5) {//电话
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    sd.setTelephone(value);
+                                }
+                            }
+                            if (i == 6) {//地址信息1
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                String value = brandIdHSSFCell.getStringCellValue();
+                                value = value.trim();
+                                sd.setAddress(value);
+                            }
+                            if (i == 7) {//经度
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                String value = brandIdHSSFCell.getStringCellValue();
+                                value = value.trim();
+                                sd.setLongitude(value);
+                            }
+                            if (i == 8) {//纬度
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                String value = brandIdHSSFCell.getStringCellValue();
+                                value = value.trim();
+                                sd.setLatitude(value);
+                            }
+                            if (i == 9) {//配货价
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    sd.setProductPrice(value);
+                                }
+                            }
+                            if (i == 10) {//区域
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    sd.setRegion(value);
+                                }
+                            }
+                            if (i == 11) {//门店经营商品方案
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    sd.setProgramme(value);
+                                }
+                            }
+                            if (i == 12) {//组代码
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    value = value.trim();
+                                    sd.setGroupCode(value);
+                                }
+                            }
+                        } else {
+                            System.err.println("rowNum=" + rowNum + ",i=" + i + ",value=null");
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                System.err.println("i=" + i + ",value=null");
+            }
 
-			lisss.add(rowNum+"");
-			if(sd.getId()!=null&&sd.getId()!=0){
-				baseMapper.updateById(sd);
-			}else{
-				baseMapper.insert(sd);
-			}
+            lisss.add(rowNum + "");
+            if (sd.getId() != null && sd.getId() != 0) {
+                baseMapper.updateById(sd);
+            } else {
+                baseMapper.insert(sd);
+            }
 
-			log.info("productInformation:{}", JSONObject.toJSONString(sd));
-		}
-		String x = JSON.toJSONString(lisss);
-		System.out.println(x);
-		String x1 = JSON.toJSONString(lisss2);
-		System.out.println(x1);
-		//return message;
-	}
+            log.info("productInformation:{}", JSONObject.toJSONString(sd));
+        }
+        String x = JSON.toJSONString(lisss);
+        System.out.println(x);
+        String x1 = JSON.toJSONString(lisss2);
+        System.out.println(x1);
+        //return message;
+    }
+
+    public List<StoreInfo> selectLimitStores() {
+        return baseMapper.selectLimitStores();
+    }
 
-	public List<StoreInfo> selectLimitStores() {
-		return baseMapper.selectLimitStores();
-	}
+    public StoreInfo selectByCodeAndLimit(String storeCode) {
+        return baseMapper.selectByCodeAndLimit(storeCode);
+    }
+
+    private static List<String> cacheCodeListOfYc = null;  //烟草门店的门店编号列表
+
+    public void clearCacheCodeListOfYc() {
+        cacheCodeListOfYc = null;
+    }
 
-	public StoreInfo selectByCodeAndLimit(String storeCode) {
-		return baseMapper.selectByCodeAndLimit(storeCode);
-	}
+    public boolean containsCodeOfYc(String code) {
+        if (StringUtils.isBlank(code))
+            return false;
+        if (cacheCodeListOfYc == null)
+            cacheCodeListOfYc = listCodeOfYc();
+        return cacheCodeListOfYc.contains(code.trim());
+
+    }
+
+    /**
+     * 烟草门店列表
+     *
+     * @return
+     */
+    public List<StoreInfo> listOfYc() {
+        QueryWrapper<StoreInfo> qw = new QueryWrapper<>();
+        qw.ne("isycjyfw", "1");
+        List<StoreInfo> list = super.list(qw);
+        return list;
+    }
+
+    private List<String> listCodeOfYc() {
+        List<String> res = new ArrayList<>();
+        List<StoreInfo> list = listOfYc();
+        list.forEach(entity -> res.add(entity.getCode().trim()));
+        return res;
+    }
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml
index 533fdd3d..6af79e5b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml
@@ -22,7 +22,7 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 
 image:
-  xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/
+  xlsxtmpl: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
   upload:
     path: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
   url:
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/库存汇总表-烟草.xlsx b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/库存汇总表-烟草.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..bfbd63c18790273db1e58faeeb14b51d94592715
GIT binary patch
literal 15827
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

literal 0
HcmV?d00001