镭雕接口修改

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

@@ -88,42 +88,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 		for (Map.Entry<Object, Object> entry : map1.entrySet()) {
 			Object key = entry.getKey();
 			Object value = entry.getValue();
-			SqlRowList rs=baseDao.queryForRowSet("select 1 from makesnlist where msl_sncode='"+value.toString().toUpperCase()+"'" +
-					" and msl_makecode='"+MO+"' and msl_Radium=-1");
+			SqlRowList rs=baseDao.queryForRowSet("select 1 from MAKESNLIST_RADIUM where msl_sncode='"+value.toString().toUpperCase()+"'" +
+					" and msl_makecode='"+MO+"' and nvl(msl_Radium,0)=-1");
 			if(rs.next()){
 				oErrMessage+="序列号"+value.toString().toUpperCase()+"已镭雕,";
-
 			}else {
-				baseDao.execute("update makesnlist set msl_Radium=-1 where msl_sncode='"+value.toString().toUpperCase()+"' and " +
+				baseDao.execute("update MAKESNLIST_RADIUM set msl_Radium=-1 where msl_sncode='"+value.toString().toUpperCase()+"' and " +
 						"msl_makecode='"+MO+"'");
 			}
-			//启用过站
-			if(baseDao.getFieldDataByCondition("configs","data","caller='MESSetting' and code='Radium'").toString().equals("1")){
-				oErrMessage+=GoMo(value.toString().toUpperCase(),MO, specificationName);
-				if(oErrMessage.equals("null")){
-					oErrMessage="";
-				}else{
-					rmap.put("code",-1);
-					rmap.put("message",oErrMessage);
-					return rmap;
-				}
-				oErrMessage+=CheckRoutePassed(value.toString().toUpperCase(),specificationName);
-				if(oErrMessage.equals("null")){
-					oErrMessage="";
-				}else{
-					rmap.put("code",-1);
-					rmap.put("message",oErrMessage);
-					return rmap;
-				}
-				oErrMessage+=SetPcbaData(value.toString().toUpperCase(),specificationName,UserName,"OK");
-				if(oErrMessage.equals("null")){
-					oErrMessage="";
-				}else{
-					rmap.put("code",-1);
-					rmap.put("message",oErrMessage);
-					return rmap;
-				}
-			}
 		}
 		if(oErrMessage.equals("")||oErrMessage==null){
 			rmap.put("code",0);
@@ -137,6 +109,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	}
 
 
+
 	@Override
 	public Map<Object,Object> SPI(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
@@ -1723,6 +1696,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return AE_MASTER.toString();
 	}
 
+	@Override
 	@Override
 	public Map<Object,Object> getMESSnCode(String data) {
 		Map<String, Object> map=null;
@@ -1736,6 +1710,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		String macode = map.get("moid") == null ? "" : String.valueOf(map.get("moid"));
+		String machineid = map.get("machineld") == null ? "" : String.valueOf(map.get("machineld"));
 		if("".equals(macode)){
 			rmap.put("code",-1);
 			rmap.put("message","工单不能为空");
@@ -1746,23 +1721,13 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("message","工单不存在");
 			return rmap;
 		}
-		if (baseDao.checkIf("make","nvl(ma_statuscode,' ')<>'STARTED' and ma_code='"+macode+"'")){
-			rmap.put("code",-1);
-			rmap.put("message","工单不是已下放状态");
-			return rmap;
-		}
-		if (!baseDao.checkIf("MakeSnList","msl_makecode='"+macode+"'")){
-			rmap.put("code",-1);
-			rmap.put("message","工单未维护SN");
-			return rmap;
-		}
 		double sncount = map.get("count") == null ? 0 : Double.parseDouble(map.get("count").toString());
 		if(sncount<=0){
 			rmap.put("code",-1);
 			rmap.put("message","SN数量必须大于0");
 			return rmap;
 		}
-		int count = baseDao.getCountByCondition("MakeSnList", "msl_makecode='" + macode + "' and nvl(msl_status,0)=0");
+		int count = baseDao.getCountByCondition("MAKESNLIST_RADIUM", "nvl(msl_status,0)=0 and MSL_INDATE>trunc(sysdate)");
 		if (count<sncount){
 			rmap.put("code",-1);
 			rmap.put("message","SN不足！");
@@ -1771,7 +1736,7 @@ 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_sncode) where rownum<="+sncount +"  order by msl_sncode ");
+		SqlRowList rs = baseDao.queryForRowSet("select msl_sncode,msl_id from (select msl_sncode,msl_id from MAKESNLIST_RADIUM where  nvl(msl_status,0)=0 order by msl_sncode) where rownum<="+sncount +"  order by msl_sncode ");
 		String mainbarcode="";
 		String msl_id="";
 		while (rs.next()){
@@ -1779,11 +1744,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 			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"));
+			sqls.add("update MAKESNLIST_RADIUM set msl_makecode='"+macode+"',msl_signtime=sysdate,msl_status=-1,msl_machine='"+machineid+"' 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+")");
+		baseDao.execute("update MAKESNLIST_RADIUM set msl_mainbarcode='"+mainbarcode+"' where msl_id in ("+msl_id+")");
 
 		if (sqls!=null&&sqls.size()>0){
 			baseDao.execute(sqls);
@@ -1793,4 +1758,5 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+
 }