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 @@
updateTime=#{updateTime},
-
- groupBuy=#{groupBuy},
-
where id = #{id}
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