fix:厂家质保书确认条件修改

mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/FactorywarrantymstServiceImpl.java

@@ -371,7 +371,11 @@ public class FactorywarrantymstServiceImpl implements FactorywarrantymstService
             JSONObject jsonObject = itemArr.getJSONObject(i);
             String inspection_item_id = jsonObject.getString("inspection_item_id");
             JSONObject JsonValue =factDtlTab.query("inspection_item_id = '" + inspection_item_id + "' and inspection_id = '" + whereJson.getString("inspection_id") + "'").uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(JsonValue))  num = num + 1;
+            if (ObjectUtil.isNotEmpty(JsonValue)) {
+                num = num + 1;
+            }else {
+                throw new BadRequestException("产品检验方案标准表项点:"+inspection_item_id+"没有对应厂家质保书明细");
+            }
         }
         if (itemArr.size() != num) throw new BadRequestException("所有项点必须有值");
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_FACTORYWARRANTY001.wql

@@ -120,6 +120,7 @@
                 dtl.material_uuid = 输入.material_id
                 AND point.inspection_item_type = '01'
                 AND dtl.up_limit <> ""
+                AND dtl.is_delete = '0'
 
 			ENDSELECT
 		ENDQUERY

mes/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -72,11 +72,11 @@ spring:
     #数据库索引
     database: 2
     # Redis服务器地址
-    host: 47.96.133.178
+    host: 127.0.0.1
     # Redis服务器连接端口
-    port: 6479
-    # Redis服务器连接密码（默认为空）
-    password: 942464Yy
+    port: 6379
+#    # Redis服务器连接密码（默认为空）
+#    password: 942464Yy
     redisson:
       config: |
         threads: 4