From 6dc4bcf6d9c974dacec8f183c3bac4c3c2b41f71 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 12 Apr 2024 14:33:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=8A=A0=E4=B8=8A=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=BF=87=E6=BB=A4=E7=89=A9=E8=B5=84=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/UdiRlSupController.java | 11 +++++++++++
 .../api/req/basic/CompanyProductRelevanceRequest.java |  1 +
 .../resources/mybatis/mapper/basic/UdiRlSupDao.xml    |  3 +++
 3 files changed, 15 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 f0730ce7..a6adef0c 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
@@ -31,6 +31,7 @@ import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.auth.CustomerInfoService;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.system.CompanyService;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.SupplementVailUtil;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.beans.BeanUtils;
@@ -77,6 +78,8 @@ public class UdiRlSupController extends BaseController {
     SpsSyncWebSocket webSocketServer;
     @Resource
     private CustomerInfoService customerInfoService;
+    @Resource
+    private IBasicBussinessTypeService basicBussinessTypeService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/sale/info/company/product/relevance/filter")
@@ -120,6 +123,14 @@ public class UdiRlSupController extends BaseController {
             //只查找主标识产品信息
             companyProductRelevanceRequest.setDiType(1);
         }
+        //包装采购类型校验
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getAction())){
+            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(companyProductRelevanceRequest.getAction());
+            //是否校验产品采购类型 ：1：校验；2.无需校验
+            if(IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1){
+                companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType()));
+            }
+        }
         List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
         basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
         PageInfo<UdiRlSupResponse> pageInfo;
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 55371b99..e9867152 100644
--- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
@@ -79,6 +79,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private String basicPrductRemak7;
     private String basicPrductRemak8;
     private String category;
+    private String action;
 
     //供应商是否禁用查询条件
     private Integer userFlag;
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 02fc846d..b0a5d58d 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -140,6 +140,9 @@
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
+            <if test="purType != '' and purType != null">
+                AND basic_udirel.purType = #{purType}
+            </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
                         nameCode LIKE concat('%', #{unionCode}, '%')