From 035c05c4f525eea7ddd0f0c257149faef070177f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 9 Jun 2023 14:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20admin=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=BA=E5=8F=AF=E9=9B=86=E9=87=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=20=E5=85=A5?=
 =?UTF-8?q?=E9=99=A2=E7=89=A9=E8=B5=84=E6=B2=A1=E5=90=8C=E6=AD=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/basic/UdiRelevanceController.java | 4 ++++
 .../com/glxp/api/controller/inout/IoCodeTempController.java   | 4 ++--
 src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java | 2 ++
 src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java    | 2 ++
 src/main/resources/mybatis/mapper/basic/UdiProductDao.xml     | 3 ---
 src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml       | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index bb6a4680..1dda25d5 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -662,6 +662,10 @@ public class UdiRelevanceController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiRelevanceEntity.setId(udiProductEntity.getUid());
+        udiRelevanceEntity.setGroupBuy(udiProductEntity.isGroupBuy());
+        boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         if (udiProductEntity.getRelSupId() != null) {
             UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
             udiRlSupEntity.setUpdateTime(new Date());
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 741c099a..fde9b530 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -690,11 +690,11 @@ public class IoCodeTempController extends BaseController {
                 }
 
                 if (bussinessTypeEntity.getVailGroupBuy() == 1 && !udiRelevanceResponse.isGroupBuy()) {       //只采集集采产品
-                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入集采产品！");
+                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入集采产品！");
                 }
 
                 if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
-                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
+                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入非集采产品！");
                 }
 
                 //计算实际数量
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
index 7eec6130..691db4b3 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
@@ -87,6 +87,8 @@ public class UdiProductEntity {
 
     private boolean groupBuy;
 
+    private Long uid;
+
 
     public Boolean getAllowNoBatch() {
         if (allowNoBatch == null)
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
index 8ddbfe9b..bdba6ef1 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
@@ -94,4 +94,6 @@ public class UdiRlSupResponse {
     private String classifyName;
 
     private boolean groupBuy;           //是否集采产品
+
+    private Long uid;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 73e708ff..60801132 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -793,9 +793,6 @@
             <if test="updateTime != null">
                 updateTime=#{updateTime},
             </if>
-            <if test="groupBuy != null">
-                groupBuy=#{groupBuy},
-            </if>
         </trim>
         where id = #{id}
     </update>
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 723ed079..2cbd3b73 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -105,7 +105,8 @@
                basic_products.basicPrductRemak6,
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
---                basic_products.groupBuy,
+               basic_udirel.groupBuy,
+               basic_udirel.id as uid,
                basic_corp.name      companyName
         FROM company_product_relevance
                  inner JOIN basic_udirel