From 65380c5f6857749d58529110b79f283278b10032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 11 Aug 2025 18:34:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A6=84=20refactor:=20=E5=88=A0?=
 =?UTF-8?q?=E6=8E=89=E4=B8=80=E4=B8=AA=E5=9B=BE=E8=A1=A8=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/stock/panels/bar.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/klp-ui/src/views/wms/stock/panels/bar.vue b/klp-ui/src/views/wms/stock/panels/bar.vue
index aa100a25..255454cd 100644
--- a/klp-ui/src/views/wms/stock/panels/bar.vue
+++ b/klp-ui/src/views/wms/stock/panels/bar.vue
@@ -132,10 +132,6 @@ export default {
       const interval = Math.ceil(maxValue / 5); // 将刻度分为5份
 
       const option = {
-        title: {
-          text: this.selectedWarehouseId ? '当前仓库及子仓库物料TOP10' : '全部仓库物料TOP10',
-          left: 'center'
-        },
         tooltip: {
           trigger: 'axis',
           axisPointer: {

From f521692e08a9c355957deb08cd2a7a9a7f39bce7 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Mon, 11 Aug 2025 18:42:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(wms):=20=E6=9B=B4=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E5=90=8D=E5=92=8C=E6=8E=A5=E5=8F=A3=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将表名从"oa_"前缀改为"wms_"前缀
- 更新相关控制器的@RequestMapping路径
- 移除WmsReportSummaryMapper.xml中的projectId查询条件
- 注释掉rxgood页面的"涉及项目"列
---
 klp-ui/src/views/wms/rxgood/index.vue                          | 2 +-
 .../src/main/java/com/klp/controller/WmsExpressController.java | 2 +-
 .../java/com/klp/controller/WmsExpressQuestionController.java  | 2 +-
 .../java/com/klp/controller/WmsReportDetailController.java     | 2 +-
 .../java/com/klp/controller/WmsReportSummaryController.java    | 2 +-
 klp-wms/src/main/java/com/klp/domain/WmsExpress.java           | 2 +-
 klp-wms/src/main/java/com/klp/domain/WmsExpressQuestion.java   | 2 +-
 klp-wms/src/main/java/com/klp/domain/WmsReportDetail.java      | 2 +-
 klp-wms/src/main/java/com/klp/domain/WmsReportSummary.java     | 2 +-
 .../src/main/resources/mapper/klp/WmsReportSummaryMapper.xml   | 3 ---
 10 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/klp-ui/src/views/wms/rxgood/index.vue b/klp-ui/src/views/wms/rxgood/index.vue
index a9010af3..7740a92a 100644
--- a/klp-ui/src/views/wms/rxgood/index.vue
+++ b/klp-ui/src/views/wms/rxgood/index.vue
@@ -104,7 +104,7 @@
         </template>
       </el-table-column>
       <el-table-column label="经办人" align="center" prop="reporter" />
-      <el-table-column label="涉及项目" align="center" prop="projectName" />
+<!--      <el-table-column label="涉及项目" align="center" prop="projectName" />-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsExpressController.java b/klp-wms/src/main/java/com/klp/controller/WmsExpressController.java
index ca4d5d93..6b41c19d 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsExpressController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsExpressController.java
@@ -33,7 +33,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/oa/express")
+@RequestMapping("/wms/express")
 public class WmsExpressController extends BaseController {
 
     private final IWmsExpressService iWmsExpressService;
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsExpressQuestionController.java b/klp-wms/src/main/java/com/klp/controller/WmsExpressQuestionController.java
index 739e69d1..9f602a47 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsExpressQuestionController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsExpressQuestionController.java
@@ -32,7 +32,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/oa/expressQuestion")
+@RequestMapping("/wms/expressQuestion")
 public class WmsExpressQuestionController extends BaseController {
 
     private final IWmsExpressQuestionService IWmsExpressQuestionService;
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsReportDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsReportDetailController.java
index ac4d1747..1fd02c4b 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsReportDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsReportDetailController.java
@@ -32,7 +32,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/reportDetail")
+@RequestMapping("/wms/reportDetail")
 public class WmsReportDetailController extends BaseController {
 
     private final IWmsReportDetailService IWmsReportDetailService;
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsReportSummaryController.java b/klp-wms/src/main/java/com/klp/controller/WmsReportSummaryController.java
index c07c1664..ceb1b1c7 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsReportSummaryController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsReportSummaryController.java
@@ -32,7 +32,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/reportSummary")
+@RequestMapping("/wms/reportSummary")
 public class WmsReportSummaryController extends BaseController {
 
     private final IWmsReportSummaryService IWmsReportSummaryService;
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsExpress.java b/klp-wms/src/main/java/com/klp/domain/WmsExpress.java
index deaaa57f..f4336a96 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsExpress.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsExpress.java
@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("oa_express")
+@TableName("wms_express")
 public class WmsExpress extends BaseEntity {
 
     private static final long serialVersionUID=1L;
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsExpressQuestion.java b/klp-wms/src/main/java/com/klp/domain/WmsExpressQuestion.java
index f4ae65a2..9983a54f 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsExpressQuestion.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsExpressQuestion.java
@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("oa_express_question")
+@TableName("wms_express_question")
 public class WmsExpressQuestion extends BaseEntity {
 
     private static final long serialVersionUID=1L;
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsReportDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsReportDetail.java
index dc5c0b8b..ec28acd5 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsReportDetail.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsReportDetail.java
@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("oa_report_detail")
+@TableName("wms_report_detail")
 public class WmsReportDetail extends BaseEntity {
 
     private static final long serialVersionUID=1L;
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsReportSummary.java b/klp-wms/src/main/java/com/klp/domain/WmsReportSummary.java
index ccffb4fe..d69345cf 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsReportSummary.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsReportSummary.java
@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("oa_report_summary")
+@TableName("wms_report_summary")
 public class WmsReportSummary extends BaseEntity {
 
     private static final long serialVersionUID=1L;
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsReportSummaryMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsReportSummaryMapper.xml
index c8b8fb57..e188e464 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsReportSummaryMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsReportSummaryMapper.xml
@@ -45,9 +45,6 @@
             <if test="bo.reporter != null and bo.reporter != ''">
                 AND s.reporter LIKE CONCAT('%', #{bo.reporter}, '%')
             </if>
-            <if test="bo.projectId != null">
-                AND s.project_id = #{bo.projectId}
-            </if>
             <if test="bo.type != null">
                 AND s.type = #{bo.type}
             </if>