库存汇总 烟草数据 修改

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java

@@ -332,6 +332,14 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
                 return gile;
             }
 
+            private boolean checkYcProd(String prodCode) {
+                if (StrUtil.isBlank(prodCode))
+                    return false;
+                if (prodCode.length() < 4)
+                    return false;
+                return "0811".equals(prodCode.substring(0, 4));
+            }
+
             @Override
             public void handle(int sheetIndex, long rowIndex, List<Object> r) {
                 if (rowIndex > 0) {
@@ -343,6 +351,8 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
                         gdlog.setOrderDate(odate);
                     }
 
+                    // System.out.println(",X:" + x + ",prodCode:" + prodCode);
+
                     if (gdRescategoryProdService.containsCode(prodCode) && storeIndexService.containsCodeWithOneNoJmd(warehouseCode)) {
                         GdInventoryOk ok = new GdInventoryOk();
                         Map<String, Object> map = readMapFromRow(r);
@@ -366,7 +376,7 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
                         }
                     }
 
-                    if ("0811".equals(prodCode.substring(0, 4)) && storeInfoService.containsCodeOfYc(warehouseCode)) {
+                    if (checkYcProd(prodCode) && storeInfoService.containsCodeOfYc(warehouseCode)) {
                         GdInventoryYc yc = new GdInventoryYc();
                         Map<String, Object> map = readMapFromRow(r);
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcMapper.java

@@ -62,4 +62,7 @@ public interface GdInventoryYcMapper extends BaseMapper<GdInventoryYc> {
 
     @Select("select warehouseCode, warehouseName, warehouseType, prodCode, prodBarCode, prodName, prodNum, prodValue from gd_inventory_yc order by warehouseType")
     List<Map<String, Object>> listOfProd();
+
+    @Select("select IFNULL(count(1),0) FROM (SELECT DISTINCT warehouseCode from gd_inventory_yc) t ")
+    int countType2();
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYcService.java

@@ -58,7 +58,7 @@ public class GdInventoryYcService extends ServiceImpl<GdInventoryYcMapper, GdInv
     private String uploadPath;
     @Value("${image.url.prefix:http://127.0.0.1:8080/upload/}")
     private String urlPrefix;
-    @Value("${image.xlsxtmplyc:static/upload/}")
+    @Value("${image.xlsxtmpl:static/upload/}")
     private String xlsxtmplPath;
     public void clearData() {
         baseMapper.clearData();
@@ -67,6 +67,7 @@ public class GdInventoryYcService extends ServiceImpl<GdInventoryYcMapper, GdInv
     public ResultBean kchzyc() {
         ResultBean rb = ResultBean.fireFail();
 
+        int type2 = baseMapper.countType2();
         int prod2 = baseMapper.countProd2();
         double val2 = baseMapper.countVal2();
 
@@ -90,6 +91,7 @@ public class GdInventoryYcService extends ServiceImpl<GdInventoryYcMapper, GdInv
         writer.writeCellValue(0, 1, "编号：" + timestr);
         writer.writeCellValue(3, 1, datefmt1);
 
+        writer.writeCellValue(1, 3, type2);
         writer.writeCellValue(2, 3, prod2);
         writer.writeCellValue(3, 3, val2);
         // writer.flush();

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java

@@ -296,7 +296,7 @@ public class StoreInfoService extends MybatisBaseService<StoreInfoMapper, StoreI
      */
     public List<StoreInfo> listOfYc() {
         QueryWrapper<StoreInfo> qw = new QueryWrapper<>();
-        qw.ne("isycjyfw", "1");
+        qw.eq("isycjyfw", "1");
         List<StoreInfo> list = super.list(qw);
         return list;
     }