测试仪限制领用

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -1322,10 +1322,18 @@ public class MESHelperServiceImpl implements MESHelperService {
 					paramsMap.put("su_usedate",InspectTime);
 					if(usestatus == "在库"){
 						paramsMap.put("su_status","领用");
-						baseDao.updateByCondition("stencil", "st_usestatus = '出库'", "st_code='" + MeshCode + "'");
+						if(jsonObj.optString("InspectResult", "").contains("NG")){
+							rmap.put("Result", "NG");
+							rmap.put("Meassage", stKind+"状态: " + jsonObj.optString("InspectResult", "") + "不可领用");
+							return rmap;
+						}
+						if(jsonObj.optString("TestResult", "").contains("NG")){
+							rmap.put("Result", "NG");
+							rmap.put("Meassage", stKind+"状态: " + jsonObj.optString("TestResult", "") + "不可领用");
+							return rmap;
+						}
 					}else if(usestatus == "出库"){
 						paramsMap.put("su_status","归还");
-						baseDao.updateByCondition("stencil", "st_usestatus = '在库'", "st_code='" + MeshCode + "'");
 					}
 
 					paramsMap1.put("std_class",InspectMode);
@@ -1378,6 +1386,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 						paramsMap.put("su_cleannums",cleannums);
 						baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"stenciluse"));
 					}
+					if(usestatus == "在库"){
+						baseDao.updateByCondition("stencil", "st_usestatus = '出库'", "st_code='" + MeshCode + "'");
+					}else if(usestatus == "出库"){
+						baseDao.updateByCondition("stencil", "st_usestatus = '在库'", "st_code='" + MeshCode + "'");
+					}
 					baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap1,"steptestdetail"));
 					rmap.put("Result","OK");
 					rmap.put("Meassage",InspectMode +": 记录成功");