|
|
@@ -1704,6 +1704,18 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String iResult = null;
|
|
|
String iErrCode = null;
|
|
|
String iSN=map.get("iSN").toString();
|
|
|
+ if(map.get("iResCode")!=null){
|
|
|
+ iResCode=map.get("iResCode").toString();
|
|
|
+ }
|
|
|
+ if(map.get("iOperater")!=null){
|
|
|
+ iOperator=map.get("iOperater").toString();
|
|
|
+ }
|
|
|
+ if(map.get("iResult")!=null){
|
|
|
+ iResult=map.get("iResult").toString();
|
|
|
+ }
|
|
|
+ if(map.get("iErrCode")!=null){
|
|
|
+ iErrCode=map.get("iErrCode").toString();
|
|
|
+ }
|
|
|
String iGetTsn=baseDao.getFieldDataByCondition("source left join step on SC_STEPCODE=st_code", "nvl(st_getsn,'0')", "sc_code='" + iResCode + "'").toString();
|
|
|
if (!iGetTsn.equals("0"))
|
|
|
{
|
|
|
@@ -1728,18 +1740,6 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(map.get("iResCode")!=null){
|
|
|
- iResCode=map.get("iResCode").toString();
|
|
|
- }
|
|
|
- if(map.get("iOperater")!=null){
|
|
|
- iOperator=map.get("iOperater").toString();
|
|
|
- }
|
|
|
- if(map.get("iResult")!=null){
|
|
|
- iResult=map.get("iResult").toString();
|
|
|
- }
|
|
|
- if(map.get("iErrCode")!=null){
|
|
|
- iErrCode=map.get("iErrCode").toString();
|
|
|
- }
|
|
|
JSONObject map3=new JSONObject();
|
|
|
map3.put("iSN",iSN);
|
|
|
Map<Object, Object> map2=GetRcardMOInfo(map3);
|