From b2662c1d3308fb80d5d7bdaeaca49018e9fc257f Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 5 May 2022 17:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/UdiRelevanceController.java     | 12 ++++++++++--
 .../api/admin/req/inout/WarehouseQueryRequest.java   |  3 +++
 .../main/resources/mybatis/mapper/inout/CodesDao.xml |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
index 44a98205..f3466926 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
@@ -1,5 +1,6 @@
 package com.glxp.api.admin.controller.basic;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -16,6 +17,7 @@ import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.UdiDlHttpClient;
 import com.glxp.api.admin.req.basic.*;
 import com.glxp.api.admin.req.inout.DeleteRequest;
+import com.glxp.api.admin.req.inout.WarehouseQueryRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
@@ -253,6 +255,14 @@ public class UdiRelevanceController {
                         }
                     }
                 }
+                WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+                warehouseQueryRequest.setRelId(ids);
+                if (StrUtil.isNotEmpty(ids)) {
+                    List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
+                    if (CollUtil.isNotEmpty(warehouseEntityList)) {
+                        return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
+                    }
+                }
             }
         }
 
@@ -306,8 +316,6 @@ public class UdiRelevanceController {
     }
 
 
-
-
     //选入查询结果的所有DI
     @AuthRuleAnnotation("")
     @GetMapping("/udi/udirel/combineAll")
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java
index becdc367..920a6ca0 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java
@@ -14,4 +14,7 @@ public class WarehouseQueryRequest extends ListPageRequest {
     private String nameCode;
     private String supId;
     private String locStorageCode;
+
+
+    private String relId;
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
index 990cfc7e..86097509 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
@@ -30,6 +30,10 @@
             <if test="orderId != '' and orderId!=null">
                 and orderId =#{orderId}
             </if>
+            <if test="relId != '' and relId!=null">
+                and relId =#{relId}
+            </if>
+
         </where>
         ORDER BY actDate
     </select>