From 95c6ea9da63330ae9d8936c521fbfb232132e143 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 26 一月 2024 21:37:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   42 ++++++++++++++++++++++++++----------------
 1 files changed, 26 insertions(+), 16 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 6684db3..b74f1e6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -94,6 +94,8 @@
     private BasRgvMapMapper basRgvMapMapper;
     @Autowired
     private WrkMastService wrkMastService;
+    @Autowired
+    private BasRgvMapService basRgvMapService;
 
     @Value("${wms.url}")
     private String wmsUrl;
@@ -2209,15 +2211,16 @@
     public synchronized void rgvCompleteWrkMastSta() {
         try{
             for (DevpSlave devp : slaveProperties.getDevp()) {
-            for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
-                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+                List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
+            for (BasRgvMap rgvSlave:basRgvMaps) {
+                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
                 RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                 if (rgvProtocol == null) {
                     continue;
                 }
-                BasRgv basRgv = basRgvService.selectById(rgvSlave.getId());
+                BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
                 if (basRgv == null) {
-                    log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�3", rgvSlave.getId());
+                    log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�3", rgvSlave.getRgvNo());
                     continue;
                 }
 
@@ -2244,8 +2247,13 @@
                             continue;
                         }
 
-                        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+                        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                         StaProtocol staProtocol = devpThread.getStation().get(wrkMastSta.getStaEnd());
+                        if (staProtocol == null) {
+                            continue;
+                        } else {
+                            staProtocol = staProtocol.clone();
+                        }
                         if (!staProtocol.isAutoing() || !staProtocol.isLoading()){
                             continue;
                         }
@@ -2292,15 +2300,16 @@
     public synchronized void rgvRunWrkMastFullSta() {
         boolean wrkEnable = false;
         try{
-            for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
-                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+            List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
+            for (BasRgvMap rgvSlave:basRgvMaps) {
+                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
                 RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                 if (rgvProtocol == null) {
                     continue;
                 }
-                BasRgv basRgv = basRgvService.selectById(rgvSlave.getId());
+                BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
                 if (basRgv == null) {
-                    log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�4", rgvSlave.getId());
+                    log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�4", rgvSlave.getRgvNo());
                     continue;
                 }
 
@@ -2490,15 +2499,16 @@
             if (integer==0){
                 return;
             }
-            for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
-                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+            List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
+            for (BasRgvMap rgvSlave:basRgvMaps) {
+                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
                 RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                 if (rgvProtocol == null) {
                     continue;
                 }
-                BasRgv basRgv = basRgvService.selectById(rgvSlave.getId());
+                BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
                 if (basRgv == null) {
-                    log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�1", rgvSlave.getId());
+                    log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�1", rgvSlave.getRgvNo());
                     continue;
                 }
 
@@ -2532,9 +2542,10 @@
      * 灏忚溅XY绉诲姩  閬胯
      * */
     public synchronized boolean rgvAvoidanceXY(Integer rgvId){
-        if (rgvId==1){
+        BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo(rgvId);
+        if (basRgvMap.getStartRoute() == 100){
             try{
-                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
+
                 //  鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
                 RgvCommand rgvCommand = new RgvCommand();
                 rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
@@ -2557,7 +2568,6 @@
             }
         }else {
             try{
-                BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvId);
                 //  鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
                 RgvCommand rgvCommand = new RgvCommand();
                 rgvCommand.setRgvNo(rgvId); // RGV缂栧彿

--
Gitblit v1.9.1