|
@@ -992,6 +992,22 @@ public class MesProductRecordController extends BaseController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if(CommonUitl.formatOprno(oldOprno).equals("OP310")){ //成品气密
|
|
|
|
|
+ if(res.equals("UD")){ // 检查底护板安装(OP300)到成品气密(OP310)间隔是否超过两小时
|
|
|
|
|
+ MesDeviceTime op300Time = mesDeviceTimeService.getInfoByOprnoAndSnAndCate("OP300A",sn,lineSn);
|
|
|
|
|
+ if(op300Time == null){
|
|
|
|
|
+ op300Time = mesDeviceTimeService.getInfoByOprnoAndSnAndCate("OP300",sn,lineSn);
|
|
|
|
|
+ }
|
|
|
|
|
+ if(!ObjectUtils.isEmpty(op300Time) && op300Time.getStartDate() != null){
|
|
|
|
|
+ long intervalMillis = new Date().getTime() - op300Time.getStartDate().getTime();
|
|
|
|
|
+ long twoHoursMillis = 2 * 60 * 60 * 1000L;
|
|
|
|
|
+ if(intervalMillis < twoHoursMillis){
|
|
|
|
|
+ return "RSTH"; // 底护板安装到成品气密间隔未超过两小时,无法加工
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// if(oldOprno.equals("OP400")){ //GP12检查标注是否返修过
|
|
// if(oldOprno.equals("OP400")){ //GP12检查标注是否返修过
|
|
|
// if(res.equals("UD")){
|
|
// if(res.equals("UD")){
|
|
|
// MesRepair mesRepair = new MesRepair();
|
|
// MesRepair mesRepair = new MesRepair();
|