过站接口添加不良备注

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

@@ -1822,6 +1822,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iOperator = null;
 		String iResult = null;
 		String iErrCode = null;
+		String iBadRemark = null;
 		if(map.get("iResCode")!=null){
 			iResCode=map.get("iResCode").toString();
 		}
@@ -1834,6 +1835,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iErrCode")!=null){
 			iErrCode=map.get("iErrCode").toString();
 		}
+		if(map.get("iBadRemark")!=null){
+			iBadRemark=map.get("iBadRemark").toString();
+		}
 
 		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
@@ -1843,7 +1847,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			oMoCode=map2.get("oMoCode").toString();
 		}
 		if (map2.get("oErrMessage")==null)
-			return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
+			return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode, iBadRemark);
 		return rmap;
 	}
 
@@ -1863,7 +1867,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			oMoCode=map2.get("oMoCode").toString();
 		}
 		if (map2.get("oErrMessage")==null)
-			map2= SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iResCode, iErrCode);
+			map2= SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iResCode, iErrCode, "");
 		return map2.get("oErrMessage");
 	}
 
@@ -1930,7 +1934,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode)
+	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode, String iBadRemark)
 	{
 		String oErrMessage = null;
 		Object StepCode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
@@ -1958,6 +1962,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 						uniqueStrings.add(str);
 					}
 					BadCode = uniqueStrings.toArray(new String[0]);
+
+					String[] BadRemark = iBadRemark.split(",");
+					Set<String> badRemarkSet = new HashSet<>();
+					for (String txt : BadRemark) {
+						badRemarkSet.add(txt);
+					}
+					BadRemark = badRemarkSet.toArray(new String[0]);
+
 					if (!mscode.equals(iSN))
 					{
 						List<String> sqls = new ArrayList<>();
@@ -1991,9 +2003,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 						BgCode = baseDao.getFieldDataByCondition("badcode","bc_groupcode","bc_code = '"+BadCode[i].split(";")[0]+"'").toString();
 						sql.setLength(0);
 						sql.append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
-						sql.append(",mb_sourcecode,mb_badremark,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select '" + mb_id + "'");
+						sql.append(",mb_sourcecode,mb_badremark,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status,MB_BADREMARK) select '" + mb_id + "'");
 						sql.append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "','"+badlocation+"','" + BadCode[i].split(";")[0] + "','',");
-						sql.append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+						sql.append("'" + BgCode + "',sp_soncode,'0','"+ BadRemark[i].toString() +"' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
 						sql.append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 						baseDao.execute(sql.toString());
 					}
@@ -2527,7 +2539,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		baseDao.execute(" update BEFOREHANDPROCESS set bhp_status = -1 where bhp_maincode = '"+iZJ+"' and nvl(bhp_status,0) =0   ");
 
 
-		return SetStepFinish(oMoCode, iResCode, iSN, "", "OK", "ADMIN", "");
+		return SetStepFinish(oMoCode, iResCode, iSN, "", "OK", "ADMIN", "", "");
 	}