From ed3b4546319a07ae810f8ac068b4d52d4e333e13 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 30 Jul 2024 17:42:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD,=E9=80=89=E6=8B=A9=E5=BA=93=E5=AD=98=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/req/inv/FilterInvProductRequest.java |  7 +++++++
 .../com/glxp/api/res/inv/InvProductResponse.java  |  8 ++++++++
 src/main/resources/application-dev.yml            |  2 +-
 .../mybatis/mapper/inv/invProductDao.xml          | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
index 899613b5e..178127b17 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
@@ -135,5 +135,12 @@ public class FilterInvProductRequest extends ListPageRequest {
 
     private Integer highValue;
 
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
 
 }
diff --git a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java
index 345810518..a1371e106 100644
--- a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java
@@ -137,4 +137,12 @@ public class InvProductResponse {
      * 第三方产品编码
      */
     private String thrCode;
+
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a2ecc2dc9..087dbec16 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 9f22881ea..66624a709 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -28,6 +28,14 @@
                ip.deptCode,
                ip.invCode,
                as.name             spaceName,
+               bp.basicPrductRemak1,
+               bp.basicPrductRemak2,
+               bp.basicPrductRemak3,
+               bp.basicPrductRemak4,
+               bp.basicPrductRemak5,
+               bp.basicPrductRemak6,
+               bp.basicPrductRemak7,
+               bp.basicPrductRemak8,
                ip.price
         from inv_product ip
                      inner join basic_udirel on ip.relIdFk = basic_udirel.id
@@ -64,6 +72,12 @@
             <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
                 AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
             </if>
+            <if test="basicPrductRemak1 != null and basicPrductRemak1 != ''">
+                AND bp.basicPrductRemak1 like concat('%', #{basicPrductRemak1}, '%')
+            </if>
+            <if test="basicPrductRemak2 != null and basicPrductRemak2 != ''">
+                AND bp.basicPrductRemak2 like concat('%', #{basicPrductRemak2}, '%')
+            </if>
             <if test="customerId != null and customerId != ''">
                 AND ip.customerId = #{customerId}
             </if>
@@ -76,6 +90,7 @@
             <if test="invCode != null and invCode != ''">
                 AND ip.invCode = #{invCode}
             </if>
+
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND invSpaceCode = #{invSpaceCode}
             </if>