From e27d187b7a99776e5aab75b53043a8b88e9bfceb Mon Sep 17 00:00:00 2001
From: wenshijun <piratecaptain37@aliyun.com>
Date: Thu, 5 Jun 2025 09:05:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=AD=97=E6=AE=B5=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=A5=EF=BC=8C=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppRkInfoController.java   |  1 +
 .../com/zg/project/wisdom/domain/RkInfo.java  | 11 +++++++++++
 .../wisdom/domain/dto/PcRkInfoItemDTO.java    | 11 +++++++++++
 .../service/impl/RkInfoServiceImpl.java       |  2 +-
 .../resources/mybatis/wisdom/RkInfoMapper.xml | 19 ++++++++++++++++++-
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zg/project/wisdom/controller/app/AppRkInfoController.java b/src/main/java/com/zg/project/wisdom/controller/app/AppRkInfoController.java
index 426f60b..ab1b5b6 100644
--- a/src/main/java/com/zg/project/wisdom/controller/app/AppRkInfoController.java
+++ b/src/main/java/com/zg/project/wisdom/controller/app/AppRkInfoController.java
@@ -25,6 +25,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/wisdom/stock")
 public class AppRkInfoController extends BaseController {
+
     @Autowired
     private IRkInfoService rkInfoService;
 
diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
index 3d640d2..b154c28 100644
--- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
+++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
@@ -18,6 +18,9 @@ public class RkInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 模糊搜索关键字（项目号、项目描述、物料号、物料描述、供应商编码、供应商名称，订单编号） */
+    private String keyword;
+
     /** 主键ID */
     private Long id;
 
@@ -137,6 +140,14 @@ public class RkInfo extends BaseEntity
     @Excel(name = "是否删除", readConverterExp = "0=,表=示正常，1,表=示已删除")
     private String isDelete;
 
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
     public void setId(Long id) 
     {
         this.id = id;
diff --git a/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoItemDTO.java b/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoItemDTO.java
index 18f5f4b..62ef227 100644
--- a/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoItemDTO.java
+++ b/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoItemDTO.java
@@ -16,6 +16,9 @@ public class PcRkInfoItemDTO {
     /** 本地物料号 */
     private String wlNo;
 
+    /** 本地物料描述 */
+    private String wlMs;
+
     /** 项目描述 */
     private String xmMs;
 
@@ -96,6 +99,14 @@ public class PcRkInfoItemDTO {
         this.wlNo = wlNo;
     }
 
+    public String getWlMs() {
+        return wlMs;
+    }
+
+    public void setWlMs(String wlMs) {
+        this.wlMs = wlMs;
+    }
+
     public String getXmMs() {
         return xmMs;
     }
diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
index a35e09c..259d339 100644
--- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
+++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
@@ -133,7 +133,7 @@ public class RkInfoServiceImpl implements IRkInfoService
             entity.setHtDj(item.getHtDj());
             entity.setDw(item.getDw());
             entity.setWlNo(item.getWlNo());
-//            entity.setWlMs(item.getWlMs());
+            entity.setWlMs(item.getWlMs());
             entity.setGysNo(item.getGysNo());
             entity.setGysMc(item.getGysMc());
 
diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
index 84785f7..a19b84f 100644
--- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
+++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
@@ -82,12 +82,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRkInfoList" parameterType="RkInfo" resultMap="RkInfoResult">
         <include refid="selectRkInfoVo"/>
         <where>
+
+            and is_chuku = 0
+
+            <if test="keyword != null and keyword != ''">
+                and (
+                xm_no like concat('%', #{keyword}, '%')
+                or xm_ms like concat('%', #{keyword}, '%')
+                or wl_no like concat('%', #{keyword}, '%')
+                or wl_ms like concat('%', #{keyword}, '%')
+                or gys_no like concat('%', #{keyword}, '%')
+                or gys_mc like concat('%', #{keyword}, '%')
+                or sap_no like concat('%', #{keyword}, '%')
+                )
+            </if>
+
             <if test="rkType != null  and rkType != ''"> and rk_type = #{rkType}</if>
             <if test="wlType != null  and wlType != ''"> and wl_type = #{wlType}</if>
             <if test="cangku != null  and cangku != ''"> and cangku = #{cangku}</if>
             <if test="rkTime != null "> and rk_time = #{rkTime}</if>
             <if test="lihuoY != null  and lihuoY != ''"> and lihuo_y = #{lihuoY}</if>
-            <if test="isChuku != null  and isChuku != ''"> and is_chuku = #{isChuku}</if>
+            <!-- ✅ 删除这个条件，否则会与强制条件冲突 -->
+            <!-- <if test="isChuku != null  and isChuku != ''"> and is_chuku = #{isChuku}</if> -->
+
             <if test="xj != null  and xj != ''"> and xj = #{xj}</if>
             <if test="xmNo != null  and xmNo != ''"> and xm_no = #{xmNo}</if>
             <if test="xmMs != null  and xmMs != ''"> and xm_ms = #{xmMs}</if>