From 7a3193a3d0a94daff257cb13764a83b9863bad22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 04 十月 2023 14:20:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/DevpSlave.java              |    2 +
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   40 ++++++++++++--------
 src/main/resources/application.yml                          |   25 +++++++++++-
 3 files changed, 49 insertions(+), 18 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 354e047..dfa2a60 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -406,8 +406,8 @@
                 }
                 if (staProtocol.isAutoing()
                         && staProtocol.isLoading()
-                        && (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999)
-                        && staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
+//                        && (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999)
+//                        && staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
                         && staProtocol.isPakMk()){
 
                     // 鑾峰彇鏉$爜鎵弿浠俊鎭�
@@ -508,12 +508,18 @@
                             }
 
                             String sourceLocNo = wrkMast.getSourceLocNo().trim();
+                            LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+                            if (liftStaProtocol == null) {
+                                continue;
+                            }
+
                             // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
                             wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
                             wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
                             wrkMast.setSourceStaNo(pickSta.getStaNo()); // 婧愮珯
-                            wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
-                            wrkMast.setCrnNo(dto.getCrnNo());
+//                            wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
+//                            wrkMast.setCrnNo(dto.getCrnNo());
+                            wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
                             wrkMast.setLocNo(sourceLocNo); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
                             wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
                             wrkMast.setModiTime(new Date());
@@ -532,14 +538,16 @@
                                 throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
                             }
 
-                            // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
-                            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
-                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
-                            devpThread.setPakMk(staProtocol.getSiteId(), false);
-                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-                            if (!result) {
-                                News.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
-                            }
+//                            // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+//                            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+//                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
+//                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+//                            if (!result) {
+//                                News.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
+//                            }
+
+                            barcodeThread.setBarcode("");//娓呯悊鏉$爜
 
                         } else if (code == 500){
                             if (ledThread != null) {
@@ -550,10 +558,10 @@
                             }
                             News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                         } else {
-                            staProtocol.setWorkNo((short) 32002);
-                            staProtocol.setStaNo(pickSta.getBackSta().shortValue());
-                            devpThread.setPakMk(staProtocol.getSiteId(), false);
-                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+//                            staProtocol.setWorkNo((short) 32002);
+//                            staProtocol.setStaNo(pickSta.getBackSta().shortValue());
+//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
+//                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
 
                             // led 寮傚父鏄剧ず
                             if (ledThread != null) {
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 3130400..5e48bcc 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -44,6 +44,8 @@
 
         private Integer led;
 
+        private Integer liftNo;
+
     }
 
     @Data
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0277ec1..7ca377b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +8,10 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzskasrs
     username: sa
 #    password: Zoneyung@zy56$
-    password: sa@123
+    password: sa
   mvc:
     static-path-pattern: /**
   redis:
@@ -70,84 +70,98 @@
       backSta: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
       staNo: 103
       backSta: 102
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 鍏ュ簱鍙�3
     inSta[2]:
       staNo: 105
       backSta: 104
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 鍏ュ簱鍙�4
     inSta[3]:
       staNo: 200
       backSta: 201
       barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 鍏ュ簱鍙�5
     inSta[4]:
       staNo: 203
       backSta: 202
       barcode: ${wcs-slave.barcode[4].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 鍏ュ簱鍙�6
     inSta[5]:
       staNo: 205
       backSta: 204
       barcode: ${wcs-slave.barcode[5].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 鍏ュ簱鍙�7
     inSta[6]:
       staNo: 346
       backSta: 345
       barcode: ${wcs-slave.barcode[8].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 100
       backSta: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 绌烘澘鍏ュ簱鍙�2
     emptyInSta[1]:
       staNo: 103
       backSta: 102
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 绌烘澘鍏ュ簱鍙�3
     emptyInSta[2]:
       staNo: 105
       backSta: 104
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 绌烘澘鍏ュ簱鍙�4
     emptyInSta[3]:
       staNo: 200
       backSta: 201
       barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 绌烘澘鍏ュ簱鍙�5
     emptyInSta[4]:
       staNo: 203
       backSta: 202
       barcode: ${wcs-slave.barcode[4].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 绌烘澘鍏ュ簱鍙�6
     emptyInSta[5]:
       staNo: 205
       backSta: 204
       barcode: ${wcs-slave.barcode[5].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 绌烘澘鍏ュ簱鍙�7
     emptyInSta[6]:
       staNo: 346
       backSta: 345
       barcode: ${wcs-slave.barcode[8].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 101
@@ -186,36 +200,43 @@
       backSta: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     pickInSta[1]:
       staNo: 103
       backSta: 102
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     pickInSta[2]:
       staNo: 105
       backSta: 104
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     pickInSta[3]:
       staNo: 200
       backSta: 201
       barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     pickInSta[4]:
       staNo: 203
       backSta: 202
       barcode: ${wcs-slave.barcode[4].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     pickInSta[5]:
       staNo: 205
       backSta: 204
       barcode: ${wcs-slave.barcode[5].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     pickInSta[6]:
       staNo: 346
       backSta: 345
       barcode: ${wcs-slave.barcode[8].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
 #    # 璐ф灦鍏ュ簱绔欑偣
 #    rackInStn[0]:
 #      devpPlcId: ${wcs-slave.devp[0].id}

--
Gitblit v1.9.1