耗材字典多个DI问题

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -1,5 +1,7 @@
 package com.glxp.api.controller.basic;
 
+import com.glxp.api.service.inout.IoOrderDetailCodeService;
+import com.glxp.api.util.IntUtil;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -64,7 +66,8 @@ public class UdiContrastController {
     ProductInfoService productInfoService;
     @Resource
     ThrDataService thrDataService;
-
+    @Resource
+    IoOrderDetailCodeService orderDetailCodeService;
 
     /**
      * 耗材字典添加
@@ -243,6 +246,13 @@ public class UdiContrastController {
                     }
             }
         }
+
+        //判断单据是否存在相关对照的产品组合
+        Boolean exitUuid = orderDetailCodeService.isExit(udiRelevanceEntity.getId(), udiRelevanceEntity.getUuid());
+        if (IntUtil.value(exitUuid)) {
+            return ResultVOUtils.error(500, "该产品已关联单据，无法解绑！");
+        }
+
         ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
         ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), thrSystemEntity.getThirdId());
         UdiProductEntity UdiInfoRequest = new UdiProductEntity();

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.impl.InvProductService;
@@ -239,7 +240,7 @@ public class UdiRelevanceController extends BaseController {
             for (UdiProductEntity udiProductEntity : udiInfoEntities) {
                 UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse();
                 BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse);
-                BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
+                BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
                 udiRelevanceResponses.add(udiRelevanceResponse);
             }
         }
@@ -409,17 +410,15 @@ public class UdiRelevanceController extends BaseController {
     //新增或修改关联
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/check/udi")
-
     public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) {
 
-        List<String> keys = udiCombineRequest.getKeys();
+        List<String> keys = udiCombineRequest.getDevKeys();
         if (keys != null && keys.size() > 0) {
-
             List<UdiRelevanceEntity> datas = udiRelevanceService.batchSelectByUuid(keys);
             if (datas.isEmpty()) {
                 return ResultVOUtils.success("无被选入！");
             } else {
-                return ResultVOUtils.error(499, "所选产品DI已经被" + "第三方产品ID" + "绑定，您确定继续对照");
+                return ResultVOUtils.error(499, "所选产品DI已存在耗材字典，继续对照将会出现不可预估错误，是否继续选入？");
             }
         }
         return ResultVOUtils.success("未选择产品");

src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java

@@ -45,6 +45,8 @@ public interface IoOrderDetailCodeService {
 
     boolean isExit(Long relId, String bacthNo, Long ignoreId, String orderId);
 
+    boolean isExit(Long relId, String uuid);
+
     /**
      * 扫码明细实体类数据转换VO类
      *

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -118,6 +118,12 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
                 .isNull(StrUtil.isEmpty(bacthNo), "batchNo").eq("orderIdFk", orderId).ne("id", ignoreId));
     }
 
+    @Override
+    public boolean isExit(Long relId, String uuid) {
+        return ioOrderDetailCodeDao.exists(new QueryWrapper<IoOrderDetailCodeEntity>().eq("bindRlFk", relId).eq("uuidFk", uuid));
+
+    }
+
     @Override
     public List<IoOrderDetailCodeResponse> getDetailCodeResponse(List<IoOrderDetailCodeEntity> orderEntityList) {
         if (CollUtil.isEmpty(orderEntityList)) {

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1399,7 +1399,7 @@
 
     <select id="batchSelectByUuid" resultType="com.glxp.api.entity.basic.UdiRelevanceEntity">
         select *
-        from basic_udirel where uuid in
+        from basic_products where basic_products.deviceRecordKey in
         <foreach collection="uuids" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>