|
|
@@ -733,8 +733,8 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if(map.get("iResCode")!=null){
|
|
|
iResCode=map.get("iResCode").toString();
|
|
|
}
|
|
|
- if(map.get("iOperator")!=null){
|
|
|
- iOperator=map.get("iOperator").toString();
|
|
|
+ if(map.get("iOperater")!=null){
|
|
|
+ iOperator=map.get("iOperater").toString();
|
|
|
}
|
|
|
if(map.get("iResult")!=null){
|
|
|
iResult=map.get("iResult").toString();
|
|
|
@@ -782,7 +782,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)
|
|
|
{
|
|
|
String oErrMessage = null;
|
|
|
- String StepCode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'").toString();
|
|
|
+ Object StepCode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
|
|
|
String CurrentStep = GetStepCodeBySource(iSourceCode);
|
|
|
Object BgCode = baseDao.getFieldDataByCondition("step", "st_badgroupcode", "st_code='" + CurrentStep + "'");
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
|
@@ -823,7 +823,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
//不良采集为良品是更新
|
|
|
- if (StepCode == CurrentStep && iResult == "OK")
|
|
|
+ if (StepCode!=null &&StepCode.toString().equals(CurrentStep) && iResult == "OK")
|
|
|
{
|
|
|
Object[] ob = baseDao.getFieldsDataByCondition("makeserial", "ms_status,ms_craftcode,ms_prodcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
|
|
|
if (ob!=null)
|
