修改关联第三方仓库和单据提交bug

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);

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;

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>