优化代码

mes/ktg-mes/src/main/java/com/ktg/mes/rms/task/ApiStockTask.java

@@ -89,7 +89,7 @@ public class ApiStockTask {
         if(!erpSysOpen.contains("1")) {
             log.info("智邦ERP关闭");
         }
-        if("net".equals(robotModel)||"mes".equals(robotModel)){
+        if("net".equals(robotModel)){
             return;
         }
         try {
@@ -106,7 +106,7 @@ public class ApiStockTask {
 //    @Scheduled(fixedDelay=1000)
     public void checkInStock(){
         try {
-            if("net".equals(robotModel)||"mes".equals(robotModel)){
+            if("net".equals(robotModel)){
                 return;
             }
             //获取所有的接货平台
@@ -135,7 +135,7 @@ public class ApiStockTask {
 
 //    执行AGV任务
     public void rmsAgvTask(){
-        if("net".equals(robotModel)||"mes".equals(robotModel)){
+        if("net".equals(robotModel)){
             return;
         }
         List<RmsTaskPool> rmsTaskPools = ApiCache.getAgvPriorityList();
@@ -241,7 +241,7 @@ public class ApiStockTask {
 
     //轨道AGV任务
     public void railAgvTask(){
-        if("net".equals(robotModel)||"mes".equals(robotModel)){
+        if("net".equals(robotModel)){
             return;
         }
         List<RmsTaskPool> rmsTaskPools = ApiCache.getRailAgvPriorityList();
@@ -351,7 +351,7 @@ public class ApiStockTask {
     //    执行轨道车任务
 //    @Scheduled(fixedDelay=1000)
     public void liftTask(){
-        if("net".equals(robotModel)||"mes".equals(robotModel)){
+        if("net".equals(robotModel)){
             return;
         }
         Map<String, Queue<RmsTaskPool>> liftTaskPoolMap = null;
@@ -402,7 +402,7 @@ public class ApiStockTask {
 
 //    @Scheduled(fixedDelay=1000)
     public void syErrorPool(){
-        if("net".equals(robotModel)||"mes".equals(robotModel)){
+        if("net".equals(robotModel)){
             return;
         }
         List<String> groupCodeList = apiCache.getOrSetRedis(ApiCache.ERROR_POOL, null, 0);
@@ -426,7 +426,7 @@ public class ApiStockTask {
 
     public void checkErpTask(){
 //        查找所有完成任务的出入库单, 更新ERP
-        if("net".equals(robotModel)||"mes".equals(robotModel)){
+        if("net".equals(robotModel)){
             return;
         }
         if(erpSysOpen.contains("1")) {
@@ -567,7 +567,10 @@ public class ApiStockTask {
                     try {
                         if("3".equals(taskPool.getTaskStatus())
                                 ||"4".equals(taskPool.getTaskStatus())){
-                            queue.poll();
+                            RmsTaskPool peekPool = queue.peek();
+                            if(peekPool != null && peekPool.getTaskId().equals(taskPool.getTaskId())){
+                                queue.poll();
+                            }
                             updateCancelRemark(taskPool, msg);
                         }else{
                             updateRemark(taskPool, msg);
@@ -743,50 +746,45 @@ public class ApiStockTask {
 
     //    同步轨道车状态
     public void syLiftStatus(){
-        if("mes".equals(robotModel)){
-            return;
-        }
         try {
-            if ("merge".equals(robotModel)) {
-                RmsLift lift = new RmsLift();
-                lift.setDeviceType(DeviceTypeEnum.LIFT.getValue() + "");
-                List<RmsLift> rmsLifts = rmsLiftService.selectRmsLiftList(lift);
-                for (RmsLift rmsLift : rmsLifts) {
-                    String sWarningCode = null;
-                    LiftPlcHelper liftPlcHelper = null;
-                    try {
-                        if(liftPlcHelpTask.containsKey(rmsLift.getLiftCode())){
-                            liftPlcHelper = liftPlcHelpTask.get(rmsLift.getLiftCode());
-                            if(liftPlcHelper.getMaster() == null){
-                                liftPlcHelper = null;
-                            }
-                        }
-                        liftPlcHelper = checkConn(liftPlcHelper, rmsLift);
-                        sWarningCode = liftPlcHelper.getValue(LiftPlcHelper.sWarningCode, 0);
-                    }catch (Exception ex){
-                        log.error("读取轨道车警告码异常：", ex);
-                        sWarningCode = "-1";
-                    }
-                    if(!"0".equals(sWarningCode)){
-                        log.info(rmsLift.getLiftCode() + "：警告" + sWarningCode);
-                        RmsLiftParam rmsLiftParam = new RmsLiftParam();
-                        rmsLiftParam.setParamName(LiftPlcHelper.sWarningCode);
-                        rmsLiftParam.setLiftCode(rmsLift.getLiftCode());
-                        List<RmsLiftParam> rmsLiftParamList = rmsLiftParamService.selectRmsLiftParamList(rmsLiftParam);
-                        if (rmsLiftParamList.size() > 0) {
-                            rmsLiftParam = rmsLiftParamList.get(0);
-                            rmsLiftParam.setParamValue(sWarningCode);
-                            rmsLiftParamService.updateRmsLiftParam(rmsLiftParam);
-                        } else {
-                            rmsLiftParam.setParamValue(sWarningCode);
-                            rmsLiftParamService.insertRmsLiftParam(rmsLiftParam);
+            RmsLift lift = new RmsLift();
+            lift.setDeviceType(DeviceTypeEnum.LIFT.getValue() + "");
+            List<RmsLift> rmsLifts = rmsLiftService.selectRmsLiftList(lift);
+            for (RmsLift rmsLift : rmsLifts) {
+                String sWarningCode = null;
+                LiftPlcHelper liftPlcHelper = null;
+                try {
+                    if(liftPlcHelpTask.containsKey(rmsLift.getLiftCode())){
+                        liftPlcHelper = liftPlcHelpTask.get(rmsLift.getLiftCode());
+                        if(liftPlcHelper.getMaster() == null){
+                            liftPlcHelper = null;
                         }
                     }
-                    if("-1".equals(sWarningCode)){
-                        String msg = rmsLift.getLiftCode() + "通讯异常";
-                        rmsWebSocketServer.sendToUI("lift",DateUtils.getTime() + " "+ msg);
+                    liftPlcHelper = checkConn(liftPlcHelper, rmsLift);
+                    sWarningCode = liftPlcHelper.getValue(LiftPlcHelper.sWarningCode, 0);
+                }catch (Exception ex){
+                    log.error("读取轨道车警告码异常：", ex);
+                    sWarningCode = "-1";
+                }
+                if(!"0".equals(sWarningCode)){
+                    log.info(rmsLift.getLiftCode() + "：警告" + sWarningCode);
+                    RmsLiftParam rmsLiftParam = new RmsLiftParam();
+                    rmsLiftParam.setParamName(LiftPlcHelper.sWarningCode);
+                    rmsLiftParam.setLiftCode(rmsLift.getLiftCode());
+                    List<RmsLiftParam> rmsLiftParamList = rmsLiftParamService.selectRmsLiftParamList(rmsLiftParam);
+                    if (rmsLiftParamList.size() > 0) {
+                        rmsLiftParam = rmsLiftParamList.get(0);
+                        rmsLiftParam.setParamValue(sWarningCode);
+                        rmsLiftParamService.updateRmsLiftParam(rmsLiftParam);
+                    } else {
+                        rmsLiftParam.setParamValue(sWarningCode);
+                        rmsLiftParamService.insertRmsLiftParam(rmsLiftParam);
                     }
                 }
+                if("-1".equals(sWarningCode)){
+                    String msg = rmsLift.getLiftCode() + "通讯异常";
+                    rmsWebSocketServer.sendToUI("lift",DateUtils.getTime() + " "+ msg);
+                }
             }
         }catch (Exception ex){
             log.error("同步轨道车状态异常：", ex);