From ddbe9e567ed0420c0e106bb8b4f34c2ec2bcc740 Mon Sep 17 00:00:00 2001 From: liupopo Date: Fri, 26 May 2023 18:07:35 +0800 Subject: [PATCH] aaa --- .../table_create_report-inventory.sql | 87 + .../src/api/supervise/gdinventorylog.js | 14 +- .../src/router/modules/codemenu.js | 2 +- .../views/daydataupload/gdinventory/index.vue | 248 +- supervise-flowable-ui/package-lock.json | 17573 +++++++++++++++- supervise-flowable-ui/src/api/login.js | 10 +- supervise-flowable-ui/src/router/index.js | 28 +- .../warehouse数据库设计文档_2.0.0.docx | Bin 0 -> 66886 bytes .../docs/databases/data_modify.sql | 3 + .../api/gdinventoryok/GdInventoryOk.java | 18 +- .../gdinventorylog/GdInventoryLogRest.java | 21 +- .../gdinventorylog/GdInventoryLogService.java | 24 +- .../gdinventoryok/GdInventoryOkService.java | 86 +- .../src/main/resources/logback-spring.xml | 2 +- 14 files changed, 17990 insertions(+), 126 deletions(-) create mode 100644 docs/databases/table_create_report-inventory.sql create mode 100644 warehousing-system/docs/sheji/warehouse数据库设计文档_2.0.0.docx create mode 100644 yxt-supervise-cyf/docs/databases/data_modify.sql diff --git a/docs/databases/table_create_report-inventory.sql b/docs/databases/table_create_report-inventory.sql new file mode 100644 index 00000000..5bc439e2 --- /dev/null +++ b/docs/databases/table_create_report-inventory.sql @@ -0,0 +1,87 @@ + +DROP TABLE IF EXISTS `report_inventory_day_gather`; +CREATE TABLE `report_inventory_day_gather` ( + `id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', + `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', + `remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明', + `orderDate` VARCHAR(100) DEFAULT NULL COMMENT '单据日期', + + `serialNumber` VARCHAR(100) DEFAULT NULL COMMENT '编号', + `reportTime` VARCHAR(100) DEFAULT NULL COMMENT '上报时间', + + `storeType` VARCHAR(100) DEFAULT NULL COMMENT '仓库类型', + `storeNumber` int(11) DEFAULT 1 COMMENT '仓库数量', + `productCountNumber` int(11) DEFAULT 1 COMMENT '品种数量', + `productAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '货值', + + `countAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '合计货值', + + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB COMMENT='库存汇总表-库存汇总日报表'; + + +DROP TABLE IF EXISTS `report_inventory_day_store`; +CREATE TABLE `report_inventory_day_store` ( + `id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', + `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', + `remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明', + `orderDate` VARCHAR(100) DEFAULT NULL COMMENT '单据日期', + + `serialNumber` VARCHAR(100) DEFAULT NULL COMMENT '编号', + `reportTime` VARCHAR(100) DEFAULT NULL COMMENT '上报时间', + + `warehouseType` int(11) DEFAULT NULL COMMENT '仓库类型', + `storeCode` VARCHAR(100) DEFAULT NULL COMMENT '门店编号', + `storeCodeName` VARCHAR(100) DEFAULT NULL COMMENT '[门店编号]门店名称', + `productCountNumber` int(11) DEFAULT 1 COMMENT '品种数量', + `productAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '货值', + `countAmount` double(12,2) DEFAULT NULL COMMENT '合计货值', + + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB COMMENT='库存汇总表-仓库库存明细表'; + + +DROP TABLE IF EXISTS `report_inventory_day_tobacco_store`; +CREATE TABLE `report_inventory_day_tobacco_store` ( + `id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', + `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', + `remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明', + `orderDate` VARCHAR(100) DEFAULT NULL COMMENT '单据日期', + + `serialNumber` VARCHAR(100) DEFAULT NULL COMMENT '编号', + `reportTime` VARCHAR(100) DEFAULT NULL COMMENT '上报时间', + + `warehouseType` int(11) DEFAULT NULL COMMENT '仓库类型', + `storeCode` VARCHAR(100) DEFAULT NULL COMMENT '门店编号', + `storeCodeName` VARCHAR(100) DEFAULT NULL COMMENT '[门店编号]门店名称', + `productCountNumber` int(11) DEFAULT 1 COMMENT '品种数量', + `productAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '货值', + `countAmount` double(12,2) DEFAULT NULL COMMENT '合计货值', + + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB COMMENT='库存汇总表-烟草仓库库存明细表'; + + +DROP TABLE IF EXISTS `report_inventory_day_product`; +CREATE TABLE `report_inventory_day_product` ( + `id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', + `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', + `remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明', + `orderDate` VARCHAR(100) DEFAULT NULL COMMENT '单据日期', + + `serialNumber` VARCHAR(100) DEFAULT NULL COMMENT '编号', + `productNumber` VARCHAR(100) DEFAULT NULL COMMENT '商品数量', + `reportTime` VARCHAR(100) DEFAULT NULL COMMENT '上报时间', + + `prodCode` varchar(100) DEFAULT NULL COMMENT '商品编码', + `prodBarCode` varchar(100) DEFAULT NULL COMMENT '商品条码', + `prodName` varchar(100) DEFAULT NULL COMMENT '商品名称', + `prodNum` int(11) DEFAULT NULL COMMENT '商品数量', + `prodValue` double(12,2) DEFAULT NULL COMMENT '商品货值', + `typeCode` varchar(100) DEFAULT NULL COMMENT '类别编号', + `typeName` varchar(100) DEFAULT NULL COMMENT '类别名称', + `typeOne` varchar(100) DEFAULT NULL COMMENT '一级类别名称', + `typeTwo` varchar(100) DEFAULT NULL COMMENT '二级类别名称', + + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB COMMENT='库存汇总表-商品库存'; \ No newline at end of file diff --git a/supervise-customer-ui/src/api/supervise/gdinventorylog.js b/supervise-customer-ui/src/api/supervise/gdinventorylog.js index 7d8eb848..f6c4697a 100644 --- a/supervise-customer-ui/src/api/supervise/gdinventorylog.js +++ b/supervise-customer-ui/src/api/supervise/gdinventorylog.js @@ -5,7 +5,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/supervise/v1/gdinventorylog/listPage', + url: '/customer/v1/gdinventorylog/listPage', method: 'post', data: params }) @@ -13,7 +13,7 @@ export default { // 保存新增记录 saveOrUpdate: function(params) { return request({ - url: '/supervise/v1/gdinventorylog/save', + url: '/customer/v1/gdinventorylog/save', method: 'post', data: params }) @@ -21,7 +21,7 @@ export default { // 通过sid删除一条或多条记录 delBySids: function(params) { return request({ - url: '/supervise/v1/gdinventorylog/delBySids', + url: '/customer/v1/gdinventorylog/delBySids', method: 'delete', data: params }) @@ -29,13 +29,13 @@ export default { // 通过sid查询一条记录 fetchBySid: function(sid) { return request({ - url: '/supervise/v1/gdinventorylog/fetchDetailsBySid/' + sid + url: '/customer/v1/gdinventorylog/fetchDetailsBySid/' + sid }) }, // 提交 doSubmit: function(params) { return request({ - url: '/supervise/v1/gdinventorylog/doSubmit', + url: '/customer/v1/gdinventorylog/doSubmit', method: 'post', data: params }) @@ -43,7 +43,7 @@ export default { // 导入 importExcel: function(params) { return request({ - url: '/supervise/v1/gdinventorylog/importExcel', + url: '/customer/v1/gdinventorylog/importExcel', method: 'post', data: params }) @@ -51,7 +51,7 @@ export default { // 导出 exportExcel: function(params) { return request({ - url: '/supervise/v1/gdinventorylog/exportExcel', + url: '/customer/v1/gdinventorylog/exportExcel', method: 'post', data: params }) diff --git a/supervise-customer-ui/src/router/modules/codemenu.js b/supervise-customer-ui/src/router/modules/codemenu.js index a8f38a5c..9abefacd 100644 --- a/supervise-customer-ui/src/router/modules/codemenu.js +++ b/supervise-customer-ui/src/router/modules/codemenu.js @@ -336,7 +336,7 @@ const codemenu = [{ children: [{ path: '/daydataupload/gdinventory', component: () => import('@/views/daydataupload/gdinventory/index.vue'), - name: 'DaydatauploadGdinventory', + name: 'DaydatauploadGdinventoryLog', meta: { title: '库存信息上传', noCache: true diff --git a/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue b/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue index 5a088765..40fdbbee 100644 --- a/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue +++ b/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue @@ -1,63 +1,148 @@