From 611cf1f97da4d177f5ecc7fe4a3d994f773a3b41 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 03 二月 2023 10:32:11 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html                              |    3 -
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   21 ++++--
 src/main/java/com/zy/common/model/LocTypeDto.java           |   17 +++--
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |   58 +++++++++---------
 src/main/resources/application.yml                          |   22 +++---
 5 files changed, 63 insertions(+), 58 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 53fae38..344887f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -298,7 +298,11 @@
                 }
 
 //                // 鍏ュ嚭搴撴ā寮忓垽鏂�
-                if ( inSta.getStaNo()==203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) { continue; }
+               // if ( inSta.getStaNo()==203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) { continue; }
+                if ( inSta.getStaNo()==101 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) { continue; }
+                if ( inSta.getStaNo()==103 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) { continue; }
+                if ( inSta.getStaNo()==105 && devpThread.ioModeOf3F == IoModeType.PAKOUT_MODE) { continue; }
+                if ( inSta.getStaNo()==107 && devpThread.ioModeOf4F == IoModeType.PAKOUT_MODE) { continue; }
 
                 // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
                 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
@@ -1264,9 +1268,12 @@
 
 //                // 鍏ュ嚭搴撴ā寮忓垽鏂�
 //                if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) { continue; }
-                if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) { continue; }
-                if ( emptyInSta.getStaNo()==402 && devpThread.ioModeOf4F == IoModeType.PAKOUT_MODE) { continue; }
-
+//                if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) { continue; }
+//                if ( emptyInSta.getStaNo()==402 && devpThread.ioModeOf4F == IoModeType.PAKOUT_MODE) { continue; }
+                if ( emptyInSta.getStaNo()==101 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) { continue; }
+                if ( emptyInSta.getStaNo()==103 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) { continue; }
+                if ( emptyInSta.getStaNo()==105 && devpThread.ioModeOf3F == IoModeType.PAKOUT_MODE) { continue; }
+                if ( emptyInSta.getStaNo()==107 && devpThread.ioModeOf4F == IoModeType.PAKOUT_MODE) { continue; }
                 // 绔欑偣鏉′欢鍒ゆ柇
                 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                         && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990 && staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {
@@ -1927,7 +1934,7 @@
                                 devpThread.ioModeOf1F = IoModeType.PAKIN_MODE;
                             }
                             break;
-                        case 103://1F
+                        case 103://2F
                             if (pakout != null) {
                                 if (devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {
                                     // 鍑哄簱鍒囨崲涓�
@@ -1945,7 +1952,7 @@
                                 devpThread.ioModeOf2F = IoModeType.PAKIN_MODE;
                             }
                             break;
-                        case 105://1F
+                        case 105://3F
                             if (pakout != null) {
                                 if (devpThread.ioModeOf3F != IoModeType.PAKOUT_MODE) {
                                     // 鍑哄簱鍒囨崲涓�
@@ -1963,7 +1970,7 @@
                                 devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
                             }
                             break;
-                        case 107://1F
+                        case 107://4F
                             if (pakout != null) {
                                 if (devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) {
                                     // 鍑哄簱鍒囨崲涓�
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 76c51eb..7536048 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -23,14 +23,15 @@
     }
 
     public LocTypeDto(StaProtocol staProtocol) {
-        if (staProtocol.isHigh() == staProtocol.isLow()) {
-            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-        }
-        if (staProtocol.isLow()) {
-            this.locType1 = 1; // 浣庡簱浣�
-        } else {
-            this.locType1 = 2; // 楂樺簱浣�
-        }
+//        if (staProtocol.isHigh() == staProtocol.isLow()) {
+//            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+//        }
+//        if (staProtocol.isLow()) {
+//            this.locType1 = 1; // 浣庡簱浣�
+//        } else {
+//            this.locType1 = 2; // 楂樺簱浣�
+//        }
+        this.locType1 = 1;
     }
 
     /**
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index dd6619f..3f8a2d1 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,7 +45,7 @@
 
     public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
         add(100);add(101);add(102);add(103);add(104);
-        add(201);add(202);add(203);
+        add(105);add(106);add(107);
     }};
 
     public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
@@ -181,7 +181,7 @@
         updateIoMode();
         ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*2));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -191,33 +191,33 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 宸ヤ綔鍙�
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
 
-//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
+               staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
             }
         }
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
-        if (result0.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
-            }
-        }
-        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
+//        if (result0.IsSuccess) {
+//            for (int i = 0; i < staNoSize; i++) {
+//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+//                StaProtocol staProtocol = station.get(siteId);
+//                if (null == staProtocol) {
+//                    staProtocol = new StaProtocol();
+//                    staProtocol.setSiteId(siteId);
+//                    station.put(siteId, staProtocol);
+//                }
+//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
+//            }
+//        }
+//        Thread.sleep(200);
         OperateResultExOne<byte[]> result1 = null;
         if(slave.getId()==1) {
-            result1 = siemensS7Net.Read("DB102.100", (short) (staNoSize));
+            result1 = siemensS7Net.Read("DB102.0", (short) (staNoSize*2));
             if (result1.IsSuccess) {
                 for (int i = 0; i < staNoSize; i++) {
                     Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1);
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
                     StaProtocol staProtocol = station.get(siteId);
                     staProtocol.setAutoing(status[0]);  // 鑷姩
                     staProtocol.setLoading(status[1]);  // 鏈夌墿
@@ -260,7 +260,7 @@
 
         Thread.sleep(200);
         if(slave.getId()==1) {
-            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200", (short) (barcodeSize * 8));
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.40", (short) (barcodeSize * 8));
             if (result2.IsSuccess) {
                 for (int i = 0; i < barcodeSize; i++) {
                     String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
@@ -319,11 +319,11 @@
         short[] array = new short[2];
         array[0] = staProtocol.getWorkNo();
         array[1] = staProtocol.getStaNo();
-//        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
+          OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
 
-        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        Thread.sleep(500);
-        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
+//        OperateResult write = siemensS7Net.Write("DB100.0" + index*4, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+//        Thread.sleep(500);
+//        OperateResult write1 = siemensS7Net.Write("DB100.2" + index*4+2, staProtocol.getStaNo());    // 鐩爣绔�
 
         if (!write.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
@@ -341,25 +341,25 @@
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
         if (this.ioModeOf1F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F.id).IsSuccess) {
+            if (!siemensS7Net.Write("DB100.80", this.ioModeOf1F.id).IsSuccess) {
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
                 log.error("鍐欏叆杈撻�佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
         if (this.ioModeOf2F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.182", this.ioModeOf2F.id).IsSuccess) {
+            if (!siemensS7Net.Write("DB100.82", this.ioModeOf2F.id).IsSuccess) {
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
                 log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
         if (this.ioModeOf3F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.184", this.ioModeOf3F.id).IsSuccess) {
+            if (!siemensS7Net.Write("DB100.84", this.ioModeOf3F.id).IsSuccess) {
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
                 log.error("鍐欏叆杈撻�佺嚎3F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
         if (this.ioModeOf4F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.186", this.ioModeOf4F.id).IsSuccess) {
+            if (!siemensS7Net.Write("DB100.86", this.ioModeOf4F.id).IsSuccess) {
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
                 log.error("鍐欏叆杈撻�佺嚎4F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e0e5849..d1a9ecd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,9 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzhtasrs
-    username: sa
-    password: sa@123
+    url: jdbc:sqlserver://localhost:1433;databasename=tzhtasrs
+    username: SA
+    password: SQLsqlserver1234
   mvc:
     static-path-pattern: /**
   redis:
@@ -34,7 +34,7 @@
   enable: false
 
 wms:
-  url: 127.0.0.1:8081/lywms
+  url: 127.0.0.1:8080/htwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -47,7 +47,7 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.101
+    ip: 10.10.10.110
     port: 102
     rack: 0
     slot: 0
@@ -86,7 +86,7 @@
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 10.10.10.111
+    ip: 10.10.10.120
     port: 102
     rack: 0
     slot: 0
@@ -123,7 +123,7 @@
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 10.10.10.50
+    ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0
@@ -191,19 +191,19 @@
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 10.10.10.52
+    ip: 10.10.10.105
     port: 51236
   barcode[1]:
     id: 2
-    ip: 10.10.10.53
+    ip: 10.10.10.106
     port: 51236
   barcode[2]:
     id: 3
-    ip: 10.10.10.54
+    ip: 10.10.10.107
     port: 51236
   barcode[3]:
     id: 4
-    ip: 10.10.10.95
+    ip: 10.10.10.108
     port: 51236
    # LED1
   led[0]:
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 3d94577..f0cfcca 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -133,9 +133,6 @@
                     <div class="select-container" style="padding: 20px 0;">
                         <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1鍙峰爢鍨涙満</label>
                         <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5鍙峰爢鍨涙満</label>
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->

--
Gitblit v1.9.1