+
diff --git a/base-ui/src/router/index.js b/base-ui/src/router/index.js
index 2dc0d01e..82b0644d 100644
--- a/base-ui/src/router/index.js
+++ b/base-ui/src/router/index.js
@@ -7,8 +7,7 @@ Vue.use(Router)
/* 所有角色可以访问/没有权限要求的基页 */
-export const constantRoutes = [
- {
+export const constantRoutes = [{
path: '/redirect',
component: Layout,
hidden: true,
@@ -16,28 +15,26 @@ export const constantRoutes = [
path: '/redirect/:path(.*)',
component: () => import('@/views/redirect/index.vue')
}]
- },
- {
+ }, {
path: '/',
redirect: 'index'
- },
- {
+ }, {
path: '/login',
component: () => import('@/views/login/login.vue')
- },
- {
+ }, {
path: '/home',
component: () => import('@/views/Home/Home.vue'),
name: 'home'
-
}, {
path: '/index',
component: Layout,
redirect: '/index',
+ meta: {
+ title: '首页'
+ },
children: [{
path: '/index',
- component: () =>
- import('@/views/index.vue'),
+ component: () => import('@/views/index.vue'),
name: 'index',
meta: {
title: '主页',
@@ -46,344 +43,88 @@ export const constantRoutes = [
}
}]
},
-
- // 1厂商管理
+ // 1销售统计
{
- path: '/changshang',
+ path: '/xiaoshou',
component: Layout,
- redirect: '/changshang',
meta: {
- title: '厂商管理',
+ title: '销售统计'
},
- children: [
- {
- path: '/changshang/changshangguanli',
- component: () =>
- import('@/views/changshang/changshangguanli/changshangguanli.vue'),
- name: 'changshangguanli',
- meta: {
- title: '厂商管理',
- noCache: true,
- }
- },
- ]
- },
- // 2品牌管理
- {
- path: '/pinpai',
- component: Layout,
- redirect: '/pinpai',
- meta: {
- title: '品牌管理'
- },
- children: [
- {
- path: '/pinpai/pinpaiguanli',
- component: () =>
- import('@/views/pinpai/pinpaiguanli/pinpaiguanli.vue'),
- name: 'pinpaiguanli',
- meta: {
- title: '品牌管理',
- noCache: true,
- }
- },
- {
- path: '/pinpai/pinpaiAdd/:id',
- component: () =>
- import('@/views/pinpai/pinpaiguanli/pinpaiAdd.vue'),
- name: 'pinpaiAdd',
- hidden: true,
- meta: {
- title: '品牌管理',
- noCache: true,
- }
- },
- {
- path: '/pinpai/pinpaiInfo',
- component: () =>
- import('@/views/pinpai/pinpaiguanli/pinpaiInfo.vue'),
- name: 'pinpaiInfo',
- hidden: true,
- meta: {
- title: '品牌详情',
- noCache: true,
- }
- },
- {
- path: '/pinpai/pinpaiDaoru',
- component: () =>
- import('@/views/pinpai/pinpaidaoru/pinpaiDaoru.vue'),
- name: 'pinpaiDaoru',
- hidden: true,
- meta: {
- title: '导入品牌'
- }
- }
- ]
- },
- // 4经销商管理
- {
- path: '/jingxiaoshang',
- component: Layout,
- redirect: '/jingxiaoshang',
- meta: {
- title: '经销商管理'
- },
- children: [
- {
- path: '/jingxiaoshang/jingxiaoshangguanli',
- component: () =>
- import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue'),
- name: 'jingxiaoshangguanli',
- meta: {
- title: '经销商管理',
- noCache: true,
- }
- },
- {
- path: '/jingxiaoshang/jingxiaoshangAdd',
- component: () =>
- import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue'),
- name: 'jingxiaoshangAdd',
- hidden: true,
- meta: {
- title: '经销商添加',
- noCache: true,
- }
- },
- {
- path: '/jingxiaoshang/jingxiaoshangEdit/:id',
- component: () =>
- import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangEdit.vue'),
- name: 'jingxiaoshangEdit',
- hidden: true,
- meta: {
- title: '经销商修改',
- noCache: true,
- }
- },
- {
- path: '/jingxiaoshang/jingxiaoshangInfo/:sid',
- component: () =>
- import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangInfo.vue'),
- name: 'jingxiaoshangInfo',
- hidden: true,
- meta: {
- title: '经销商详情',
- noCache: true,
- }
- }
- // {
- // path: '/jingxiaoshang/addcomponents/beianzhanghaoForm',
- // component: () =>
- // import('@/views/jingxiaoshang/addcomponents/beianzhanghaoForm.vue'),
- // name: 'beianzhanghaoForm',
- // hidden: true,
- // meta: {
- // title: '备案账号添加'
- // }
- // }
- //
-
- ]
- },
- // 5挂靠公司 现已改为经销商
- {
- path: '/guakaogongsi',
- component: Layout,
- redirect: '/guakaogongsi',
- meta: {
- title: '经销商'
- },
- children: [
- {
- path: '/guakaogongsi/guakaogongsiguanli',
- component: () =>
- import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue'),
- name: 'guakaogongsiguanli',
- meta: {
- title: '经销商',
- noCache: true,
- }
- },
- // {
- // path: '/guakaogongsi/guakaogongsiAdd/:id',
- // component: () =>
- // import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue'),
- // name: 'guakaogongsiAdd',
- // hidden: true,
- // meta: {
- // title: '挂靠公司添加'
- // }
- // },
- // {
- // path: '/guakaogongsi/guakaogongsiInfo',
- // component: () =>
- // import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue'),
- // name: 'guakaogongsiInfo',
- // hidden: true,
- // meta: {
- // title: '挂靠公司详情'
- // }
- // },
- {
- path: '/guakaogongsi/renwu',
- component: () =>
- import('@/views/guakaogongsi/renwu/renwu.vue'),
- name: 'renwu',
- hidden: true,
- meta: {
- title: '任务'
- }
- },
- {
- path: '/guakaogongsi/renwuchuli',
- component: () =>
- import('@/views/guakaogongsi/renwu/renwuchuli.vue'),
- name: 'renwuchuli',
- hidden: true,
- meta: {
- title: '任务处理'
- }
- }
- ]
- },
- // 6资方管理
- {
- path: '/zifang',
- component: Layout,
- redirect: '/zifang',
- meta: {
- title: '资方管理'
- },
- children: [
- {
- path: '/zifang/zifangguanli',
- component: () =>
- import('@/views/zifang/zifangguanli/zifangguanli.vue'),
- name: 'zifangguanli',
- meta: {
- title: '资方信息管理',
- noCache: true,
- }
- },
- {
- path: '/zifang/zifangguanliAdd/:id',
- component: () =>
- import('@/views/zifang/zifangguanli/zifangguanliAdd.vue'),
- name: 'zifangguanliAdd',
- hidden: true,
- meta: {
- title: '资方信息添加',
- noCache: true,
- }
- },
- {
- path: '/zifang/zifangguanliInfo',
- component: () =>
- import('@/views/zifang/zifangguanli/zifangguanliInfo.vue'),
- name: 'zifangguanliInfo',
- hidden: true,
- meta: {
- title: '资方信息详细信息',
- noCache: true,
- }
- },
- {
- path: '/zifang/zifangzhengce',
- component: () =>
- import('@/views/zifang/zifangzhengce/zifangzhengce.vue'),
- name: 'zifangzhengce',
- meta: {
- title: '资方政策管理',
- noCache: true,
- }
- },
- {
- path: '/zifang/zifangzhengceAdd/:id',
- component: () =>
- import('@/views/zifang/zifangzhengce/zifangzhengceAdd.vue'),
- name: 'zifangzhengceAdd',
- hidden: true,
- meta: {
- title: '资方政策添加',
- noCache: true,
- }
- },
- {
- path: '/zifang/zifangzhengceInfo',
- component: () =>
- import('@/views/zifang/zifangzhengce/zifangzhengceInfo.vue'),
- name: 'zifangzhengceInfo',
- hidden: true,
- meta: {
- title: '资方政策详细信息',
- noCache: true,
- }
- }
-
- ]
- },
- // 7、中介人员
- {
- path: '/zhongjie',
- component: Layout,
- redirect: '/zhongjie',
- meta: {
- title: '中介人员',
- },
- children: [
- {
- path: '/zhongjie/zhongjierenyuan',
- component: () =>
- import('@/views/zhongjierenyuan/zhongjierenyuan.vue'),
- name: 'zhongjierenyuan',
- meta: {
- title: '中介人员',
- noCache: true,
- }
- },
- ]
+ children: [{
+ path: 'xstj/index',
+ component: () => import('@/views/xiaoshou/xstj/index.vue'),
+ name: 'XiaoshouXstjIndex',
+ meta: {
+ title: '销售数据导入',
+ noCache: true
+ }
+ }, {
+ path: 'xstj/tj',
+ component: () => import('@/views/xiaoshou/xstj/tj.vue'),
+ name: 'XiaoshouXstjTj',
+ meta: {
+ title: '销售数据统计',
+ noCache: true
+ }
+ }]
},
- // 资料清单
+ // 2库存信息
{
- path: '/fileList',
+ path: '/kucun',
component: Layout,
- redirect: '/fileList/index',
meta: {
- title: '资料清单'
+ title: '库存信息'
},
children: [{
- path: '/fileList/index',
- component: () => import('@/views/fileList/fileList.vue'),
- name: 'fileList',
- meta: { title: '资料清单',noCache: true, }
+ path: 'kcxxcx',
+ component: () => import('@/views/kucun/kcxxcx/index.vue'),
+ name: 'KucunKcxxcxIndex',
+ meta: {
+ title: '库存数据导入',
+ noCache: true
+ }
+ }, {
+ path: 'rkmx',
+ component: () => import('@/views/kucun/rkmx/index.vue'),
+ name: 'KucunRkmxIndex',
+ meta: {
+ title: '入库明细',
+ noCache: true
+ }
+ }, {
+ path: 'ckmx',
+ component: () => import('@/views/kucun/ckmx/index.vue'),
+ name: 'KucunCkmxIndex',
+ meta: {
+ title: '出库明细',
+ noCache: true
+ }
}]
},
-
-
- {
- path: '/404',
- component: () =>
- import('@/views/404'),
- hidden: true
- }
- // 404 page must be placed at the end !!!
- // { path: '*', redirect: '/404', hidden: true }
+ {
+ path: '/404',
+ component: () =>
+ import('@/views/404'),
+ hidden: true
+ }
+ // 404 page must be placed at the end !!!
+ // { path: '*', redirect: '/404', hidden: true }
]
const createRouter = () => new Router({
- // mode: 'history', // require service support
- scrollBehavior: () => ({ y: 0 }),
- routes: constantRoutes
+ // mode: 'history', // require service support
+ scrollBehavior: () => ({
+ y: 0
+ }),
+ routes: constantRoutes
})
const router = createRouter()
// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
export function resetRouter() {
- const newRouter = createRouter()
- router.matcher = newRouter.matcher // reset router
+ const newRouter = createRouter()
+ router.matcher = newRouter.matcher // reset router
}
export default router
diff --git a/base-ui/src/settings.js b/base-ui/src/settings.js
index 647f65bb..1e35658b 100644
--- a/base-ui/src/settings.js
+++ b/base-ui/src/settings.js
@@ -1,6 +1,6 @@
module.exports = {
- title: '安瑞集团信息化平台',
+ title: '汇融银行智能监管平台',
/**
* @type {boolean} true | false
diff --git a/base-ui/src/views/index.vue b/base-ui/src/views/index.vue
index 32f742ca..9893e178 100644
--- a/base-ui/src/views/index.vue
+++ b/base-ui/src/views/index.vue
@@ -1,20 +1,23 @@
okList = new ArrayList<>();
for (GdInventory entity : list) {
- if (gdRescategoryProdService.containsCode(entity.getProdCode()) && storeIndexService.containsCodeWithOne(entity.getWarehouseCode())) {
+ if (gdRescategoryProdService.containsCode(entity.getProdCode()) && storeIndexService.containsCodeWithOneNoJmd(entity.getWarehouseCode())) {
GdInventoryOk ok = new GdInventoryOk();
BeanUtil.copyProperties(entity, ok, "id");
// gdInventoryOkService.save(ok);
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdoutstorage/GdOutstorageRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdoutstorage/GdOutstorageRest.java
index 06a5e784..801ae320 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdoutstorage/GdOutstorageRest.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdoutstorage/GdOutstorageRest.java
@@ -54,7 +54,19 @@ public class GdOutstorageRest {
@GetMapping("/test")
public ResultBean test() {
- gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/汇融银行_出库明细表.xlsx");
+ // gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/23汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/24汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/25汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/26汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/27汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/28汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/29汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/30汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/12-1汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/12-2汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/12-3汇融银行_出库明细表.xlsx");
+ gdOutstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/aa/12-4汇融银行_出库明细表.xlsx");
return ResultBean.fireSuccess();
}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java
index bfa10dc8..c7cdd57d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java
@@ -27,6 +27,7 @@ package com.yxt.supervise.portal.biz.storeindex;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProd;
import org.apache.commons.lang3.StringUtils;
@@ -53,23 +54,18 @@ import java.util.Map;
@Service
public class StoreIndexService extends ServiceImpl {
- private static List oneCodeList = ListUtil.toLinkedList("101", "199", "51", "52", "54", "55");
+ private static List oneCodeList = ListUtil.toLinkedList("101", "199", "112");
private static Map oneNameMap = MapUtil.builder(new HashMap())
- .put("101", "365常温仓")
- .put("199", "365配送残品仓")
- .put("51", "唐山正常仓")
- .put("52", "唐山残损仓")
- .put("54", "唐山烟草仓")
- .put("55", "唐山中转仓").build();
+ .put("101", "[101]365常温仓")
+ .put("199", "[199]365配送残品仓")
+ .put("112", "[112]供应链仓").build();
private static Map oneTypeMap = MapUtil.builder(new HashMap())
.put("101", "配送中心")
.put("199", "配送中心")
- .put("51", "配送中心")
- .put("52", "配送中心")
- .put("54", "配送中心")
- .put("55", "配送中心").build();
+ .put("112", "配送中心").build();
private static List codeList = null;
+ private static List codeNoJmdList = null;
private static Map nameMap = null;
private static Map typeMap = null;
@@ -87,6 +83,15 @@ public class StoreIndexService extends ServiceImpl
return codeList;
}
+ public List listCodeNoJmd() {
+ List res = new ArrayList<>();
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.ne("type", "连锁外加盟(销配结算)");
+ List list = super.list(qw);
+ list.forEach(entity -> res.add(entity.getCode().trim()));
+ return res;
+ }
+
public boolean containsCode(String code) {
if (StringUtils.isBlank(code))
return false;
@@ -102,6 +107,18 @@ public class StoreIndexService extends ServiceImpl
return oneCodeList.contains(code.trim());
}
+ public boolean containsCodeWithOneNoJmd(String code) {
+ if (StringUtils.isBlank(code))
+ return false;
+ if (codeNoJmdList == null)
+ codeNoJmdList = listCodeNoJmd();
+
+ boolean contains = codeNoJmdList.contains(code.trim());
+ if (contains)
+ return true;
+ return oneCodeList.contains(code.trim());
+ }
+
public String nameOfCode(String code) {
if (nameMap == null)
nameMap = mapNames();
-
+
+
+
diff --git a/base-ui/src/views/kucun/kcxxcx/index.vue b/base-ui/src/views/kucun/kcxxcx/index.vue
new file mode 100644
index 00000000..d3b83ce2
--- /dev/null
+++ b/base-ui/src/views/kucun/kcxxcx/index.vue
@@ -0,0 +1,49 @@
+
+ 汇融银行智能监管平台
+
+
+
+
+
+
diff --git a/base-ui/src/views/kucun/rkmx/index.vue b/base-ui/src/views/kucun/rkmx/index.vue
new file mode 100644
index 00000000..e0e3a8b6
--- /dev/null
+++ b/base-ui/src/views/kucun/rkmx/index.vue
@@ -0,0 +1,49 @@
+
+
+
+ {{ name }}
+
+
+
+
+
+
diff --git a/base-ui/src/views/xiaoshou/xstj/index.vue b/base-ui/src/views/xiaoshou/xstj/index.vue
new file mode 100644
index 00000000..112f0070
--- /dev/null
+++ b/base-ui/src/views/xiaoshou/xstj/index.vue
@@ -0,0 +1,49 @@
+
+
+
+ {{ name }}
+
+
+
+
+
+
diff --git a/base-ui/src/views/xiaoshou/xstj/tj.vue b/base-ui/src/views/xiaoshou/xstj/tj.vue
new file mode 100644
index 00000000..df3f4782
--- /dev/null
+++ b/base-ui/src/views/xiaoshou/xstj/tj.vue
@@ -0,0 +1,49 @@
+
+
+
+ {{ name }}
+
+
+
+
+
+
diff --git a/base-ui/vue.config.js b/base-ui/vue.config.js
index 0ebcc7cb..cd9e6826 100644
--- a/base-ui/vue.config.js
+++ b/base-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
return path.join(__dirname, dir)
}
-const name = defaultSettings.title || '安瑞集团信息化平台' // page title
+const name = defaultSettings.title || '汇融银行智能监管平台' // page title
// 如果端口设置为80,
// 使用管理员权限执行命令行。
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 90c92ad1..ec696508 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,15 +53,18 @@ public class GdInstorageRest {
@GetMapping("/test")
public ResultBean test() {
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/23汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/24汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/25汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/26汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/27汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/28汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/29汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/30汇融银行_入库明细表.xlsx");
- gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/12-1汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/23汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/24汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/25汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/26汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/27汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/28汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/29汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/30汇融银行_入库明细表.xlsx");
+ // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/23/12-1汇融银行_入库明细表.xlsx");
+ gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/2汇融银行_入库明细表.xlsx");
+ gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/3汇融银行_入库明细表.xlsx");
+ gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221204/4汇融银行_入库明细表.xlsx");
return ResultBean.fireSuccess();
}
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 75c16450..90d3b408 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
@@ -79,7 +79,7 @@ public class GdInventoryService extends ServiceImpl
+
+