|
@@ -4211,7 +4211,7 @@ public class MesProductRecordController extends BaseController {
|
|
|
MesDeviceTime mesDeviceTime1 = mesDeviceTimeService.findList(mesDeviceTime).get(0);
|
|
MesDeviceTime mesDeviceTime1 = mesDeviceTimeService.findList(mesDeviceTime).get(0);
|
|
|
System.out.println("mesDeviceTime1:"+mesDeviceTime1.getEndDate());
|
|
System.out.println("mesDeviceTime1:"+mesDeviceTime1.getEndDate());
|
|
|
// 当前时间要在这个工件结束时间三分钟后
|
|
// 当前时间要在这个工件结束时间三分钟后
|
|
|
- long twoHoursInMillis = 3 * 60 * 1000;
|
|
|
|
|
|
|
+ long twoHoursInMillis = 3 * 30 * 1000;
|
|
|
long timeDifference = System.currentTimeMillis() - mesDeviceTime1.getEndDate().getTime();
|
|
long timeDifference = System.currentTimeMillis() - mesDeviceTime1.getEndDate().getTime();
|
|
|
if(timeDifference < twoHoursInMillis){
|
|
if(timeDifference < twoHoursInMillis){
|
|
|
return renderResult(Global.FALSE, text("未在规定时间内!"));
|
|
return renderResult(Global.FALSE, text("未在规定时间内!"));
|