切换分支备份,选择库存自定义界面

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;
 
 }

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;
 }

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:

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>