|
|
@@ -3066,6 +3066,29 @@ public class MesProductRecordController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ if (CommonUitl.formatOprno(oprno).equals("OP420")){
|
|
|
+ MesDeviceTime mesDeviceTime = new MesDeviceTime();
|
|
|
+ mesDeviceTime.setSn(sn);
|
|
|
+ mesDeviceTime.setProductCate(lineSn);
|
|
|
+ mesDeviceTime.setOprno("OP400");
|
|
|
+ MesDeviceTime mesDeviceTime1 = mesDeviceTimeService.findInfo(mesDeviceTime);
|
|
|
+ if (!ObjectUtils.isEmpty(mesDeviceTime1)){
|
|
|
+ if(mesDeviceTime1.getEndDate() != null){
|
|
|
+ Date endDate = mesDeviceTime1.getEndDate();
|
|
|
+ long differenceInMillis = System.currentTimeMillis() - endDate.getTime();
|
|
|
+ long twoHoursInMillis = 15 * 60 * 1000;
|
|
|
+ if (differenceInMillis >= twoHoursInMillis) {
|
|
|
+ ret = "RSUD";
|
|
|
+ } else {
|
|
|
+ hashMap.put("Message", "静置时间未到");
|
|
|
+ hashMap.put("Result", "Fail");
|
|
|
+ return hashMap;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
// 开始工作
|
|
|
MesDeviceTime mesDeviceTime = new MesDeviceTime();
|
|
|
mesDeviceTime.setOprno(oprno);
|