From 7246bd6f18f6661ffba7bde0a08b5ce1ca177cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Sun, 8 Jan 2023 17:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E8=81=94=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E4=BB=93=E5=BA=93=E5=92=8C=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/controller/thrsys/ThrProductsController.java     | 2 +-
 .../api/admin/req/thrsys/FilterThrInvWarehouseRequest.java     | 1 +
 .../resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml     | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java
index 04e55902..d2a9ddb6 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java
@@ -130,7 +130,7 @@ public class ThrProductsController {
             }
             List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
             if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
-                return "该产品已与UDI码关联，无法删除！";
+                return "改产品已被选入耗材字典请先移除！";
             }
         }
         boolean b = thrProductsService.deleteById(id);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java
index 143370ac..fe88d8c3 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java
@@ -11,6 +11,7 @@ public class FilterThrInvWarehouseRequest extends ListPageRequest {
     private Integer id;
     private Integer pid;
     private String code;
+    private Integer status;
     private String name;
     private Boolean advanceType;
     private Boolean isDefault;
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
index b1dfb194..ae715bb8 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
@@ -15,6 +15,9 @@
             <if test="pid != '' and pid != null">
                 AND pid = #{pid}
             </if>
+            <if test="status != null">
+                AND thrInv.status = #{status}
+            </if>
             <if test="code != '' and code != null">
                 AND code = #{code}
             </if>