修复静置扫码重置时间BUG

src/main/java/com/jeesite/modules/mes/util/CommonUitl.java

@@ -395,8 +395,7 @@ public class CommonUitl {
         List<String> dbjoprnos = new ArrayList<>();
         Boolean ret = false;
         if(lineSn.equals("XT")){
-//            dbjoprnos.add("OP050");
-//            dbjoprnos.add("OP060");
+//            dbjoprnos.add("OP080A");
             if(dbjoprnos.contains(oprno)){
                 return true;
             }

src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -950,12 +950,30 @@ public class MesProductRecordController extends BaseController {
 //				return ret; //该工件存在未处理的报警信息
 //			}
 			try{
-				MesDeviceTime mesDeviceTime = new MesDeviceTime();
-				mesDeviceTime.setOprno(oldOprno);
-				mesDeviceTime.setSn(sn);
-				mesDeviceTime.setProductCate(lineSn);
-				mesDeviceTimeService.add2(mesDeviceTime);
-			}catch(Exception e){}
+				if (oprno.equals("OP340") || oprno.equals("OP370") || oprno.equals("OP400") ){
+					MesDeviceTime mesDeviceTime = new MesDeviceTime();
+					mesDeviceTime.setOprno(oldOprno);
+					mesDeviceTime.setSn(sn);
+					mesDeviceTime.setProductCate(lineSn);
+					MesDeviceTime m1 = mesDeviceTimeService.findInfo(mesDeviceTime);
+					if(ObjectUtils.isEmpty(m1)){
+						MesDeviceTime mesDeviceTime1 = new MesDeviceTime();
+						mesDeviceTime1.setOprno(oldOprno);
+						mesDeviceTime1.setSn(sn);
+						mesDeviceTime1.setProductCate(lineSn);
+						mesDeviceTimeService.add(mesDeviceTime1);
+					}
+				}else {
+					MesDeviceTime mesDeviceTime = new MesDeviceTime();
+					mesDeviceTime.setOprno(oldOprno);
+					mesDeviceTime.setSn(sn);
+					mesDeviceTime.setProductCate(lineSn);
+					mesDeviceTimeService.add2(mesDeviceTime);
+				}
+
+			}catch(Exception e){
+
+			}
 
 //			if(CommonUitl.formatOprno(oldOprno).equals("OP210")){ // 压套筒
 //				if(sn.length() > 27){

src/main/java/com/jeesite/modules/utils/ErrorMsg.java

@@ -46,6 +46,8 @@ public class ErrorMsg {
                 lmsg = "总成气密未测试或测试不合格";
             }else if(processMsgRet.equalsIgnoreCase("AL")) {
                 lmsg = "该工件存在未处理的报警信息";
+            } else if (processMsgRet.equalsIgnoreCase("JZ")) {
+                lmsg = "超过规定时间时间";
             }
         }catch (Exception e){ }
         return lmsg;