|
|
@@ -313,8 +313,10 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if (Time.contains("T")) {
|
|
|
Time = Time.substring(0, 19).replaceAll("T", " ");
|
|
|
}
|
|
|
- if((Lotsn == null || Lotsn.isEmpty())){
|
|
|
- if( Defect != null || !Defect.isEmpty()){
|
|
|
+
|
|
|
+ Object isHaveCode = String.valueOf(baseDao.getFieldDataByCondition("make","ma_ishavecode","ma_code = '"+Moname+"'"));
|
|
|
+ if(Integer.parseInt(isHaveCode.toString()) == -1){
|
|
|
+ if(Defect != null || !Defect.isEmpty()){
|
|
|
rmap.put("code", "-1");
|
|
|
rmap.put("result", "NG");
|
|
|
rmap.put("message", "NG,空序列号,不良品不计入产出");
|