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 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 @@ AND pid = #{pid} + + AND thrInv.status = #{status} + AND code = #{code}