|
@@ -1690,6 +1690,25 @@ public class MesProductRecordController extends BaseController {
|
|
|
return ret;
|
|
return ret;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // 旧模板补建 OP370 后 serial 可能错乱,前站依赖 serial 会漏检;
|
|
|
|
|
+ // 仅当本工位 OP370 仍为 UDF 时,按工位号显式校验 OP360 是否 NG。
|
|
|
|
|
+ String curOprnoFor360 = CommonUitl.formatOprno(oldOprno);
|
|
|
|
|
+ if ("OP370".equals(curOprnoFor360)) {
|
|
|
|
|
+ String op370Content = null;
|
|
|
|
|
+ String op360Content = null;
|
|
|
|
|
+ for (MesProductRecord mpr : lists) {
|
|
|
|
|
+ if (CommonUitl.sameStation(mpr.getOprno(), "OP370")) {
|
|
|
|
|
+ op370Content = mpr.getContent();
|
|
|
|
|
+ }
|
|
|
|
|
+ if (CommonUitl.sameStation(mpr.getOprno(), "OP360")) {
|
|
|
|
|
+ op360Content = mpr.getContent();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if ("UDF".equals(op370Content) && "NG".equals(op360Content)) {
|
|
|
|
|
+ return "360QN";
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
String passoprnos = "";
|
|
String passoprnos = "";
|
|
|
if(lineSn.equals("XT")){
|
|
if(lineSn.equals("XT")){
|
|
|
passoprnos = Global.getConfig("mes.pass.oprno.xt");
|
|
passoprnos = Global.getConfig("mes.pass.oprno.xt");
|