分配镭雕SN修改

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

@@ -88,7 +88,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 		for (Map.Entry<Object, Object> entry : map1.entrySet()) {
 			Object key = entry.getKey();
 			Object value = entry.getValue();
-			oErrMessage+=GoMo(value.toString().toUpperCase(),MO, specificationName);
+			SqlRowList rs=baseDao.queryForRowSet("select 1 from makesnlist where msl_sncode='"+value.toString().toUpperCase()+"'" +
+					" and msl_makecode='"+MO+"' and msl_Radium=-1");
+			if(rs.next()){
+				oErrMessage+="序列号"+value.toString().toUpperCase()+"已镭雕,";
+
+			}else {
+				baseDao.execute("update makesnlist set msl_Radium=-1 where msl_sncode='"+value.toString().toUpperCase()+"' and " +
+						"msl_makecode='"+MO+"'");
+			}
+		/*	oErrMessage+=GoMo(value.toString().toUpperCase(),MO, specificationName);
 			if(oErrMessage.equals("null")){
 				oErrMessage="";
 			}else{
@@ -111,14 +120,17 @@ public class MESHelperServiceImpl implements MESHelperService {
 				rmap.put("code",-1);
 				rmap.put("message",oErrMessage);
 				return rmap;
-			}
+			}*/
 		}
 		if(oErrMessage.equals("")||oErrMessage==null){
 			rmap.put("code",0);
 			rmap.put("message","镭射识别绑定成功");
 			return rmap;
+		}else{
+			rmap.put("code",-1);
+			rmap.put("message",oErrMessage);
+			return rmap;
 		}
-		return rmap;
 	}
 
 
@@ -1666,14 +1678,20 @@ public class MESHelperServiceImpl implements MESHelperService {
 		List<String> sqls = new ArrayList<>();
 		List<Map<String, Object>> maps = new ArrayList<>();
 		Map<String, Object> snmap=null;
-		SqlRowList rs = baseDao.queryForRowSet("select msl_sncode,msl_id from (select msl_sncode,msl_id from MakeSnList where msl_makecode='" + macode + "' and nvl(msl_status,0)=0 order by msl_id) where rownum<="+sncount);
-
+		SqlRowList rs = baseDao.queryForRowSet("select msl_sncode,msl_id from (select msl_sncode,msl_id from MakeSnList where msl_makecode='" + macode + "' and nvl(msl_status,0)=0 order by msl_sncode) where rownum<="+sncount +"  order by msl_sncode ");
+		String mainbarcode="";
+		String msl_id="";
 		while (rs.next()){
 			snmap=new HashMap<String, Object>();
 			snmap.put("serialNo",rs.getGeneralString("msl_sncode"));
+			mainbarcode=rs.getGeneralString("msl_sncode");
 			maps.add(snmap);
 			sqls.add("update MakeSnList set msl_signtime=sysdate,msl_status=-1 where msl_id="+rs.getGeneralInt("msl_id"));
+			msl_id+=rs.getGeneralInt("msl_id")+",";
 		}
+		msl_id+="0";
+		baseDao.execute("update MakeSnList set msl_mainbarcode='"+mainbarcode+"' where msl_id in ("+msl_id+")");
+
 		if (sqls!=null&&sqls.size()>0){
 			baseDao.execute(sqls);
 		}