添加人工过站备注

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

@@ -1800,6 +1800,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iOperator = null;
 		String iResult = null;
 		String iErrCode = null;
+		String iMPKind = null;
 		if(map.get("iResCode")!=null){
 			iResCode=map.get("iResCode").toString();
 		}
@@ -1809,6 +1810,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iResult")!=null){
 			iResult=map.get("iResult").toString();
 		}
+		if(map.get("iMPKind")!=null){
+			iMPKind=map.get("iMPKind").toString();
+		}
 		if(map.get("iErrCode")!=null){
 			iErrCode=map.get("iErrCode").toString();
 		}
@@ -1821,7 +1825,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, iMPKind, iResult, iOperator, iErrCode);
 		return rmap;
 	}
 
@@ -1996,7 +2000,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				if (ms_status.equals("3"))
 				{
 					String nextstepcode =baseDao.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").toString();
-					baseDao.updateByCondition("makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+					baseDao.updateByCondition("makeserial", "ms_remark='"+iMPKind+"',ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 					baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "'");
 				}
 			}