优化

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

@@ -616,17 +616,17 @@ public class MESHelperServiceImpl implements MESHelperService {
 			}
 			int code = 200;
 			String returnmessage = "";
-			if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+FrontSqueegeeSN+"'"))
+			if(FrontSqueegeeSN != null && !baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+FrontSqueegeeSN+"'"))
 			{
 				code = 222;
 				returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"未领用出库,校验失败.\n";
 			}
-			if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+RearSqueegeeSN+"'"))
+			if(RearSqueegeeSN != null && !baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+RearSqueegeeSN+"'"))
 			{
 				code = 222;
 				returnmessage = returnmessage + "刮刀:"+RearSqueegeeSN+"未领用出库,校验失败.\n";
 			}
-			if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+StencilSN+"'"))
+			if(StencilSN != null && !baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+StencilSN+"'"))
 			{
 				code = 222;
 				returnmessage = returnmessage + "钢网:"+StencilSN+"未清洗出库,校验失败.\n";
@@ -637,8 +637,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				returnmessage = returnmessage + "锡膏:"+PasteSN+"未领用,校验失败.\n";
 			}*/
 
+			String stWo = "",stLine = "",partNo = "";
 			if(returnmessage == null || returnmessage.isEmpty()){
-				String stWo = "",stLine = "",partNo = "";
 				SqlRowList rs=baseDao.queryForRowSet("SELECT st_id,st_line,st_macode,st_useofproduct FROM stencil WHERE st_kind = '钢网' AND st_code = ?", StencilSN);
 				if(rs.next()){
 					stWo = rs.getString("st_macode");
@@ -672,7 +672,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 //					baseDao.updateByCondition("stencil", "st_line = '"+stLine+"',ST_MACODE='"+stWo+"'", "st_code='" + StencilSN + "'");
 				}
-
+			}
+			if(PasteSN != null){
 				baseDao.updateByCondition("spmbarcode", "spb_status = '上线',spb_update_time = sysdate,spb_use_count = spb_use_count,SPB_LINECODE = '"+Line+"'", "spb_barcode='" + PasteSN + "'");
 				SqlRowList rs3 = baseDao.queryForRowSet("SELECT spmlog_seq.NEXTVAL seq FROM dual");
 				Map<Object, Object> paramsMap = new HashMap<Object, Object>();