diff --git a/.gitignore b/.gitignore index ea4a4fc0..dd8a10d2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,8 @@ # /结尾表示是目录，忽略目录和目录下的所有件 # /开头表示根目录，否则是.gitignore的相对目录 # !开头表示反选 -.idea/ -target/ +**/.idea/ +**/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 diff --git a/base-ui/.env.production b/base-ui/.env.production index 61b8a1de..07522e7c 100644 --- a/base-ui/.env.production +++ b/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" diff --git a/base-ui/src/views/kucun/kcxxcx/index.vue b/base-ui/src/views/kucun/kcxxcx/index.vue index bd40ea2b..0c2a6291 100644 --- a/base-ui/src/views/kucun/kcxxcx/index.vue +++ b/base-ui/src/views/kucun/kcxxcx/index.vue @@ -121,20 +121,21 @@ export default { }) }, doDownloadHz() { - downloadhz({ filepath: this.hzFilePath }) - .then(res => { - console.log('xxx', res) - const blob = new Blob([res.data]) - const url = window.URL.createObjectURL(blob) // 创建 url 并指向 blob - const a = document.createElement('a') - a.href = url - a.download = '导出数据.xlsx' - a.click() - window.URL.revokeObjectURL(url) // 释放该 ur - }) - .catch(e => { - console.log(e) - }) + window.open(this.hzFilePath, '_blank') + // downloadhz({ filepath: this.hzFilePath }) + // .then(res => { + // console.log('xxx', res) + // const blob = new Blob([res.data]) + // const url = window.URL.createObjectURL(blob) // 创建 url 并指向 blob + // const a = document.createElement('a') + // a.href = url + // a.download = '导出数据.xlsx' + // a.click() + // window.URL.revokeObjectURL(url) // 释放该 ur + // }) + // .catch(e => { + // console.log(e) + // }) } } } diff --git a/base-ui/vue.config.js b/base-ui/vue.config.js index cd9e6826..c3cca2f1 100644 --- a/base-ui/vue.config.js +++ b/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', @@ -40,7 +40,7 @@ module.exports = { }, proxy: { '/api': { // 匹配所有以 '/api'开头的请求路径 - //target: 'http://26077a35f5.wicp.vip', + // target: 'http://26077a35f5.wicp.vip', target: process.env.VUE_APP_URL, // 代理目标的基础路径 changeOrigin: true, // 支持跨域 pathRewrite: { // 重写路径: 去掉路径中开头的'/api' diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorage.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorage.java index 1b2a3dfe..dc2121d3 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorage.java +++ b/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; // 单据类型 diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGd.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGd.java index 526493ba..82a9b2d2 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGd.java +++ b/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; // 单据类型 diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageRest.java index bdfeee9a..493105a1 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageRest.java +++ b/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/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/24汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/25汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/26汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/27汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/28汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/29汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/30汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/12-1汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221204/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/wx20221204/4汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221206/4汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221206/05汇融银行_入库明细表.xlsx"); - // gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221207/06汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/idea/lzh/niejinyi/yunyan/docs/sheji/wx20221208/12-7汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/23汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/24汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/25汇融银行_入库明细表 .xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/26汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/27汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/28汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/29汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/30汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-1汇融银行_入库明细表.xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-2汇融银行_入库明细表.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/wx20221208/aaa/12-4汇融银行_入库明细表 (1).xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-5汇融银行_入库明细表 (1).xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-6汇融银行_入库明细表 (1).xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-7汇融银行_入库明细表 (1).xlsx"); return ResultBean.fireSuccess(); } 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 6dabeba2..42408a26 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 @@ -86,24 +86,25 @@ public class GdInstorageService extends ServiceImpl { @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> 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> listOfProd(); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOkService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOkService.java index abaffc2f..12f706d8 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOkService.java +++ b/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 { @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