Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

2025-07-18 10:43:16 +08:00
parent fadc2249cb ab1dda6422
commit fa2608f906
21 changed files with 45 additions and 45 deletions
--- a/klp-ui/src/api/wms/category.js
+++ b/klp-ui/src/api/wms/category.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询通用分类列表
 export function listCategory(query) {
  return request({
-    url: '/klp/category/list',
+    url: '/wms/category/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listCategory(query) {
 // 查询通用分类详细
 export function getCategory(categoryId) {
  return request({
-    url: '/klp/category/' + categoryId,
+    url: '/wms/category/' + categoryId,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getCategory(categoryId) {
 // 新增通用分类
 export function addCategory(data) {
  return request({
-    url: '/klp/category',
+    url: '/wms/category',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addCategory(data) {
 // 修改通用分类
 export function updateCategory(data) {
  return request({
-    url: '/klp/category',
+    url: '/wms/category',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateCategory(data) {
 // 删除通用分类
 export function delCategory(categoryId) {
  return request({
-    url: '/klp/category/' + categoryId,
+    url: '/wms/category/' + categoryId,
    method: 'delete'
  })
 }
--- a/klp-ui/src/api/wms/product.js
+++ b/klp-ui/src/api/wms/product.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询产品列表
 export function listProduct(query) {
  return request({
-    url: '/klp/product/list',
+    url: '/wms/product/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listProduct(query) {
 // 查询产品详细
 export function getProduct(productId) {
  return request({
-    url: '/klp/product/' + productId,
+    url: '/wms/product/' + productId,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getProduct(productId) {
 // 新增产品
 export function addProduct(data) {
  return request({
-    url: '/klp/product',
+    url: '/wms/product',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addProduct(data) {
 // 修改产品
 export function updateProduct(data) {
  return request({
-    url: '/klp/product',
+    url: '/wms/product',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateProduct(data) {
 // 删除产品
 export function delProduct(productId) {
  return request({
-    url: '/klp/product/' + productId,
+    url: '/wms/product/' + productId,
    method: 'delete'
  })
 }
--- a/klp-ui/src/api/wms/productionLine.js
+++ b/klp-ui/src/api/wms/productionLine.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询产线列表
 export function listProductionLine(query) {
  return request({
-    url: '/klp/productionLine/list',
+    url: '/wms/productionLine/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listProductionLine(query) {
 // 查询产线详细
 export function getProductionLine(lineId) {
  return request({
-    url: '/klp/productionLine/' + lineId,
+    url: '/wms/productionLine/' + lineId,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getProductionLine(lineId) {
 // 新增产线
 export function addProductionLine(data) {
  return request({
-    url: '/klp/productionLine',
+    url: '/wms/productionLine',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addProductionLine(data) {
 // 修改产线
 export function updateProductionLine(data) {
  return request({
-    url: '/klp/productionLine',
+    url: '/wms/productionLine',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateProductionLine(data) {
 // 删除产线
 export function delProductionLine(lineId) {
  return request({
-    url: '/klp/productionLine/' + lineId,
+    url: '/wms/productionLine/' + lineId,
    method: 'delete'
  })
 }
--- a/klp-ui/src/api/wms/rawMaterial.js
+++ b/klp-ui/src/api/wms/rawMaterial.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询原材料列表
 export function listRawMaterial(query) {
  return request({
-    url: '/klp/rawMaterial/list',
+    url: '/wms/rawMaterial/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listRawMaterial(query) {
 // 查询原材料详细
 export function getRawMaterial(rawMaterialId) {
  return request({
-    url: '/klp/rawMaterial/' + rawMaterialId,
+    url: '/wms/rawMaterial/' + rawMaterialId,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getRawMaterial(rawMaterialId) {
 // 新增原材料
 export function addRawMaterial(data) {
  return request({
-    url: '/klp/rawMaterial',
+    url: '/wms/rawMaterial',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addRawMaterial(data) {
 // 修改原材料
 export function updateRawMaterial(data) {
  return request({
-    url: '/klp/rawMaterial',
+    url: '/wms/rawMaterial',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateRawMaterial(data) {
 // 删除原材料
 export function delRawMaterial(rawMaterialId) {
  return request({
-    url: '/klp/rawMaterial/' + rawMaterialId,
+    url: '/wms/rawMaterial/' + rawMaterialId,
    method: 'delete'
  })
 }
--- a/klp-ui/src/api/wms/stock.js
+++ b/klp-ui/src/api/wms/stock.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询库存：原材料/产品与库区/库位的存放关系列表
 export function listStock(query) {
  return request({
-    url: '/klp/stock/list',
+    url: '/wms/stock/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listStock(query) {
 // 查询库存：原材料/产品与库区/库位的存放关系详细
 export function getStock(stockId) {
  return request({
-    url: '/klp/stock/' + stockId,
+    url: '/wms/stock/' + stockId,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getStock(stockId) {
 // 新增库存：原材料/产品与库区/库位的存放关系
 export function addStock(data) {
  return request({
-    url: '/klp/stock',
+    url: '/wms/stock',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addStock(data) {
 // 修改库存：原材料/产品与库区/库位的存放关系
 export function updateStock(data) {
  return request({
-    url: '/klp/stock',
+    url: '/wms/stock',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateStock(data) {
 // 删除库存：原材料/产品与库区/库位的存放关系
 export function delStock(stockId) {
  return request({
-    url: '/klp/stock/' + stockId,
+    url: '/wms/stock/' + stockId,
    method: 'delete'
  })
 }
--- a/klp-ui/src/api/wms/warehouse.js
+++ b/klp-ui/src/api/wms/warehouse.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询仓库/库区/库位自关联列表
 export function listWarehouse(query) {
  return request({
-    url: '/klp/warehouse/list',
+    url: '/wms/warehouse/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listWarehouse(query) {
 // 查询仓库/库区/库位自关联详细
 export function getWarehouse(warehouseId) {
  return request({
-    url: '/klp/warehouse/' + warehouseId,
+    url: '/wms/warehouse/' + warehouseId,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getWarehouse(warehouseId) {
 // 新增仓库/库区/库位自关联
 export function addWarehouse(data) {
  return request({
-    url: '/klp/warehouse',
+    url: '/wms/warehouse',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addWarehouse(data) {
 // 修改仓库/库区/库位自关联
 export function updateWarehouse(data) {
  return request({
-    url: '/klp/warehouse',
+    url: '/wms/warehouse',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateWarehouse(data) {
 // 删除仓库/库区/库位自关联
 export function delWarehouse(warehouseId) {
  return request({
-    url: '/klp/warehouse/' + warehouseId,
+    url: '/wms/warehouse/' + warehouseId,
    method: 'delete'
  })
 }
--- a/klp-wms/src/main/java/com/klp/controller/WmsCategoryController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsCategoryController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/category")
+@RequestMapping("/wms/category")
 public class WmsCategoryController extends BaseController {

    private final IWmsCategoryService iWmsCategoryService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/order")
+@RequestMapping("/wms/order")
 public class WmsOrderController extends BaseController {

    private final IWmsOrderService iWmsOrderService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsOrderDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsOrderDetailController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/orderDetail")
+@RequestMapping("/wms/orderDetail")
 public class WmsOrderDetailController extends BaseController {

    private final IWmsOrderDetailService iWmsOrderDetailService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsProductBomController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsProductBomController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/productBom")
+@RequestMapping("/wms/productBom")
 public class WmsProductBomController extends BaseController {

    private final IWmsProductBomService iWmsProductBomService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsProductController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsProductController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/product")
+@RequestMapping("/wms/product")
 public class WmsProductController extends BaseController {

    private final IWmsProductService iWmsProductService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/productionLine")
+@RequestMapping("/wms/productionLine")
 public class WmsProductionLineController extends BaseController {

    private final IWmsProductionLineService iWmsProductionLineService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/purchasePlan")
+@RequestMapping("/wms/purchasePlan")
 public class WmsPurchasePlanController extends BaseController {

    private final IWmsPurchasePlanService iWmsPurchasePlanService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanDetailController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/purchasePlanDetail")
+@RequestMapping("/wms/purchasePlanDetail")
 public class WmsPurchasePlanDetailController extends BaseController {

    private final IWmsPurchasePlanDetailService iWmsPurchasePlanDetailService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/rawMaterial")
+@RequestMapping("/wms/rawMaterial")
 public class WmsRawMaterialController extends BaseController {

    private final IWmsRawMaterialService iWmsRawMaterialService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsSchedulePlanController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsSchedulePlanController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/schedulePlan")
+@RequestMapping("/wms/schedulePlan")
 public class WmsSchedulePlanController extends BaseController {

    private final IWmsSchedulePlanService iWmsSchedulePlanService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsSchedulePlanDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsSchedulePlanDetailController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/schedulePlanDetail")
+@RequestMapping("/wms/schedulePlanDetail")
 public class WmsSchedulePlanDetailController extends BaseController {

    private final IWmsSchedulePlanDetailService iWmsSchedulePlanDetailService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsStockController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsStockController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/stock")
+@RequestMapping("/wms/stock")
 public class WmsStockController extends BaseController {

    private final IWmsStockService iWmsStockService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/stockIo")
+@RequestMapping("/wms/stockIo")
 public class WmsStockIoController extends BaseController {

    private final IWmsStockIoService iWmsStockIoService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsStockIoDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsStockIoDetailController.java
@@ -32,7 +32,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/stockIoDetail")
+@RequestMapping("/wms/stockIoDetail")
 public class WmsStockIoDetailController extends BaseController {

    private final IWmsStockIoDetailService iWmsStockIoDetailService;
--- a/klp-wms/src/main/java/com/klp/controller/WmsWarehouseController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsWarehouseController.java
@@ -31,7 +31,7 @@ import com.klp.service.IWmsWarehouseService;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/klp/warehouse")
+@RequestMapping("/wms/warehouse")
 public class WmsWarehouseController extends BaseController {

    private final IWmsWarehouseService iWmsWarehouseService;