无条码处理

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

@@ -413,13 +413,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 				Time = Time.substring(0, 19).replaceAll("T", " ");
 			}
 
-			if(Lotsn == null || Lotsn.isEmpty()){
-				rmap.put("code","0");
-				rmap.put("result","OK");
-				rmap.put("ServerMessage","OK,空序列号Mes跳过处理");
-				return rmap;
-			}
-
 			String isStop = Objects.toString(baseDao.getFieldDataByCondition("configs","data","caller='MESSetting' and code='stopLine'"),"0");
 			if(isStop.equals("1")){
 				String StatusRemark = Objects.toString(baseDao.getFieldDataByCondition("linestatus","lis_remark","lis_code='"+LineNO+"' and lis_start = 0 and lis_type is not null"),"");
@@ -438,6 +431,13 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}
 			}
 
+			if(Lotsn == null || Lotsn.isEmpty()){
+				rmap.put("code","0");
+				rmap.put("result","OK");
+				rmap.put("ServerMessage","OK,空序列号Mes跳过处理");
+				return rmap;
+			}
+
 			String seq = String.valueOf(baseDao.getFieldDataByCondition("dual","devicetestinfo_seq.NEXTVAL seq","1=1"));
 			Map<Object, Object> paramsMap = new HashMap<Object, Object>();
 			paramsMap.put("DTI_ID",seq);