From c4c28c8e7004ffba10c13f8430c1c35fbc39b35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Sun, 28 Dec 2025 14:43:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yaml | 7 + .../src/main/resources/application.yml | 2 +- .../sys/controller/SysProfileController.java | 130 ++++++++++++++++++ vue/src/api/afterSale/after_sale.js | 2 +- vue/src/api/api/logistics.js | 2 +- vue/src/api/api/shipping.js | 4 +- vue/src/api/goods/brand.js | 10 +- vue/src/api/goods/category.js | 10 +- vue/src/api/goods/categoryAttribute.js | 10 +- vue/src/api/goods/categoryAttributeValue.js | 10 +- vue/src/api/goods/goods.js | 12 +- vue/src/api/goods/goodsInventory.js | 4 +- vue/src/api/goods/goodsSpec.js | 8 +- vue/src/api/goods/supplier.js | 10 +- vue/src/api/offline/goodsSku.js | 12 +- vue/src/api/offline/order.js | 8 +- vue/src/api/offline/refund.js | 2 +- vue/src/api/offline/ship.js | 4 +- vue/src/api/order/order.js | 16 +-- vue/src/api/refund/refund.js | 2 +- vue/src/api/report/report.js | 6 +- vue/src/api/shipping/logistics.js | 12 +- vue/src/api/shipping/record.js | 4 +- vue/src/api/shipping/shipping.js | 10 +- vue/src/api/shop/ewaybill.js | 6 +- vue/src/api/shop/order.js | 2 +- vue/src/api/shop/shop.js | 22 +-- vue/src/api/wms/position.js | 10 +- vue/src/api/wms/stockIn.js | 8 +- vue/src/api/wms/stockOut.js | 8 +- vue/src/api/wms/warehouse.js | 12 +- vue/src/views/goods/goods/goods_sku.vue | 2 +- vue/src/views/goods/spec/index.vue | 2 +- 33 files changed, 253 insertions(+), 116 deletions(-) create mode 100644 api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysProfileController.java diff --git a/api/gateway/src/main/resources/application.yaml b/api/gateway/src/main/resources/application.yaml index 2122a0ec..15aa0ac3 100644 --- a/api/gateway/src/main/resources/application.yaml +++ b/api/gateway/src/main/resources/application.yaml @@ -23,6 +23,13 @@ spring: locator: enabled: true routes: + - id: erp_api_route + uri: lb://erp-api + predicates: + - Path=/api/erp-api/** + filters: + - StripPrefix=2 + - id: oms_api_route uri: lb://oms-api predicates: diff --git a/api/oms-api/src/main/resources/application.yml b/api/oms-api/src/main/resources/application.yml index 7b551a15..633e71fa 100644 --- a/api/oms-api/src/main/resources/application.yml +++ b/api/oms-api/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 8083 spring: application: - name: oms-api + name: erp-api cloud: loadbalancer: nacos: diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysProfileController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysProfileController.java new file mode 100644 index 00000000..09c8925f --- /dev/null +++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysProfileController.java @@ -0,0 +1,130 @@ +package cn.qihangerp.sys.controller; + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.model.entity.SysUser; +import cn.qihangerp.security.LoginUser; +import cn.qihangerp.security.TokenService; +import cn.qihangerp.security.common.BaseController; +import cn.qihangerp.security.common.SecurityUtils; +import cn.qihangerp.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashSet; +import java.util.Set; + +/** + * 个人信息 业务处理 + * + * @author qihang + */ +@RestController +@RequestMapping("/system/user/profile") +public class SysProfileController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private TokenService tokenService; + + /** + * 个人信息 + */ + @GetMapping + public AjaxResult profile() + { + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + AjaxResult ajax = AjaxResult.success(user); + ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); +// ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); + return ajax; + } + +// @GetMapping("/me") +// public AjaxResult me() +// { +// LoginUser loginUser = getLoginUser(); +// SysUser user = loginUser.getUser(); +// CurrentUserDTO dto = new CurrentUserDTO(); +// dto.setUserId(user.getUserId()); +// dto.setAvatar("https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif"); +// dto.setUsername(user.getUserName()); +// dto.setNickname(user.getNickName()); +// Set roles = new HashSet<>(); +// roles.add(userService.selectUserRoleGroup(loginUser.getUsername())); +// dto.setRoles(roles); +//// dto.setPerms(); +// +// AjaxResult ajax = AjaxResult.success(user); +// ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); +//// ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); +// ajax.put("data", dto); +// return ajax; +// } + + /** + * 修改用户 + */ + @PutMapping + public AjaxResult updateProfile(@RequestBody SysUser user) + { + LoginUser loginUser = getLoginUser(); + SysUser sysUser = loginUser.getUser(); + user.setUserName(sysUser.getUserName()); + if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setUserId(sysUser.getUserId()); + user.setPassword(null); + user.setAvatar(null); + user.setDeptId(null); + if (userService.updateUserProfile(user) > 0) + { + // 更新缓存用户信息 + sysUser.setNickName(user.getNickName()); + sysUser.setPhonenumber(user.getPhonenumber()); + sysUser.setEmail(user.getEmail()); + sysUser.setSex(user.getSex()); + tokenService.setLoginUser(loginUser); + return success(); + } + return error("修改个人信息异常，请联系管理员"); + } + + /** + * 重置密码 + */ + @PutMapping("/updatePwd") + public AjaxResult updatePwd(String oldPassword, String newPassword) + { + LoginUser loginUser = getLoginUser(); + String userName = loginUser.getUsername(); + String password = loginUser.getPassword(); + if (!SecurityUtils.matchesPassword(oldPassword, password)) + { + return error("修改密码失败，旧密码错误"); + } + if (SecurityUtils.matchesPassword(newPassword, password)) + { + return error("新密码不能与旧密码相同"); + } + if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) + { + // 更新缓存用户密码 + loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); + tokenService.setLoginUser(loginUser); + return success(); + } + return error("修改密码异常，请联系管理员"); + } + + +} diff --git a/vue/src/api/afterSale/after_sale.js b/vue/src/api/afterSale/after_sale.js index e49378d7..cee316bb 100644 --- a/vue/src/api/afterSale/after_sale.js +++ b/vue/src/api/afterSale/after_sale.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询列表 export function list(query) { return request({ - url: '/api/oms-api/afterSale/list', + url: '/api/erp-api/afterSale/list', method: 'get', params: query }) diff --git a/vue/src/api/api/logistics.js b/vue/src/api/api/logistics.js index a384743a..b7f6a592 100644 --- a/vue/src/api/api/logistics.js +++ b/vue/src/api/api/logistics.js @@ -20,7 +20,7 @@ // // 新增物流公司 // export function addLogistics(data) { // return request({ -// url: '/api/oms-api/shop/logistics/add', +// url: '/api/erp-api/shop/logistics/add', // method: 'post', // data: data // }) diff --git a/vue/src/api/api/shipping.js b/vue/src/api/api/shipping.js index 47720c3e..af481a7b 100644 --- a/vue/src/api/api/shipping.js +++ b/vue/src/api/api/shipping.js @@ -3,7 +3,7 @@ // // 查询 // export function listShipping(query) { // return request({ -// url: '/api/oms-api/shipping/list', +// url: '/api/erp-api/shipping/list', // method: 'get', // params: query // }) @@ -19,7 +19,7 @@ // // 新增 // export function handShip(data) { // return request({ -// url: '/api/oms-api/shipping/handShip', +// url: '/api/erp-api/shipping/handShip', // method: 'post', // data: data // }) diff --git a/vue/src/api/goods/brand.js b/vue/src/api/goods/brand.js index eade2f06..81ec12ac 100644 --- a/vue/src/api/goods/brand.js +++ b/vue/src/api/goods/brand.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品品牌列表 export function listBrand(query) { return request({ - url: '/api/oms-api/goods_brand/list', + url: '/api/erp-api/goods_brand/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listBrand(query) { // 查询商品品牌详细 export function getBrand(id) { return request({ - url: '/api/oms-api/goods_brand/' + id, + url: '/api/erp-api/goods_brand/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getBrand(id) { // 新增商品品牌 export function addBrand(data) { return request({ - url: '/api/oms-api/goods_brand', + url: '/api/erp-api/goods_brand', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addBrand(data) { // 修改商品品牌 export function updateBrand(data) { return request({ - url: '/api/oms-api/goods_brand', + url: '/api/erp-api/goods_brand', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateBrand(data) { // 删除商品品牌 export function delBrand(id) { return request({ - url: '/api/oms-api/goods_brand/' + id, + url: '/api/erp-api/goods_brand/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/category.js b/vue/src/api/goods/category.js index b5d2419f..964393f4 100644 --- a/vue/src/api/goods/category.js +++ b/vue/src/api/goods/category.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品分类列表 export function listCategory(query) { return request({ - url: '/api/oms-api/goods_category/list', + url: '/api/erp-api/goods_category/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCategory(query) { // 查询商品分类详细 export function getCategory(id) { return request({ - url: '/api/oms-api/goods_category/' + id, + url: '/api/erp-api/goods_category/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCategory(id) { // 新增商品分类 export function addCategory(data) { return request({ - url: '/api/oms-api/goods_category', + url: '/api/erp-api/goods_category', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCategory(data) { // 修改商品分类 export function updateCategory(data) { return request({ - url: '/api/oms-api/goods_category', + url: '/api/erp-api/goods_category', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCategory(data) { // 删除商品分类 export function delCategory(id) { return request({ - url: '/api/oms-api/goods_category/del/' + id, + url: '/api/erp-api/goods_category/del/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/categoryAttribute.js b/vue/src/api/goods/categoryAttribute.js index 58d87974..7c8d2dc5 100644 --- a/vue/src/api/goods/categoryAttribute.js +++ b/vue/src/api/goods/categoryAttribute.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品分类属性列表 export function listCategoryAttribute(query) { return request({ - url: '/api/oms-api/goods_category/attribute_list', + url: '/api/erp-api/goods_category/attribute_list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCategoryAttribute(query) { // 查询商品分类属性详细 export function getCategoryAttribute(id) { return request({ - url: '/api/oms-api/goods_category/attribute/' + id, + url: '/api/erp-api/goods_category/attribute/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCategoryAttribute(id) { // 新增商品分类属性 export function addCategoryAttribute(data) { return request({ - url: '/api/oms-api/goods_category/attribute_add', + url: '/api/erp-api/goods_category/attribute_add', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCategoryAttribute(data) { // 修改商品分类属性 export function updateCategoryAttribute(data) { return request({ - url: '/api/oms-api/goods_category/attribute', + url: '/api/erp-api/goods_category/attribute', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCategoryAttribute(data) { // 删除商品分类属性 export function delCategoryAttribute(id) { return request({ - url: '/api/oms-api/goods_category/attribute/' + id, + url: '/api/erp-api/goods_category/attribute/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/categoryAttributeValue.js b/vue/src/api/goods/categoryAttributeValue.js index b6540071..bf47aa2a 100644 --- a/vue/src/api/goods/categoryAttributeValue.js +++ b/vue/src/api/goods/categoryAttributeValue.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品分类属性值列表 export function listCategoryAttributeValue(query) { return request({ - url: '/api/oms-api/goods_category/attribute_value_list', + url: '/api/erp-api/goods_category/attribute_value_list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCategoryAttributeValue(query) { // 查询商品分类属性值详细 export function getCategoryAttributeValue(id) { return request({ - url: '/api/oms-api/goods_category/attribute_value/' + id, + url: '/api/erp-api/goods_category/attribute_value/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCategoryAttributeValue(id) { // 新增商品分类属性值 export function addCategoryAttributeValue(data) { return request({ - url: '/api/oms-api/goods_category/attribute_value', + url: '/api/erp-api/goods_category/attribute_value', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCategoryAttributeValue(data) { // 修改商品分类属性值 export function updateCategoryAttributeValue(data) { return request({ - url: '/api/oms-api/goods_category/attribute_value', + url: '/api/erp-api/goods_category/attribute_value', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCategoryAttributeValue(data) { // 删除商品分类属性值 export function delCategoryAttributeValue(id) { return request({ - url: '/api/oms-api/goods_category/attribute_value/' + id, + url: '/api/erp-api/goods_category/attribute_value/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/goods.js b/vue/src/api/goods/goods.js index 54e4e175..db751875 100644 --- a/vue/src/api/goods/goods.js +++ b/vue/src/api/goods/goods.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品管理列表 export function listGoods(query) { return request({ - url: '/api/oms-api/goods/list', + url: '/api/erp-api/goods/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listGoods(query) { // 查询商品规格列表 export function searchSku(query) { return request({ - url: '/api/oms-api/goods/searchSku', + url: '/api/erp-api/goods/searchSku', method: 'get', params: query }) @@ -20,7 +20,7 @@ export function searchSku(query) { // 查询商品管理详细 export function getGoods(id) { return request({ - url: '/api/oms-api/goods/' + id, + url: '/api/erp-api/goods/' + id, method: 'get' }) } @@ -28,7 +28,7 @@ export function getGoods(id) { // 新增商品管理 export function addGoods(data) { return request({ - url: '/api/oms-api/goods/add', + url: '/api/erp-api/goods/add', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addGoods(data) { // 修改商品管理 export function updateGoods(data) { return request({ - url: '/api/oms-api/goods', + url: '/api/erp-api/goods', method: 'put', data: data }) @@ -46,7 +46,7 @@ export function updateGoods(data) { // 删除商品管理 export function delGoods(id) { return request({ - url: '/api/oms-api/goods/del/' + id, + url: '/api/erp-api/goods/del/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/goodsInventory.js b/vue/src/api/goods/goodsInventory.js index 6571dc33..61e0af9f 100644 --- a/vue/src/api/goods/goodsInventory.js +++ b/vue/src/api/goods/goodsInventory.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品库存列表 export function listGoodsInventory(query) { return request({ - url: '/api/oms-api/goodsInventory/list', + url: '/api/erp-api/goodsInventory/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listGoodsInventory(query) { // 查询商品库存详细 export function getGoodsInventory(id) { return request({ - url: '/api/oms-api/goodsInventory/' + id, + url: '/api/erp-api/goodsInventory/' + id, method: 'get' }) } diff --git a/vue/src/api/goods/goodsSpec.js b/vue/src/api/goods/goodsSpec.js index 0b171676..bac37cfe 100644 --- a/vue/src/api/goods/goodsSpec.js +++ b/vue/src/api/goods/goodsSpec.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品规格库存管理列表 export function listGoodsSpec(query) { return request({ - url: '/api/oms-api/goods/sku_list', + url: '/api/erp-api/goods/sku_list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listGoodsSpec(query) { // 查询商品规格库存管理详细 export function getGoodsSpec(id) { return request({ - url: '/api/oms-api/goods/sku/' + id, + url: '/api/erp-api/goods/sku/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getGoodsSpec(id) { // 新增商品规格库存管理 export function addGoodsSpec(data) { return request({ - url: '/api/oms-api/goods/goodsSku', + url: '/api/erp-api/goods/goodsSku', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addGoodsSpec(data) { // 修改商品规格库存管理 export function updateGoodsSpec(data) { return request({ - url: '/api/oms-api/goods/sku', + url: '/api/erp-api/goods/sku', method: 'put', data: data }) diff --git a/vue/src/api/goods/supplier.js b/vue/src/api/goods/supplier.js index 93a6e73d..a7d1bfaa 100644 --- a/vue/src/api/goods/supplier.js +++ b/vue/src/api/goods/supplier.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询供应商管理列表 export function listSupplier(query) { return request({ - url: '/api/oms-api/supplier/list', + url: '/api/erp-api/supplier/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listSupplier(query) { // 查询供应商管理详细 export function getSupplier(id) { return request({ - url: '/api/oms-api/supplier/' + id, + url: '/api/erp-api/supplier/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getSupplier(id) { // 新增供应商管理 export function addSupplier(data) { return request({ - url: '/api/oms-api/supplier', + url: '/api/erp-api/supplier', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addSupplier(data) { // 修改供应商管理 export function updateSupplier(data) { return request({ - url: '/api/oms-api/supplier', + url: '/api/erp-api/supplier', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateSupplier(data) { // 删除供应商管理 export function delSupplier(id) { return request({ - url: '/api/oms-api/supplier/' + id, + url: '/api/erp-api/supplier/' + id, method: 'delete' }) } diff --git a/vue/src/api/offline/goodsSku.js b/vue/src/api/offline/goodsSku.js index c0ac3bce..50e34645 100644 --- a/vue/src/api/offline/goodsSku.js +++ b/vue/src/api/offline/goodsSku.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品规格库存管理列表 export function listGoodsSku(query) { return request({ - url: '/api/oms-api/offline_goods/sku_list', + url: '/api/erp-api/offline_goods/sku_list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listGoodsSku(query) { // 查询商品规格库存管理详细 export function getGoodsSku(id) { return request({ - url: '/api/oms-api/offline_goods/sku/' + id, + url: '/api/erp-api/offline_goods/sku/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getGoodsSku(id) { // 新增商品规格库存管理 export function addGoodsSku(data) { return request({ - url: '/api/oms-api/offline_goods/sku', + url: '/api/erp-api/offline_goods/sku', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addGoodsSku(data) { // 修改商品规格库存管理 export function updateGoodsSku(data) { return request({ - url: '/api/oms-api/offline_goods/sku', + url: '/api/erp-api/offline_goods/sku', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateGoodsSku(data) { // 删除商品规格库存管理 export function delGoodsSku(id) { return request({ - url: '/api/oms-api/offline_goods/sku/' + id, + url: '/api/erp-api/offline_goods/sku/' + id, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delGoodsSku(id) { // 查询商品规格列表 export function searchSku(query) { return request({ - url: '/api/oms-api/offline_goods/searchSku', + url: '/api/erp-api/offline_goods/searchSku', method: 'get', params: query }) diff --git a/vue/src/api/offline/order.js b/vue/src/api/offline/order.js index 8cc78c55..dc3cdeaa 100644 --- a/vue/src/api/offline/order.js +++ b/vue/src/api/offline/order.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询店铺订单列表 export function listOrder(query) { return request({ - url: '/api/oms-api/offline_order/list', + url: '/api/erp-api/offline_order/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listOrder(query) { // 查询店铺订单详细 export function getOrder(id) { return request({ - url: '/api/oms-api/offline_order/' + id, + url: '/api/erp-api/offline_order/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getOrder(id) { // 新增店铺订单 export function addOrder(data) { return request({ - url: '/api/oms-api/offline_order/create', + url: '/api/erp-api/offline_order/create', method: 'post', data: data }) @@ -28,7 +28,7 @@ export function addOrder(data) { export function pushOms(data) { return request({ - url: '/api/oms-api/offline_order/push_oms', + url: '/api/erp-api/offline_order/push_oms', method: 'post', data: data }) diff --git a/vue/src/api/offline/refund.js b/vue/src/api/offline/refund.js index d77d01d0..8311c491 100644 --- a/vue/src/api/offline/refund.js +++ b/vue/src/api/offline/refund.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询列表 export function list(query) { return request({ - url: '/api/oms-api/offline_refund/list', + url: '/api/erp-api/offline_refund/list', method: 'get', params: query }) diff --git a/vue/src/api/offline/ship.js b/vue/src/api/offline/ship.js index b1576f20..dd4b3475 100644 --- a/vue/src/api/offline/ship.js +++ b/vue/src/api/offline/ship.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 填写物流单号 export function logisticsUpdate(data) { return request({ - url: '/api/oms-api/offline_ship/order_logistics', + url: '/api/erp-api/offline_ship/order_logistics', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function logisticsUpdate(data) { // 批量发货 export function batchOrderSend(data) { return request({ - url: '/api/oms-api/offline_ship/order_batch_send', + url: '/api/erp-api/offline_ship/order_batch_send', method: 'post', data: data }) diff --git a/vue/src/api/order/order.js b/vue/src/api/order/order.js index 99c09397..ee924eec 100644 --- a/vue/src/api/order/order.js +++ b/vue/src/api/order/order.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询店铺订单列表 export function listOrder(query) { return request({ - url: '/api/oms-api/order/list', + url: '/api/erp-api/order/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listOrder(query) { // 查询店铺订单详细 export function getOrder(id) { return request({ - url: '/api/oms-api/order/' + id, + url: '/api/erp-api/order/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getOrder(id) { // 取消订单 export function cancelOrder(data) { return request({ - url: '/api/oms-api/order/cancelOrder', + url: '/api/erp-api/order/cancelOrder', method: 'post', data: data }) @@ -30,7 +30,7 @@ export function cancelOrder(data) { // 订单明细list export function listOrderItem(query) { return request({ - url: '/api/oms-api/order/item_list', + url: '/api/erp-api/order/item_list', method: 'get', params: query }) @@ -40,7 +40,7 @@ export function listOrderItem(query) { // 查询待自己发货的订单列表（待发货的） export function waitShipList(query) { return request({ - url: '/api/oms-api/order/waitShipmentList', + url: '/api/erp-api/order/waitShipmentList', method: 'get', params: query }) @@ -51,7 +51,7 @@ export function waitShipList(query) { // 分配供应商发货 export function allocateShipmentOrder(data) { return request({ - url: '/api/oms-api/order/allocateShipmentOrder', + url: '/api/erp-api/order/allocateShipmentOrder', method: 'post', data: data }) @@ -61,7 +61,7 @@ export function allocateShipmentOrder(data) { // 手动发货 export function manualShipmentOrder(data) { return request({ - url: '/api/oms-api/order/manualShipment', + url: '/api/erp-api/order/manualShipment', method: 'post', data: data }) @@ -69,7 +69,7 @@ export function manualShipmentOrder(data) { //修改订单item skuId export function orderItemSpecIdUpdate(data) { return request({ - url: '/api/oms-api/order/order_item_sku_id_update', + url: '/api/erp-api/order/order_item_sku_id_update', method: 'post', data: data }) diff --git a/vue/src/api/refund/refund.js b/vue/src/api/refund/refund.js index b60d66b2..cf3616a2 100644 --- a/vue/src/api/refund/refund.js +++ b/vue/src/api/refund/refund.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询退换货列表 export function listReturned(query) { return request({ - url: '/api/oms-api/refund/list', + url: '/api/erp-api/refund/list', method: 'get', params: query }) diff --git a/vue/src/api/report/report.js b/vue/src/api/report/report.js index 2b223be3..71444227 100644 --- a/vue/src/api/report/report.js +++ b/vue/src/api/report/report.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 首页今日销售统计 export function todayDaily(query) { return request({ - url: '/api/oms-api/report/todayDaily', + url: '/api/erp-api/report/todayDaily', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function todayDaily(query) { // 销售统计 export function salesDaily(query) { return request({ - url: '/api/oms-api/report/salesDaily', + url: '/api/erp-api/report/salesDaily', method: 'get', params: query }) @@ -21,7 +21,7 @@ export function salesDaily(query) { export function salesTopSku(query) { return request({ - url: '/api/oms-api/report/salesTopSku', + url: '/api/erp-api/report/salesTopSku', method: 'get', params: query }) diff --git a/vue/src/api/shipping/logistics.js b/vue/src/api/shipping/logistics.js index 4106da74..21c8a732 100644 --- a/vue/src/api/shipping/logistics.js +++ b/vue/src/api/shipping/logistics.js @@ -3,14 +3,14 @@ import request from '@/utils/request' // 查询物流公司列表 export function listLogistics(query) { return request({ - url: '/api/oms-api/shop/logistics', + url: '/api/erp-api/shop/logistics', method: 'get', params: query }) } export function listLogisticsStatus(query) { return request({ - url: '/api/oms-api/shop/logistics_status', + url: '/api/erp-api/shop/logistics_status', method: 'get', params: query }) @@ -19,7 +19,7 @@ export function listLogisticsStatus(query) { // 查询物流公司详细 export function getLogistics(id) { return request({ - url: '/api/oms-api/shop/logistics/' + id, + url: '/api/erp-api/shop/logistics/' + id, method: 'get' }) } @@ -27,7 +27,7 @@ export function getLogistics(id) { // 新增物流公司 export function addLogistics(data) { return request({ - url: '/api/oms-api/shop/logistics/add', + url: '/api/erp-api/shop/logistics/add', method: 'post', data: data }) @@ -36,14 +36,14 @@ export function addLogistics(data) { // 修改物流公司 export function updateStatus(data) { return request({ - url: '/api/oms-api/shop/logistics/updateStatus', + url: '/api/erp-api/shop/logistics/updateStatus', method: 'put', data: data }) } export function updateLogistics(data) { return request({ - url: '/api/oms-api/shop/logistics/update', + url: '/api/erp-api/shop/logistics/update', method: 'put', data: data }) diff --git a/vue/src/api/shipping/record.js b/vue/src/api/shipping/record.js index 910fdbfd..99660792 100644 --- a/vue/src/api/shipping/record.js +++ b/vue/src/api/shipping/record.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询 export function listShipping(query) { return request({ - url: '/api/oms-api/shipping/list', + url: '/api/erp-api/shipping/list', method: 'get', params: query }) @@ -13,7 +13,7 @@ export function listShipping(query) { // 新增 export function handShip(data) { return request({ - url: '/api/oms-api/shipping/handShip', + url: '/api/erp-api/shipping/handShip', method: 'post', data: data }) diff --git a/vue/src/api/shipping/shipping.js b/vue/src/api/shipping/shipping.js index 97541df7..050d9d82 100644 --- a/vue/src/api/shipping/shipping.js +++ b/vue/src/api/shipping/shipping.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 备货清单-仓库发货 export function listShipStockupWarehouse(query) { return request({ - url: '/api/oms-api/ship/stock_up_list_by_warehouse', + url: '/api/erp-api/ship/stock_up_list_by_warehouse', method: 'get', params: query }) @@ -13,7 +13,7 @@ export function listShipStockupWarehouse(query) { // 备货清单-供应商发货 export function listShipStockupSupplier(query) { return request({ - url: '/api/oms-api/ship/stock_up_list_by_supplier', + url: '/api/erp-api/ship/stock_up_list_by_supplier', method: 'get', params: query }) @@ -23,7 +23,7 @@ export function listShipStockupSupplier(query) { // 生成出库单（备货清单生成出库单） export function generateStockOutEntry(data) { return request({ - url: '/api/oms-api/ship/generate_stock_out_entry', + url: '/api/erp-api/ship/generate_stock_out_entry', method: 'post', data: data }) @@ -33,7 +33,7 @@ export function generateStockOutEntry(data) { // 供应商发货手动确认 export function supplierShipConfirm(data) { return request({ - url: '/api/oms-api/ship/supplier_ship_confirm', + url: '/api/erp-api/ship/supplier_ship_confirm', method: 'post', data: data }) @@ -42,7 +42,7 @@ export function supplierShipConfirm(data) { // 修改备货单item skuId export function shipOrderItemSkuIdUpdate(data) { return request({ - url: '/api/oms-api/ship/order_item_sku_id_update', + url: '/api/erp-api/ship/order_item_sku_id_update', method: 'post', data: data }) diff --git a/vue/src/api/shop/ewaybill.js b/vue/src/api/shop/ewaybill.js index 14ec7008..cdb3d631 100644 --- a/vue/src/api/shop/ewaybill.js +++ b/vue/src/api/shop/ewaybill.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 列表 export function getWaybillAccountList(params) { return request({ - url: '/api/oms-api/ewaybill/get_waybill_account_list', + url: '/api/erp-api/ewaybill/get_waybill_account_list', method: 'get', params: params }) @@ -12,7 +12,7 @@ export function getWaybillAccountList(params) { // 更新电子面单账户 export function pullWaybillAccount(data) { return request({ - url: '/api/oms-api/ewaybill/pull_waybill_account', + url: '/api/erp-api/ewaybill/pull_waybill_account', method: 'post', data: data }) @@ -21,7 +21,7 @@ export function pullWaybillAccount(data) { // 取号并发货 export function getWaybillCodeAndSend(data) { return request({ - url: '/api/oms-api/ewaybill/get_waybill_code_and_send', + url: '/api/erp-api/ewaybill/get_waybill_code_and_send', method: 'post', data: data }) diff --git a/vue/src/api/shop/order.js b/vue/src/api/shop/order.js index 0806e6e0..576d8653 100644 --- a/vue/src/api/shop/order.js +++ b/vue/src/api/shop/order.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询店铺订单列表 export function listOrder(query) { return request({ - url: '/api/oms-api/order/list', + url: '/api/erp-api/order/list', method: 'get', params: query }) diff --git a/vue/src/api/shop/shop.js b/vue/src/api/shop/shop.js index ac6e6a4a..5c525bc8 100644 --- a/vue/src/api/shop/shop.js +++ b/vue/src/api/shop/shop.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询店铺列表 export function listShop(query) { return request({ - url: '/api/oms-api/shop/list', + url: '/api/erp-api/shop/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listShop(query) { // 查询店铺详细 export function getShop(id) { return request({ - url: '/api/oms-api/shop/shop/' + id, + url: '/api/erp-api/shop/shop/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getShop(id) { // 新增店铺 export function addShop(data) { return request({ - url: '/api/oms-api/shop/shop', + url: '/api/erp-api/shop/shop', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addShop(data) { // 修改店铺 export function updateShop(data) { return request({ - url: '/api/oms-api/shop/shop', + url: '/api/erp-api/shop/shop', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateShop(data) { // 删除店铺 export function delShop(id) { return request({ - url: '/api/oms-api/shop/shop/' + id, + url: '/api/erp-api/shop/shop/' + id, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delShop(id) { // 查询店铺平台列表 export function listPlatform(query) { return request({ - url: '/api/oms-api/shop/platformList', + url: '/api/erp-api/shop/platformList', method: 'get', params: query }) @@ -55,7 +55,7 @@ export function listPlatform(query) { // 查询店铺详细 export function getPlatform(id) { return request({ - url: '/api/oms-api/shop/platform/' + id, + url: '/api/erp-api/shop/platform/' + id, method: 'get' }) } @@ -63,7 +63,7 @@ export function getPlatform(id) { // 修改店铺 export function updatePlatform(data) { return request({ - url: '/api/oms-api/shop/platform', + url: '/api/erp-api/shop/platform', method: 'put', data: data }) @@ -72,7 +72,7 @@ export function updatePlatform(data) { // export function listLogisticsStatus(query) { // return request({ -// url: '/api/oms-api/shop/logistics_status', +// url: '/api/erp-api/shop/logistics_status', // method: 'get', // params: query // }) @@ -82,7 +82,7 @@ export function updatePlatform(data) { export function listShopPullLogs(query) { return request({ - url: '/api/oms-api/shop/pull_logs_list', + url: '/api/erp-api/shop/pull_logs_list', method: 'get', params: query }) @@ -90,7 +90,7 @@ export function listShopPullLogs(query) { // // 修改物流状态 // export function updateStatus(data) { // return request({ -// url: '/api/oms-api/shop/logistics/updateStatus', +// url: '/api/erp-api/shop/logistics/updateStatus', // method: 'put', // data: data // }) diff --git a/vue/src/api/wms/position.js b/vue/src/api/wms/position.js index 39a1329a..6e6c8571 100644 --- a/vue/src/api/wms/position.js +++ b/vue/src/api/wms/position.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询仓库货架列表 export function listPosition(query) { return request({ - url: '/api/oms-api/warehouse/position/list', + url: '/api/erp-api/warehouse/position/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listPosition(query) { // 查询仓库货架详细 export function getLocation(id) { return request({ - url: '/api/oms-api/warehouse/position/' + id, + url: '/api/erp-api/warehouse/position/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getLocation(id) { // 新增仓库货架 export function addLocation(data) { return request({ - url: '/api/oms-api/warehouse/position', + url: '/api/erp-api/warehouse/position', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addLocation(data) { // 修改仓库货架 export function updateLocation(data) { return request({ - url: '/api/oms-api/warehouse/position', + url: '/api/erp-api/warehouse/position', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateLocation(data) { // 删除仓库货架 export function delLocation(id) { return request({ - url: '/api/oms-api/warehouse/position/' + id, + url: '/api/erp-api/warehouse/position/' + id, method: 'delete' }) } diff --git a/vue/src/api/wms/stockIn.js b/vue/src/api/wms/stockIn.js index ffb313e9..9d1ef7a7 100644 --- a/vue/src/api/wms/stockIn.js +++ b/vue/src/api/wms/stockIn.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询入库单列表 export function listStockIn(query) { return request({ - url: '/api/oms-api/stockIn/list', + url: '/api/erp-api/stockIn/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listStockIn(query) { // 查询入库单详细 export function getWmsStockInEntry(id) { return request({ - url: '/api/oms-api/stockIn/' + id, + url: '/api/erp-api/stockIn/' + id, method: 'get' }) } @@ -20,14 +20,14 @@ export function getWmsStockInEntry(id) { // 新增入库单 export function stockInCreate(data) { return request({ - url: '/api/oms-api/stockIn/create', + url: '/api/erp-api/stockIn/create', method: 'post', data: data }) } export function stockIn(data) { return request({ - url: '/api/oms-api/stockIn/in', + url: '/api/erp-api/stockIn/in', method: 'post', data: data }) diff --git a/vue/src/api/wms/stockOut.js b/vue/src/api/wms/stockOut.js index fadd79ed..010040a1 100644 --- a/vue/src/api/wms/stockOut.js +++ b/vue/src/api/wms/stockOut.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询出库单列表 export function listStockOut(query) { return request({ - url: '/api/oms-api/stockOut/list', + url: '/api/erp-api/stockOut/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listStockOut(query) { // 查询出库单详细 export function getStockOutEntry(id) { return request({ - url: '/api/oms-api/stockOut/' + id, + url: '/api/erp-api/stockOut/' + id, method: 'get' }) } @@ -22,7 +22,7 @@ export function getStockOutEntry(id) { // 出库 export function stockOut(data) { return request({ - url: '/api/oms-api/stockOut/out', + url: '/api/erp-api/stockOut/out', method: 'post', data: data }) @@ -31,7 +31,7 @@ export function stockOut(data) { // 打印 export function stockOutPrint(id) { return request({ - url: '/api/oms-api/stockOut/print/'+id, + url: '/api/erp-api/stockOut/print/'+id, method: 'get' }) } diff --git a/vue/src/api/wms/warehouse.js b/vue/src/api/wms/warehouse.js index 889bca84..c750a6d4 100644 --- a/vue/src/api/wms/warehouse.js +++ b/vue/src/api/wms/warehouse.js @@ -3,14 +3,14 @@ import request from '@/utils/request' // 查询仓库货架列表 export function listWarehouse(query) { return request({ - url: '/api/oms-api/warehouse/list', + url: '/api/erp-api/warehouse/list', method: 'get', params: query }) } export function searchPosition(query) { return request({ - url: '/api/oms-api/warehouse/position/search', + url: '/api/erp-api/warehouse/position/search', method: 'get', params: query }) @@ -20,7 +20,7 @@ export function searchPosition(query) { // 查询仓库货架详细 export function getLocation(id) { return request({ - url: '/api/oms-api/warehouse/' + id, + url: '/api/erp-api/warehouse/' + id, method: 'get' }) } @@ -28,7 +28,7 @@ export function getLocation(id) { // 新增仓库货架 export function addLocation(data) { return request({ - url: '/api/oms-api/warehouse', + url: '/api/erp-api/warehouse', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addLocation(data) { // 修改仓库货架 export function updateLocation(data) { return request({ - url: '/api/oms-api/warehouse', + url: '/api/erp-api/warehouse', method: 'put', data: data }) @@ -46,7 +46,7 @@ export function updateLocation(data) { // 删除仓库货架 export function delLocation(id) { return request({ - url: '/api/oms-api/warehouse/' + id, + url: '/api/erp-api/warehouse/' + id, method: 'delete' }) } diff --git a/vue/src/views/goods/goods/goods_sku.vue b/vue/src/views/goods/goods/goods_sku.vue index 282d2961..74b616fb 100644 --- a/vue/src/views/goods/goods/goods_sku.vue +++ b/vue/src/views/goods/goods/goods_sku.vue @@ -155,7 +155,7 @@ class="upload-demo" :headers="headers" drag - action="/dev-api/api/oms-api/goods/goods_sku_import" + action="/dev-api/api/erp-api/goods/goods_sku_import" accept="xlsx" multiple > diff --git a/vue/src/views/goods/spec/index.vue b/vue/src/views/goods/spec/index.vue index 1dd55c9f..ff294708 100644 --- a/vue/src/views/goods/spec/index.vue +++ b/vue/src/views/goods/spec/index.vue @@ -157,7 +157,7 @@ class="upload-demo" :headers="headers" drag - action="/dev-api/api/oms-api/goods/goods_sku_import" + action="/dev-api/api/erp-api/goods/goods_sku_import" accept="xlsx" multiple >