From 8f054d1410110467a93d39a1c31f35419dc59aff Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 2 Jul 2024 17:20:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200702-=E6=89=AB=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/basic/UdiRlSupController.java  | 6 ++++++
 .../glxp/api/req/basic/CompanyProductRelevanceRequest.java | 7 +++++++
 src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml    | 3 +++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
index 19670ca84..5e262be5c 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
@@ -113,6 +113,12 @@ public class UdiRlSupController extends BaseController {
             if(IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1){
                 companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType()));
             }
+            //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
+            if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) {
+                companyProductRelevanceRequest.setCodeCheck(1);
+            }else if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 2) {
+                companyProductRelevanceRequest.setCodeCheck(2);
+            }
         }
         List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
         basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
index e884f5200..d1684b3f1 100644
--- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
@@ -80,4 +81,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private String action;
 
     private List<String> ids;
+
+    /**
+     * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
+     */
+    @TableField(value = "codeCheck")
+    private Integer codeCheck;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index f09e0e59d..00e31e15a 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -137,6 +137,9 @@
             <if test="purType != '' and purType != null">
                 AND basic_udirel.purType = #{purType}
             </if>
+            <if test="codeCheck != '' and codeCheck != null">
+                AND basic_products.requireScanCode = #{codeCheck}
+            </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
                         nameCode LIKE concat('%', #{unionCode}, '%')