入库单增加供应商编号

.gitignore

@@ -2,8 +2,8 @@
 # /结尾表示是目录，忽略目录和目录下的所有件
 # /开头表示根目录，否则是.gitignore的相对目录
 # !开头表示反选
-.idea/
+**/.idea/
-target/
+**/target/
 *.iml
 *.ipr
 *.iws
@@ -12,7 +12,7 @@ target/
 .project
 rebel.xml
 .rebel-remote.xml.*
-target/
+**/target/
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
@@ -31,6 +31,7 @@ HELP.md
 !**/src/main/**/target/
 !**/src/test/**/target/
 **/node_modules/
+**/logs/
 
 ### STS ###
 .apt_generated

base-ui/.env.production

@@ -2,8 +2,8 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = ''
 
 ## 配置 正式接口地址
-VUE_APP_URL = "http://218.11.12.154:8111"
+VUE_APP_URL = "http://122.14.222.186:7003"
 

base-ui/src/views/kucun/kcxxcx/index.vue

@@ -121,20 +121,21 @@ export default {
         })
     },
     doDownloadHz() {
-      downloadhz({ filepath: this.hzFilePath })
+      window.open(this.hzFilePath, '_blank')
-        .then(res => {
+    //   downloadhz({ filepath: this.hzFilePath })
-          console.log('xxx', res)
+    //     .then(res => {
-          const blob = new Blob([res.data])
+    //       console.log('xxx', res)
-          const url = window.URL.createObjectURL(blob) // 创建 url 并指向 blob
+    //       const blob = new Blob([res.data])
-          const a = document.createElement('a')
+    //       const url = window.URL.createObjectURL(blob) // 创建 url 并指向 blob
-          a.href = url
+    //       const a = document.createElement('a')
-          a.download = '导出数据.xlsx'
+    //       a.href = url
-          a.click()
+    //       a.download = '导出数据.xlsx'
-          window.URL.revokeObjectURL(url) // 释放该 ur
+    //       a.click()
-        })
+    //       window.URL.revokeObjectURL(url) // 释放该 ur
-        .catch(e => {
+    //     })
-          console.log(e)
+    //     .catch(e => {
-        })
+    //       console.log(e)
+    //     })
     }
   }
 }

base-ui/vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
    *在大多数情况下，请使用“/”！！！
    *详细信息：https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production' ? '/base/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
   outputDir: 'System',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',

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

@@ -50,6 +50,7 @@ public class GdInstorage extends EntityWithId {
     private String colb1; // 仓库/门店编号
     private String colc2; // 仓库/门店名称
     private String cold3; // 入库时间
+    private String colex; // 供应商编号
     private String cole4; // 供应商名称
     private String colf5; // 单据号
     private String colg6; // 单据类型

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

@@ -50,6 +50,7 @@ public class GdInstorageGd extends EntityWithId {
     private String colb1; // 仓库/门店编号
     private String colc2; // 仓库/门店名称
     private String cold3; // 入库时间
+    private String colex; // 供应商编号
     private String cole4; // 供应商名称
     private String colf5; // 单据号
     private String colg6; // 单据类型

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

@@ -53,22 +53,21 @@ public class GdInstorageRest {
     @GetMapping("/test")
     public ResultBean test() {
 
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/23汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/23汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/24汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/24汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/25汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/25汇融银行_入库明细表 .xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/26汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/26汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/27汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/27汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/28汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/28汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/29汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/29汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/30汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/30汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/12-1汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-1汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221204/2汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-2汇融银行_入库明细表.xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221204/3汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-3汇融银行_入库明细表.xlsx");
-         // // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/4汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-4汇融银行_入库明细表 (1).xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221206/4汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-5汇融银行_入库明细表 (1).xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221206/05汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-6汇融银行_入库明细表 (1).xlsx");
-         // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221207/06汇融银行_入库明细表.xlsx");
+        gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-7汇融银行_入库明细表 (1).xlsx");
-         gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221208/12-7汇融银行_入库明细表.xlsx");
 
         return ResultBean.fireSuccess();
     }

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

@@ -86,24 +86,25 @@ public class GdInstorageService extends ServiceImpl<GdInstorageMapper, GdInstora
         gd.setColb1("" + r.get(1)); // 仓库/门店编号
         gd.setColc2("" + r.get(2)); // 仓库/门店名称
         gd.setCold3("" + r.get(3)); // 入库时间
-        gd.setCole4("" + r.get(4)); // 供应商名称
+        gd.setColex("" + r.get(4)); // 供应商编号
-        gd.setColf5("" + r.get(5)); // 单据号
+        gd.setCole4("" + r.get(5)); // 供应商名称
-        gd.setColg6("" + r.get(6)); // 单据类型
+        gd.setColf5("" + r.get(6)); // 单据号
-        gd.setColh7("" + r.get(7)); // 货号
+        gd.setColg6("" + r.get(7)); // 单据类型
-        gd.setColi8("" + r.get(8)); // 商品名称
+        gd.setColh7("" + r.get(8)); // 货号
-        gd.setColj9("" + r.get(9)); // 商品生产日期
+        gd.setColi8("" + r.get(9)); // 商品名称
-        gd.setColk10("" + r.get(10)); // 商品保质期
+        gd.setColj9("" + r.get(10)); // 商品生产日期
-        gd.setColl11("" + r.get(11)); // 商品规格
+        gd.setColk10("" + r.get(11)); // 商品保质期
-        gd.setColm12("" + r.get(12)); // 类别编号
+        gd.setColl11("" + r.get(12)); // 商品规格
-        gd.setColn13("" + r.get(13)); // 类别名称
+        gd.setColm12("" + r.get(13)); // 类别编号
-        gd.setColo14("" + r.get(14)); // 一级类别名称
+        gd.setColn13("" + r.get(14)); // 类别名称
-        gd.setColp15("" + r.get(15)); // 二级类别名称
+        gd.setColo14("" + r.get(15)); // 一级类别名称
-        gd.setColq16("" + r.get(16)); // 入库金额
+        gd.setColp15("" + r.get(16)); // 二级类别名称
-        gd.setColr17("" + r.get(17)); // 入库数量
+        gd.setColq16("" + r.get(17)); // 入库金额
-        gd.setCols18("" + r.get(18)); // 成本金额
+        gd.setColr17("" + r.get(18)); // 入库数量
-        gd.setColt19("" + r.get(19)); // 成本税额
+        gd.setCols18("" + r.get(19)); // 成本金额
-        gd.setColu20("" + r.get(20)); // 不含税成本
+        gd.setColt19("" + r.get(20)); // 成本税额
-        gd.setColv21("" + r.get(21)); // 进项税率
+        gd.setColu20("" + r.get(21)); // 不含税成本
+        gd.setColv21("" + r.get(22)); // 进项税率
         return gd;
     }
 }

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

@@ -80,6 +80,6 @@ public interface GdInventoryOkMapper extends BaseMapper<GdInventoryOk> {
     @Select("select warehouseName,warehouseType,count(1) as coun,sum(prodValue) as su from gd_inventory_ok 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_ok")
+    @Select("select warehouseCode, warehouseName, warehouseType, prodCode, prodBarCode, prodName, prodNum, prodValue from gd_inventory_ok order by warehouseType")
     List<Map<String, Object>> listOfProd();
 }

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

@@ -58,6 +58,10 @@ import java.util.Map;
 public class GdInventoryOkService extends ServiceImpl<GdInventoryOkMapper, GdInventoryOk> {
     @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.xlsxtmpl:static/upload/}")
+    private String xlsxtmplPath;
 
     public void clearData() {
         baseMapper.clearData();
@@ -86,10 +90,15 @@ public class GdInventoryOkService extends ServiceImpl<GdInventoryOkMapper, GdInv
         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");
+        // URL resource = ResourceUtil.getResource("xlsx-tmpl/库存汇总表.xlsx");
-        String toFileName = uploadPath + "kchzb/库存汇总表" + dfmt + ".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(FileUtil.file(resource), file, true);
+        FileUtil.copy(srcFile, file, true);
         ExcelWriter writer = ExcelUtil.getWriter(file);
         writer.setSheet(0);
         writer.writeCellValue(0, 1, "编号：" + timestr);
@@ -146,6 +155,6 @@ public class GdInventoryOkService extends ServiceImpl<GdInventoryOkMapper, GdInv
         writer.close();
 
 
-        return rb.success().setData(toFileName);
+        return rb.success().setData(url);
     }
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml

@@ -22,6 +22,7 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 
 image:
+  xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/
   upload:
     path: D:/supervise/upload/
   url:

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-pro.yml

@@ -22,8 +22,9 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 
 image:
+  xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/
   upload:
-    path: D:\anrui\upload\
+    path: D:/anrui/upload/
   url:
     prefix: http://120.46.172.184/api/upload/
   login:

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml

@@ -1,13 +1,14 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://122.14.222.186:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://122.14.222.186:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
+#    url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
     username: root
     password: 1LAiGz$t1*Iw
-  cloud:
+#  cloud:
-    nacos:
+#    nacos:
-      discovery:
+#      discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
   redis:
     database: 3  # Redis数据库索引（默认为0）
     host: 127.0.0.1
@@ -22,10 +23,11 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 
 image:
+  xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/
   upload:
-    path: D:\\supervise\\upload\\
+    path: D:/webapps/supervise/static/upload/
   url:
-    prefix: http://127.0.0.1:7003/upload/
+    prefix: http://122.14.222.186:7003/upload/
   login:
     path: D:\\images\\pic-click
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml

@@ -2,7 +2,8 @@ spring:
   application:
     name: supervise-portal
   profiles:
-    active: devv
+#    active: devv
+    active: test
   messages:
     # 国际化资源文件路径
     basename: i18n/messages