From a516971ecea6503b1b88f4eac5323cb99c86c77b Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Mon, 24 Mar 2025 13:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=AD=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/oms-api/pom.xml | 5 + .../oms/controller/StockInController.java | 55 +++ .../oms/controller/StockOutController.java | 25 + .../oms/controller/WarehouseController.java | 131 ++++++ api/pom.xml | 1 - docs/qihang-oms.sql | 18 +- vue/.env.development | 4 +- vue/.env.production | 4 +- vue/.env.staging | 4 +- vue/package.json | 6 +- vue/src/api/wms/position.js | 44 ++ vue/src/api/wms/stockIn.js | 41 ++ vue/src/api/wms/stockOut.js | 35 ++ vue/src/api/wms/stockOutEntryItemDetail.js | 44 ++ vue/src/api/wms/warehouse.js | 52 +++ vue/src/views/login2.vue | 2 +- .../{goods => stock}/goodsInventory/index.vue | 0 vue/src/views/stock/stockIn/create.vue | 244 ++++++++++ vue/src/views/stock/stockIn/index.vue | 434 ++++++++++++++++++ vue/src/views/stock/stockOut/index.vue | 413 +++++++++++++++++ vue/src/views/stock/warehouse/index.vue | 341 ++++++++++++++ vue/src/views/stock/warehouse/position.vue | 363 +++++++++++++++ vue/vue.config.js | 2 +- 23 files changed, 2247 insertions(+), 21 deletions(-) create mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockInController.java create mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java create mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java create mode 100644 vue/src/api/wms/position.js create mode 100644 vue/src/api/wms/stockIn.js create mode 100644 vue/src/api/wms/stockOut.js create mode 100644 vue/src/api/wms/stockOutEntryItemDetail.js create mode 100644 vue/src/api/wms/warehouse.js rename vue/src/views/{goods => stock}/goodsInventory/index.vue (100%) create mode 100644 vue/src/views/stock/stockIn/create.vue create mode 100644 vue/src/views/stock/stockIn/index.vue create mode 100644 vue/src/views/stock/stockOut/index.vue create mode 100644 vue/src/views/stock/warehouse/index.vue create mode 100644 vue/src/views/stock/warehouse/position.vue diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index bcc64618..4d60623a 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -73,6 +73,11 @@ order 1.0 + + cn.qihangerp.module + stock + 1.0 + mysql mysql-connector-java diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockInController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockInController.java new file mode 100644 index 00000000..3478e7bb --- /dev/null +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockInController.java @@ -0,0 +1,55 @@ +package cn.qihangerp.oms.controller; + + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.TableDataInfo; + +import cn.qihangerp.module.stock.domain.WmsStockIn; +import cn.qihangerp.module.stock.request.StockInCreateRequest; +import cn.qihangerp.module.stock.request.StockInRequest; +import cn.qihangerp.module.stock.service.WmsStockInService; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@AllArgsConstructor +@RestController +@RequestMapping("/stockIn") +public class StockInController extends BaseController { + private final WmsStockInService stockInService; + @GetMapping("/list") + public TableDataInfo list(WmsStockIn bo, PageQuery pageQuery) + { + var pageList = stockInService.queryPageList(bo,pageQuery); + return getDataTable(pageList); + } + + @PostMapping("/create") + public AjaxResult createEntry(@RequestBody StockInCreateRequest request) + { + ResultVo resultVo = stockInService.createEntry(getUserId(), getUsername(), request); + if(resultVo.getCode()==0) + return AjaxResult.success(); + else return AjaxResult.error(resultVo.getMsg()); + } + + @PostMapping("/in") + public AjaxResult in(@RequestBody StockInRequest request) + { + ResultVo resultVo = stockInService.stockIn(getUserId(), getUsername(), request); + if(resultVo.getCode()==0) + return AjaxResult.success(); + else return AjaxResult.error(resultVo.getMsg()); + } + + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + WmsStockIn entry = stockInService.getDetailAndItemById(id); + + return success(entry); + } + +} diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java new file mode 100644 index 00000000..1f00e743 --- /dev/null +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java @@ -0,0 +1,25 @@ +package cn.qihangerp.oms.controller; + + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.TableDataInfo; + +import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@AllArgsConstructor +@RestController +@RequestMapping("/stockOut") +public class StockOutController extends BaseController { + @GetMapping("/list") + public TableDataInfo list(OGoodsSku bo, PageQuery pageQuery) + { +// var pageList = goodsService.querySkuPageList(bo,pageQuery); + return getDataTable(new PageResult<>()); + } +} diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java new file mode 100644 index 00000000..62d7ec09 --- /dev/null +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java @@ -0,0 +1,131 @@ +package cn.qihangerp.oms.controller; + + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.module.stock.domain.WmsWarehouse; +import cn.qihangerp.module.stock.domain.WmsWarehousePosition; +import cn.qihangerp.module.stock.service.WmsWarehousePositionService; +import cn.qihangerp.module.stock.service.WmsWarehouseService; +import cn.qihangerp.security.common.BaseController; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.AllArgsConstructor; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@AllArgsConstructor +@RestController +@RequestMapping("/warehouse") +public class WarehouseController extends BaseController { + private final WmsWarehouseService warehouseService; + private final WmsWarehousePositionService positionService; + @GetMapping("/list") + public TableDataInfo list(WmsWarehouse bo) + { + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(bo.getStatus()!=null,WmsWarehouse::getStatus, bo.getStatus()) + .like(StringUtils.hasText(bo.getNumber()),WmsWarehouse::getNumber,bo.getNumber()) + .like(StringUtils.hasText(bo.getName()),WmsWarehouse::getName,bo.getName()) + ; + List wmsWarehouses = warehouseService.list(qw); + return getDataTable(wmsWarehouses); + } + + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(warehouseService.getById(id)); + } + @PostMapping + public AjaxResult add(@RequestBody WmsWarehouse warehouse) + { + warehouse.setCreateBy(getUsername()); + warehouse.setCreateTime(new Date()); + boolean save = warehouseService.save(warehouse); + if(save){ + WmsWarehousePosition position = new WmsWarehousePosition(); + position.setWarehouseId(warehouse.getId()); + position.setParentId(0); + position.setParentId1(0); + position.setParentId2(0); + position.setNumber(warehouse.getNumber()); + position.setName(warehouse.getName()); + position.setIsDelete(0); + position.setAddress(warehouse.getAddress()); + position.setRemark(warehouse.getRemark()); + position.setCreateBy(getUsername()); + position.setCreateTime(new Date()); + positionService.save(position); + } + return AjaxResult.success(); + } + @PutMapping + public AjaxResult edit(@RequestBody WmsWarehouse warehouse) + { + warehouse.setUpdateBy(getUsername()); + warehouse.setUpdateTime(new Date()); + return toAjax(warehouseService.updateById(warehouse)); + } + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(warehouseService.removeBatchByIds(Arrays.stream(ids).toList())); + } + + @GetMapping("/position/list") + public TableDataInfo positionList(Long warehouseId) + { + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(WmsWarehousePosition::getWarehouseId,warehouseId) + ; + List list = positionService.list(qw); + return getDataTable(list); + } + @GetMapping("/position/search") + public TableDataInfo searchPosition(Long warehouseId,String number) + { + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(WmsWarehousePosition::getWarehouseId,warehouseId) + .like(WmsWarehousePosition::getNumber,number) + ; + List list = positionService.list(qw); + return getDataTable(list); + } + + + @PostMapping("/position") + public AjaxResult positionAdd(@RequestBody WmsWarehousePosition position) { + position.setCreateBy(getUsername()); + position.setCreateTime(new Date()); + position.setParentId1(0); + position.setParentId2(0); + positionService.save(position); + + return AjaxResult.success(); + } + + @GetMapping(value = "/position/{id}") + public AjaxResult getPositionInfo(@PathVariable("id") Long id) + { + return success(positionService.getById(id)); + } + + @PutMapping("/position") + public AjaxResult positionEdit(@RequestBody WmsWarehousePosition position) + { + position.setUpdateBy(getUsername()); + position.setUpdateTime(new Date()); + return toAjax(positionService.updateById(position)); + } + @DeleteMapping("/position/{ids}") + public AjaxResult positionRemove(@PathVariable Long[] ids) + { + return toAjax(positionService.removeBatchByIds(Arrays.stream(ids).toList())); + } + + +} diff --git a/api/pom.xml b/api/pom.xml index 8f388f21..a1869b9b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -19,7 +19,6 @@ oms-api sys-api open-api - eureka-server UTF-8 diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql index fcd9a089..48065758 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -11,7 +11,7 @@ Target Server Version : 80200 File Encoding : 65001 - Date: 24/03/2025 13:06:49 + Date: 24/03/2025 13:49:16 */ SET NAMES utf8mb4; @@ -13980,18 +13980,18 @@ INSERT INTO `sys_menu` VALUES (2100, '私域售后管理', 2, 3, 'offline_afters INSERT INTO `sys_menu` VALUES (2101, '渠道商品管理', 4, 50, 'offline_goods_list', 'offline/goods/index', NULL, 1, 0, 'C', '0', '1', '', 'documentation', 'admin', '2024-07-27 17:33:54', 'admin', '2024-09-07 23:17:59', ''); INSERT INTO `sys_menu` VALUES (2103, '手动创建私域订单', 1, 49, 'offline_order_create', 'order/private/create', NULL, 1, 0, 'C', '1', '0', '', 'date', 'admin', '2024-07-27 20:30:07', 'admin', '2025-03-24 11:46:51', ''); INSERT INTO `sys_menu` VALUES (2104, '商品库管理', 4, 0, 'goods_list', 'goods/index', NULL, 1, 0, 'C', '0', '0', 'goods', 'example', 'admin', '2024-08-25 14:35:54', 'admin', '2024-09-08 16:14:12', ''); -INSERT INTO `sys_menu` VALUES (2105, '库存管理', 0, 40, 'wms', NULL, NULL, 1, 0, 'M', '0', '0', '', 'lock', 'admin', '2024-08-25 15:54:14', 'admin', '2024-09-21 19:16:02', ''); -INSERT INTO `sys_menu` VALUES (2106, '商品入库管理', 2105, 10, 'stock_in', 'wms/stockIn/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'download', 'admin', '2024-08-25 15:56:04', 'admin', '2024-09-22 14:52:26', ''); +INSERT INTO `sys_menu` VALUES (2105, '库存管理', 0, 40, 'stock', NULL, NULL, 1, 0, 'M', '0', '0', '', 'lock', 'admin', '2024-08-25 15:54:14', 'admin', '2025-03-24 13:32:20', ''); +INSERT INTO `sys_menu` VALUES (2106, '商品入库管理', 2105, 10, 'stock_in', 'stock/stockIn/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'download', 'admin', '2024-08-25 15:56:04', 'admin', '2025-03-24 13:35:21', ''); INSERT INTO `sys_menu` VALUES (2108, '供应商管理', 4, 90, 'supplier_list', 'goods/supplier/index', NULL, 1, 0, 'C', '0', '0', '', 'people', 'admin', '2024-08-25 18:27:55', 'admin', '2024-09-07 15:51:17', ''); INSERT INTO `sys_menu` VALUES (2109, '商品分类管理', 4, 80, 'category_list', 'goods/category/index', NULL, 1, 0, 'C', '0', '0', '', 'edit', 'admin', '2024-08-25 18:43:28', 'admin', '2024-09-07 15:47:44', ''); INSERT INTO `sys_menu` VALUES (2110, '商品品牌管理', 4, 81, 'brand_list', 'goods/brand/index', NULL, 1, 0, 'C', '0', '0', '', 'icon', 'admin', '2024-08-25 18:45:47', 'admin', '2024-09-07 15:48:31', ''); INSERT INTO `sys_menu` VALUES (2111, '分类规格属性', 4, 101, 'goods_category/attribute', 'goods/category/categoryAttribute', NULL, 1, 0, 'C', '1', '0', '', 'button', 'admin', '2024-08-25 18:49:22', 'admin', '2024-09-07 16:17:01', ''); INSERT INTO `sys_menu` VALUES (2112, '规格属性值', 4, 102, 'goods_category/attribute_value', 'goods/category/categoryAttributeValue', NULL, 1, 0, 'C', '1', '0', '', 'date', 'admin', '2024-08-25 18:51:55', 'admin', '2024-09-07 16:23:53', ''); -INSERT INTO `sys_menu` VALUES (2114, '仓库仓位设置', 2105, 90, 'warehouse', 'wms/warehouse/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'cascader', 'admin', '2024-09-21 20:07:26', 'admin', '2024-09-22 11:51:25', ''); -INSERT INTO `sys_menu` VALUES (2115, '商品库存管理', 2105, 0, 'goods_inventory', 'goods/goodsInventory/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'chart', 'admin', '2024-09-21 20:43:00', 'admin', '2024-10-05 16:30:35', ''); -INSERT INTO `sys_menu` VALUES (2116, '商品出库管理', 2105, 20, 'stock_out', 'wms/stockOut/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-09-21 20:44:46', 'admin', '2024-09-22 14:52:37', ''); -INSERT INTO `sys_menu` VALUES (2117, '仓位管理', 2105, 91, 'position', 'wms/warehouse/position', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 11:52:18', 'admin', '2024-09-22 14:48:21', ''); -INSERT INTO `sys_menu` VALUES (2118, '新建商品入库单', 2105, 11, 'stock_in/create', 'wms/stockIn/create.vue', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 14:49:40', 'admin', '2024-09-22 15:30:10', ''); +INSERT INTO `sys_menu` VALUES (2114, '仓库仓位设置', 2105, 90, 'warehouse', 'stock/warehouse/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'cascader', 'admin', '2024-09-21 20:07:26', 'admin', '2025-03-24 13:46:52', ''); +INSERT INTO `sys_menu` VALUES (2115, '商品库存管理', 2105, 0, 'goods_inventory', 'stock/goodsInventory/index.vue', NULL, 1, 0, 'C', '0', '0', '', 'chart', 'admin', '2024-09-21 20:43:00', 'admin', '2025-03-24 13:34:55', ''); +INSERT INTO `sys_menu` VALUES (2116, '商品出库管理', 2105, 20, 'stock_out', 'stock/stockOut/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-09-21 20:44:46', 'admin', '2025-03-24 13:46:42', ''); +INSERT INTO `sys_menu` VALUES (2117, '仓位管理', 2105, 91, 'position', 'stock/warehouse/position', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 11:52:18', 'admin', '2025-03-24 13:47:04', ''); +INSERT INTO `sys_menu` VALUES (2118, '新建商品入库单', 2105, 11, 'stock_in/create', 'stock/stockIn/create.vue', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 14:49:40', 'admin', '2025-03-24 13:35:30', ''); -- ---------------------------- -- Table structure for sys_oss @@ -14453,7 +14453,7 @@ CREATE TABLE `wms_warehouse_position` ( `parent_id2` int NOT NULL COMMENT '二级类目id', `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `isDelete` int NOT NULL DEFAULT 0 COMMENT '0正常 1删除', + `is_delete` int NOT NULL DEFAULT 0 COMMENT '0正常 1删除', `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', diff --git a/vue/.env.development b/vue/.env.development index addac921..8efa9bfa 100644 --- a/vue/.env.development +++ b/vue/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 启航电商OMS系统 +VUE_APP_TITLE = 启航电商ERP系统 # 开发环境配置 ENV = 'development' -# 启航电商OMS系统/开发环境 +# 启航电商ERP系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/vue/.env.production b/vue/.env.production index 696a3e01..4286e214 100644 --- a/vue/.env.production +++ b/vue/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 启航电商OMS系统 +VUE_APP_TITLE = 启航电商ERP系统 # 生产环境配置 ENV = 'production' -# 启航电商OMS系统/生产环境 +# 启航电商ERP系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/vue/.env.staging b/vue/.env.staging index fe18f4da..d4c07505 100644 --- a/vue/.env.staging +++ b/vue/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 启航电商OMS系统 +VUE_APP_TITLE = 启航电商ERP系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 启航电商OMS系统/测试环境 +# 启航电商ERP系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/vue/package.json b/vue/package.json index 9e21657a..8835324c 100644 --- a/vue/package.json +++ b/vue/package.json @@ -1,7 +1,7 @@ { - "name": "qihang-oms", - "version": "1.6.0", - "description": "启航电商OMS系统", + "name": "qihang-erp", + "version": "2.3.0", + "description": "启航电商ERP系统", "author": "qihang", "license": "MIT", "scripts": { diff --git a/vue/src/api/wms/position.js b/vue/src/api/wms/position.js new file mode 100644 index 00000000..39a1329a --- /dev/null +++ b/vue/src/api/wms/position.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询仓库货架列表 +export function listPosition(query) { + return request({ + url: '/api/oms-api/warehouse/position/list', + method: 'get', + params: query + }) +} + +// 查询仓库货架详细 +export function getLocation(id) { + return request({ + url: '/api/oms-api/warehouse/position/' + id, + method: 'get' + }) +} + +// 新增仓库货架 +export function addLocation(data) { + return request({ + url: '/api/oms-api/warehouse/position', + method: 'post', + data: data + }) +} + +// 修改仓库货架 +export function updateLocation(data) { + return request({ + url: '/api/oms-api/warehouse/position', + method: 'put', + data: data + }) +} + +// 删除仓库货架 +export function delLocation(id) { + return request({ + url: '/api/oms-api/warehouse/position/' + id, + method: 'delete' + }) +} diff --git a/vue/src/api/wms/stockIn.js b/vue/src/api/wms/stockIn.js new file mode 100644 index 00000000..ffb313e9 --- /dev/null +++ b/vue/src/api/wms/stockIn.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +// 查询入库单列表 +export function listStockIn(query) { + return request({ + url: '/api/oms-api/stockIn/list', + method: 'get', + params: query + }) +} + +// 查询入库单详细 +export function getWmsStockInEntry(id) { + return request({ + url: '/api/oms-api/stockIn/' + id, + method: 'get' + }) +} + +// 新增入库单 +export function stockInCreate(data) { + return request({ + url: '/api/oms-api/stockIn/create', + method: 'post', + data: data + }) +} +export function stockIn(data) { + return request({ + url: '/api/oms-api/stockIn/in', + method: 'post', + data: data + }) +} +export function complete(id) { + return request({ + url: '/wms/WmsStockInEntry/complete/' + id, + method: 'get' + }) +} + diff --git a/vue/src/api/wms/stockOut.js b/vue/src/api/wms/stockOut.js new file mode 100644 index 00000000..0fc6a8b1 --- /dev/null +++ b/vue/src/api/wms/stockOut.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 查询出库单列表 +export function listStockOut(query) { + return request({ + url: '/api/oms-api/stockOut/list', + method: 'get', + params: query + }) +} + +// 查询出库单详细 +export function getStockOutEntry(id) { + return request({ + url: '/wms/stockOutEntry/' + id, + method: 'get' + }) +} + +export function getStockOutEntryItem(id) { + return request({ + url: '/wms/stockOutEntry/item/' + id, + method: 'get' + }) +} + +// 出库 +export function stockOut(data) { + return request({ + url: '/wms/stockOutEntry/stockOut', + method: 'post', + data: data + }) +} + diff --git a/vue/src/api/wms/stockOutEntryItemDetail.js b/vue/src/api/wms/stockOutEntryItemDetail.js new file mode 100644 index 00000000..b36782c3 --- /dev/null +++ b/vue/src/api/wms/stockOutEntryItemDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询出库明细详情列表 +export function listStockOutEntryItemDetail(query) { + return request({ + url: '/wms/stockOutEntryItemDetail/list', + method: 'get', + params: query + }) +} + +// 查询出库明细详情详细 +export function getStockOutEntryItemDetail(id) { + return request({ + url: '/wms/stockOutEntryItemDetail/' + id, + method: 'get' + }) +} + +// 新增出库明细详情 +export function addStockOutEntryItemDetail(data) { + return request({ + url: '/wms/stockOutEntryItemDetail', + method: 'post', + data: data + }) +} + +// 修改出库明细详情 +export function updateStockOutEntryItemDetail(data) { + return request({ + url: '/wms/stockOutEntryItemDetail', + method: 'put', + data: data + }) +} + +// 删除出库明细详情 +export function delStockOutEntryItemDetail(id) { + return request({ + url: '/wms/stockOutEntryItemDetail/' + id, + method: 'delete' + }) +} diff --git a/vue/src/api/wms/warehouse.js b/vue/src/api/wms/warehouse.js new file mode 100644 index 00000000..889bca84 --- /dev/null +++ b/vue/src/api/wms/warehouse.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询仓库货架列表 +export function listWarehouse(query) { + return request({ + url: '/api/oms-api/warehouse/list', + method: 'get', + params: query + }) +} +export function searchPosition(query) { + return request({ + url: '/api/oms-api/warehouse/position/search', + method: 'get', + params: query + }) +} + + +// 查询仓库货架详细 +export function getLocation(id) { + return request({ + url: '/api/oms-api/warehouse/' + id, + method: 'get' + }) +} + +// 新增仓库货架 +export function addLocation(data) { + return request({ + url: '/api/oms-api/warehouse', + method: 'post', + data: data + }) +} + +// 修改仓库货架 +export function updateLocation(data) { + return request({ + url: '/api/oms-api/warehouse', + method: 'put', + data: data + }) +} + +// 删除仓库货架 +export function delLocation(id) { + return request({ + url: '/api/oms-api/warehouse/' + id, + method: 'delete' + }) +} diff --git a/vue/src/views/login2.vue b/vue/src/views/login2.vue index 57e2f54d..9d04efe0 100644 --- a/vue/src/views/login2.vue +++ b/vue/src/views/login2.vue @@ -1,7 +1,7 @@ + + diff --git a/vue/src/views/stock/stockIn/index.vue b/vue/src/views/stock/stockIn/index.vue new file mode 100644 index 00000000..f3cb6777 --- /dev/null +++ b/vue/src/views/stock/stockIn/index.vue @@ -0,0 +1,434 @@ + + + diff --git a/vue/src/views/stock/stockOut/index.vue b/vue/src/views/stock/stockOut/index.vue new file mode 100644 index 00000000..2cb9327c --- /dev/null +++ b/vue/src/views/stock/stockOut/index.vue @@ -0,0 +1,413 @@ + + + diff --git a/vue/src/views/stock/warehouse/index.vue b/vue/src/views/stock/warehouse/index.vue new file mode 100644 index 00000000..72d3cf1c --- /dev/null +++ b/vue/src/views/stock/warehouse/index.vue @@ -0,0 +1,341 @@ + + + diff --git a/vue/src/views/stock/warehouse/position.vue b/vue/src/views/stock/warehouse/position.vue new file mode 100644 index 00000000..e5dd10c9 --- /dev/null +++ b/vue/src/views/stock/warehouse/position.vue @@ -0,0 +1,363 @@ + + + diff --git a/vue/vue.config.js b/vue/vue.config.js index fc937cbc..5f23fc1a 100644 --- a/vue/vue.config.js +++ b/vue/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '启航电商OMS系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '启航电商ERP系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 88 // 端口