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 @@ diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js index b3067087..c92d08cf 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js @@ -68,7 +68,7 @@ export const constantRoutes = [{ meta: { title: '原料信息' } - },{ + }, { path: '/baseInfo/packagType', component: () => import('@/views/baseInfo/packagType/index.vue'), @@ -137,7 +137,16 @@ export const constantRoutes = [{ import('@/views/baseInfo/commodityFily/index.vue'), name: 'index', meta: { - title: '商品档案' + title: '商品类别' + } + }, + { + path: '/baseInfo/becomeoil', + component: () => + import('@/views/baseInfo/becomeoil/index.vue'), + name: 'index', + meta: { + title: '商品类别' } }, ] @@ -175,6 +184,33 @@ export const constantRoutes = [{ title: '原油出库登记' } }, + { + path: '/supervise/packagInBound', + component: () => + import('@/views/supervise/packagInBound/index.vue'), + name: 'index', + meta: { + title: '包装物入库登记' + } + }, + { + path: '/supervise/packagOutBound', + component: () => + import('@/views/supervise/packagOutBound/index.vue'), + name: 'index', + meta: { + title: '包装物出库登记' + } + }, + { + path: '/supervise/packagInventory', + component: () => + import('@/views/supervise/packagInventory/index.vue'), + name: 'index', + meta: { + title: '包装物盘库登记' + } + }, { path: '/supervise/EnterRegister', component: () => @@ -203,14 +239,22 @@ export const constantRoutes = [{ }, children: [ { + path: '/inventory/oilTankInfo', + component: () => + import('@/views/inventory/oilTankInfo/index.vue'), + name: 'index', + meta: { + title: '油罐库存信息' + } + },{ path: '/inventory/oilTankList', component: () => import('@/views/inventory/oilTankList/index.vue'), name: 'index', meta: { - title: '油罐库存记录' + title: '油罐登记库存记录' } - },{ + }, { path: '/inventory/oilTypeInBoundList', component: () => import('@/views/inventory/oilTypeInBoundList/index.vue'), @@ -228,13 +272,32 @@ export const constantRoutes = [{ title: '原油出库记录' } }, + { - path: '/inventory/oilTankInfo', + path: '/supervise/packagInBound', component: () => - import('@/views/inventory/oilTankInfo/index.vue'), + import('@/views/supervise/packagInBound/index.vue'), + name: 'index', + meta: { + title: '包装物入库登记' + } + }, + { + path: '/supervise/packagOutBound', + component: () => + import('@/views/supervise/packagOutBound/index.vue'), + name: 'index', + meta: { + title: '包装物出库登记' + } + }, + { + path: '/supervise/packagInventory', + component: () => + import('@/views/supervise/packagInventory/index.vue'), name: 'index', meta: { - title: '库存信息' + title: '包装物盘库登记' } }, { @@ -387,4 +450,4 @@ export function resetRouter() { router.matcher = newRouter.matcher // reset router } -export default router +export default router \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue new file mode 100644 index 00000000..5f85c0db --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue @@ -0,0 +1,164 @@ + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue new file mode 100644 index 00000000..4b3581dd --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue @@ -0,0 +1,299 @@ + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue index c3617fa1..a4e3ea79 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue @@ -7,7 +7,7 @@ {{ searchxianshitit }}
- + @@ -38,8 +38,10 @@ - - + + + +
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue index 89efcb68..3377043c 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue @@ -1,200 +1,257 @@ - - - - \ No newline at end of file + + } + diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue index 8baf8682..34255e65 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue @@ -36,12 +36,30 @@ > 查看 + + 添加 + - + - - + + + + +
@@ -53,22 +71,127 @@
- - - + + + + + + + + + + + + + + + + + + + + + + + + +
品牌名称 + +
商品名称 + +
类别名称 + +
类别编码 + +
+
+ 保存 +
+ + + + + + + + + + + + + + + + + + + +
品牌名称 + +
品牌编码 + +
商品名称 + +
名称编号 + +
+
+ 修改 +
+ - + + + + + + + + + + +
类别名称 + +
类别编码 + +
+
+ 修改 +
+ @@ -94,6 +217,9 @@ listLoading: false, btndisabled: false, editDialog: false, + categorys: false, + entry: false, + modify: false, form: { name:'', number:'', @@ -127,7 +253,28 @@ total: 0 }, viewState: 1, - datalist:[] + datalist:[], + forms: { + prodSid:'', + typeList:[] + }, + shopName:'', + shopsName:'', + shopNum:'', + arry: { + name:'', + number:'' + }, + modifythe:{ + sid:'', + name:'', + number:'' + }, + modifyArray:{ + sid:'', + name:'', + number:'' + } } }, mounted() { @@ -212,6 +359,78 @@ this.datalist=res.data }) }, + addshop(row) { + this.entry = true; + this.shopName=row.informationName + this.shopsName=row.name + this.forms.sid=row.sid + }, + modifyThe(row) { + this.modify = true; + this.modifythe.sid=row.sid + this.shopName=row.informationName + this.shopNum=row.informationNumber + this.modifythe.name=row.name + this.modifythe.number=row.number + }, + category(row) { + this.categorys = true; + this.editDialog = false; + this.modifyArray.sid=row.sid + this.modifyArray = Object.assign({}, row); + }, + modifyCategory(){ + req.updateShop(this.modifyArray).then((res)=>{ + if (res.success) { + this.$message({ + showClose: true, + type: 'success', + message: res.msg + }) + this.categorys = false; + this.getList() + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + }, + modifyList(){ + req.updateShop(this.modifythe).then((res)=>{ + if (res.success) { + this.$message({ + showClose: true, + type: 'success', + message: res.msg + }) + this.modify = false; + this.getList() + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + }, + addShop(){ + this.forms.typeList.push(this.arry) + + req.saveList(this.forms) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.entry = false; + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + + this.arry={name:'',number:''} + }, save() { req.update(this.form) .then(resp => { diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue index 8328640a..2b8e91e2 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue @@ -1,10 +1,10 @@