优化

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

@@ -647,8 +647,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 				if(fRs.next()){
 					fScraper = fRs.getString("su_status");
 				}
+				if(!fScraper.contains("领用")){
+					code = 222;
+					returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"上次状态"+fScraper+",未领用,校验失败.\n";
+				}
 
-				if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+FrontSqueegeeSN+"'") || !fScraper.contains("领用")){
+				if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+FrontSqueegeeSN+"'")){
 					code = 222;
 					returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"未领用出库,校验失败.\n";
 				}
@@ -660,8 +664,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 				if(rRs.next()){
 					rScraper = rRs.getString("su_status");
 				}
+				if(!rScraper.contains("领用")){
+					code = 222;
+					returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"上次状态"+rScraper+",未领用,校验失败.\n";
+				}
 
-				if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+RearSqueegeeSN+"'") || !rScraper.contains("领用")){
+				if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+RearSqueegeeSN+"'") ){
 					code = 222;
 					returnmessage = returnmessage + "刮刀:"+RearSqueegeeSN+"未领用出库,校验失败.\n";
 				}
@@ -673,8 +681,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 				if(sRs.next()){
 					stencil = sRs.getString("su_status");
 				}
+				if(!stencil.contains("领用")){
+					code = 222;
+					returnmessage = returnmessage + "钢网:"+FrontSqueegeeSN+"上次状态"+stencil+",未领用,校验失败.\n";
+				}
 
-				if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+StencilSN+"'") || !stencil.contains("领用")){
+				if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+StencilSN+"'")){
 					code = 222;
 					returnmessage = returnmessage + "钢网:"+StencilSN+"未清洗出库,校验失败.\n";
 				}