|
|
@@ -534,7 +534,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
|
|
|
Object isHaveCode = Objects.toString(baseDao.getFieldDataByCondition("make","ma_ishavecode","ma_code = '"+Moname+"'"),"");
|
|
|
- if(Integer.parseInt(isHaveCode.toString()) == -1){
|
|
|
+ if(Integer.parseInt(isHaveCode.toString()) == -1 && !Username.contains("LQ")){
|
|
|
if(!Defect.isEmpty()){
|
|
|
rmap.put("code", "-1");
|
|
|
rmap.put("result", "NG");
|
|
|
@@ -666,7 +666,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- String newRes = "PASS".equals(Result) ? "OK":"NG";
|
|
|
+ String newRes = Username.contains("LQ") ? "OK" : "PASS".equals(Result) ? "OK":"NG";
|
|
|
String wo = list.get(0);
|
|
|
Map<Object, Object> stepMap = SetStepFinish(wo, Username, Lotsn, "", newRes, Username, errCode);
|
|
|
if(stepMap.get("oErrMessage") != null){
|
