From 9a573b35afefa21888c90a1ae3b262639f5928c6 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 2 Jul 2024 17:21:08 +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  | 6 +++++-
 src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml     | 3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

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 81239057..4eeaafba 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
@@ -133,6 +133,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 6ac8ef3c..4b7ba045 100644
--- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
@@ -92,5 +92,9 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
      */
     private Integer vailHcType;
 
-
+    /**
+     * 是否开启校验扫码 ：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 e2d67424..fa39a71d 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -148,6 +148,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}, '%')