From 2831a88603cf5e7548f586d01c64adcdf8d82b70 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 20 三月 2024 18:08:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java   |    4 ++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   38 +++++++++++++++---
 src/main/resources/application-prod.yml                     |   10 ++--
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java   |    2 
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |   31 +++++++++++++++
 src/main/resources/application.yml                          |    6 +-
 6 files changed, 74 insertions(+), 17 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 79e7040..a4ea3e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -363,11 +363,17 @@
 
                         } else {
                             // 閫�鍥�
-//                        News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
-                            staProtocol.setWorkNo(workNo);
-                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
+                            log.error("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+//                            staProtocol.setWorkNo((short)0);
+//                            staProtocol.setStaNo(inSta.getStaNo().shortValue());
+//                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+//
+//                            Thread.sleep(500);
+
+                            staProtocol.setWorkNo((short)9999);
+                            staProtocol.setStaNo(inSta.getStaNo().shortValue());
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
-                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
                             if (taskWrk != null) {
                                 taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
@@ -1159,6 +1165,12 @@
     //agv鍙栨斁璐т换鍔″畬鎴�
     public synchronized void autoCompleteAGV() {
         List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+        try{
+            Thread.sleep(500);
+        }catch (Exception e){
+
+        }
+
         for (BasDevp basDevp:basDevps){
             DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
             StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
@@ -1173,7 +1185,9 @@
                     staProtocol.setStaNo(basDevp.getDevNo().shortValue());
                     MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
                 }
+                boolean sign = true;
                 if (basDevp.getAgvTargetPlace()!=0){
+                    sign = false;
                     basDevp.setAgvTargetPlace(0);
                     basDevpService.updateById(basDevp);
                     staProtocol.setAgvTypeSign((short)3);//1
@@ -1182,9 +1196,19 @@
                 }
             }else {
                 if (basDevp.getAgvTargetPlace()!=0){
-                    staProtocol.setAgvTypeSign((short)1);
-                    staProtocol.setStaNo(basDevp.getDevNo().shortValue());
-                    MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+                    if (basDevp.getLoading().equals("Y")){
+                        staProtocol.setAgvTypeSign((short)1);
+                        staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+                        MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+                    }else {
+                        log.error("AGV鏀捐揣瀹屾垚浣嗚緭閫佺嚎鏃犵墿锛屽浣嶄俊鍙� ===>> [staNo:{}] [basDevp:{}]", basDevp.getDevNo(), basDevp);
+                        basDevp.setAgvTargetPlace(0);
+                        basDevpService.updateById(basDevp);
+                        staProtocol.setAgvTypeSign((short)3);//1
+                        staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+                        MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+                    }
+
                 }
                 if (basDevp.getAgvTargetPick()!=0){
                     basDevp.setAgvTargetPick(0);
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index e2cdeec..baa789a 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -434,7 +434,7 @@
 
 
     public BasCrnp toSqlModel(BasCrnp basCrnp){
-        basCrnp.setCrnErr(alarm1.longValue());
+        basCrnp.setCrnErr(alarm.longValue());
         basCrnp.setWrkNo(taskNo.intValue());
         return basCrnp;
     }
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 16bae8e..a31159e 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -111,6 +111,10 @@
     private Short agvStartPlace; //鍏佽鏀捐揣
     private Short agvTypeSign; //鍏佽鏀捐揣
 
+    private Short agvTargetPick; //鍙栬揣瀹屾垚
+    private Short agvTargetPlace; //鏀捐揣瀹屾垚
+    private Short agvTypeSignEnd; //鏀捐揣瀹屾垚
+
     private List<Integer> alarm;
 
 
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4667bf6..f03b158 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -262,6 +262,34 @@
             }
         }
 
+        OperateResultExOne<byte[]> resultAgvAndPlcOk = siemensS7Net.Read("DB102.0", (short) 30);
+        if (resultAgvAndPlcOk.IsSuccess) {
+            for (int i = 0; i < staNoSize; i++) {
+                int sign =(i+2)/2-1;
+                if ((i+2)%2!=0){
+                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                    StaProtocol staProtocol = station.get(siteId);
+                    if (null == staProtocol) {
+                        staProtocol = new StaProtocol();
+                        staProtocol.setSiteId(siteId);
+                        station.put(siteId, staProtocol);
+                    }
+                    staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6+4));     // 鍏佽鍙栬揣
+                    staProtocol.setAgvTargetPlace((short)0);   // 鍏佽鏀捐揣
+                    continue;
+                }
+                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6));     // 鍏佽鍙栬揣
+                staProtocol.setAgvTargetPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6 + 2));   // 鍏佽鏀捐揣
+            }
+        }
+
 
         if (slave.getId() == 1) {
             //鏉$爜
@@ -465,7 +493,8 @@
                 taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
                 taskWrkService.updateById(taskWrk);
             }else{
-                log.error("杈撻�佺嚎鍐欏叆澶辫触"+staProtocol+"++++++++++++++++++++++++++++++++++++++");
+                log.error(staProtocol+"++++++++++++++++++++++++++++++++++++++");
+//                log.error("杈撻�佺嚎鍐欏叆澶辫触"+staProtocol+"++++++++++++++++++++++++++++++++++++++");
             }
         }
 
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ece690b..647e2de 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -12,7 +12,7 @@
       bay: 1
       lev: 1
       devpPlcId: ${wcs-slave.devp[0].id}
-    ip: 10.210.157.100
+    ip: 192.168.1.100
     crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
       staNo: 100
       row: 1
@@ -32,7 +32,7 @@
       bay: 1
       lev: 1
       devpPlcId: ${wcs-slave.devp[0].id}
-    ip: 10.210.157.110
+    ip: 192.168.1.110
     crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
       staNo: 102
       row: 4
@@ -64,7 +64,7 @@
     rack: 0
     emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
       staNo: 100
-    ip: 10.210.157.140
+    ip: 192.168.1.140
     outSta[4]: #鍑哄簱鍙�5
       staNo: 104
     outSta[3]: #鍑哄簱鍙�4
@@ -113,7 +113,7 @@
       bay: 1
       lev: 1
       devpPlcId: ${wcs-slave.devp[0].id}
-    ip: 10.210.157.120
+    ip: 192.168.1.120
     crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
       staNo: 104
       row: 8
@@ -133,7 +133,7 @@
       bay: 1
       lev: 1
       devpPlcId: ${wcs-slave.devp[0].id}
-    ip: 10.210.157.130
+    ip: 192.168.1.130
     crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
       staNo: 106
       row: 11
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a1208db..35f794e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9090
+  port: 8080
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=rywxasrs
+    url: jdbc:sqlserver://192.168.1.99:1433;databasename=rywxasrs
     username: sa
     password: sa@123
   mvc:
@@ -50,7 +50,7 @@
   #url: 10.32.53.195:8080
   # WMS绯荤粺ip
   #  url: 10.210.157.109:8090
-  url: 10.210.157.14:8090
+  url: 192.168.1.4:8090
   # 鍏ュ簱浠诲姟鐢宠鎺ュ彛
   #inboundTaskApplyPath: api/InterFace/inboundTaskApply
   inboundTaskApplyPath: sugood/inboundTaskApply

--
Gitblit v1.9.1