From cf72f14140e41ac9532e8e1d4956131f1e07de38 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 12 三月 2022 13:38:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index ce0449c..4f4aedc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8,7 +8,6 @@
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.WaitPakinMapper;
 import com.zy.asrs.mapper.WrkMastMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
@@ -16,7 +15,6 @@
 import com.zy.common.model.MatDto;
 import com.zy.common.model.SearchLocParam;
 import com.zy.common.model.StartupDto;
-import com.zy.common.service.CommonService;
 import com.zy.common.utils.CollectionUtils;
 import com.zy.common.utils.HttpHandler;
 import com.zy.core.CrnThread;
@@ -58,18 +56,14 @@
 @Transactional
 public class MainServiceImpl {
 
-    public static final long COMMAND_TIMEOUT = 5 * 1000;
-
-    @Autowired
-    private CommonService commonService;
+    @Value("${wms.url}")
+    private String wmsUrl;
     @Autowired
     private SlaveProperties slaveProperties;
     @Autowired
     private WrkMastMapper wrkMastMapper;
     @Autowired
     private WrkDetlService wrkDetlService;
-    @Autowired
-    private WaitPakinMapper waitPakinMapper;
     @Autowired
     private LocMastService locMastService;
     @Autowired
@@ -79,15 +73,11 @@
     @Autowired
     private BasDevpService basDevpService;
     @Autowired
-    private LocDetlService locDetlService;
-    @Autowired
     private BasErrLogService basErrLogService;
     @Autowired
     private BasCrnErrorMapper basCrnErrorMapper;
     @Autowired
     private BasSteService basSteService;
-    @Value("${wms.url}")
-    private String wmsUrl;
 
     /**
      * 缁勬墭
@@ -686,7 +676,7 @@
                         }
                         return true;
                     }
-                    // 涓嶆槸鏈�澶栧眰搴撲綅锛岄渶瑕佷娇鐢ㄧ┛姊溅鎼繍鍚庯紝鍐嶅爢鍨涙満鍑哄簱
+                // 涓嶆槸鏈�澶栧眰搴撲綅锛岄渶瑕佷娇鐢ㄧ┛姊溅鎼繍鍚庯紝鍐嶅爢鍨涙満鍑哄簱
                 } else {
                     // 褰撳墠缁勫簱浣嶆槸鍚︽湁绌挎杞�
                     Integer steNo = this.hasCarOfIdle(wrkMast.getLocNo());
@@ -754,7 +744,7 @@
                             }
                         }
 
-                        // 娌℃湁灏忚溅
+                    // 娌℃湁灏忚溅
                     } else {
                         if (wrkMast.getWrkSts() == 11L && wrkMast.getStaNo() == null) {
                             // 瀵绘壘鏈�杩戠殑灏忚溅

--
Gitblit v1.9.1