From a8b604dba89260b486244926ec5bff5a121eb71a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 17 十一月 2023 16:24:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java                  |   27 +++++++++++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   75 +++----------------------------------
 src/main/resources/application-prod.yml                     |    8 ++--
 3 files changed, 37 insertions(+), 73 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 562186e..87ea97e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -400,38 +400,7 @@
                     log.error("鏌ヨ宸ヤ綔妗f暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/鐩爣搴撲綅鍙�, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", taskWrk.getWrkNo(), taskWrk.getTargetPoint(), taskWrk.getIoType());
                     continue;
                 }
-                // 鑾峰彇婧愬簱浣嶄俊鎭�
-                String locNo = taskWrk.getStartPoint();
-                LocMast sourceSta = locMastService.selectById(locNo);
-                if (!sourceSta.getLocSts().equals("R") &&!sourceSta.getLocSts().equals("P")) {
-                    log.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", locNo, sourceSta.getLocSts());
-                    continue;
-                }
 
-                // 鑾峰彇鐩爣搴撲綅淇℃伅
-                String locNoEnd = taskWrk.getTargetPoint();
-                LocMast sourceEnd = locMastService.selectById(locNoEnd);
-                if (!sourceEnd.getLocSts().equals("S") && !sourceEnd.getLocSts().equals("Q")) {
-                    log.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", locNo, sourceSta.getLocSts());
-                    continue;
-                }
-
-
-//                // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
-//                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
-//                StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
-//                if (staProtocol == null) {
-//                    break;
-//                } else {
-//                    staProtocol = staProtocol.clone();
-//                }
-
-                // 鏌ヨ绔欑偣璇︾粏淇℃伅
-                BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
-                if (staDetl == null) {
-                    log.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
-                    continue;
-                }
                 // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
 
                 // 鍫嗗灈鏈烘帶鍒惰繃婊�
@@ -444,38 +413,6 @@
                     continue;
                 }
 
-                // 璧峰娣卞簱浣嶆祬搴撲綅涓嶄负绌�
-                if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
-                    // 鑾峰彇娴呭簱浣嶄俊鎭�
-                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
-                    LocMast shallowLocMast = locMastService.selectById(shallowLocNo);
-                    if (!shallowLocMast.getLocSts().equals("O")) {
-                        log.error("绉诲簱鎿嶄綔璧峰搴撲綅娴呭簱浣嶇姸鎬佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", locNo, shallowLocMast.getLocSts());
-                        continue;
-                    }
-                }
-
-                // 鐩爣搴撲綅涓烘繁搴撲綅涓旀祬搴撲綅涓嶄负绌�
-                if (Utils.isDeepLoc(slaveProperties, taskWrk.getTargetPoint())) {
-                    // 鑾峰彇娴呭簱浣嶄俊鎭�
-                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getTargetPoint());
-                    LocMast shallowLocMast = locMastService.selectById(shallowLocNo);
-                    if (!shallowLocMast.getLocSts().equals("O")) {
-                        log.error("绉诲簱鎿嶄綔鐩爣搴撲綅娴呭簱浣嶇姸鎬佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", locNo, shallowLocMast.getLocSts());
-                        continue;
-                    }
-                }
-
-                // 鐩爣搴撲綅涓烘祬搴撲綅涓旀繁搴撲綅鏃犺揣
-                if (Utils.isShallowLoc(slaveProperties, taskWrk.getTargetPoint())) {
-                    // 鑾峰彇娣卞簱浣嶄俊鎭�
-                    String deepLocNo = Utils.getDeepLoc(slaveProperties, taskWrk.getTargetPoint());
-                    LocMast deepLocMast = locMastService.selectById(deepLocNo);
-                    if (!deepLocMast.getLocSts().equals("F") && !deepLocMast.getLocSts().equals("D") ) {
-                        log.error("绉诲簱鎿嶄綔鐩爣搴撲綅娣卞簱浣嶇姸鎬佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", locNo, deepLocMast.getLocSts());
-                        continue;
-                    }
-                }
 
                 // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
                 CrnCommand crnCommand = new CrnCommand();
@@ -483,12 +420,12 @@
                 crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
                 crnCommand.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
                 crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
-                crnCommand.setSourcePosX(sourceSta.getRow1().shortValue());     // 婧愬簱浣嶆帓
-                crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 婧愬簱浣嶅垪
-                crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue());     // 婧愬簱浣嶅眰
-                crnCommand.setDestinationPosX(sourceEnd.getRow1().shortValue());     // 鐩爣搴撲綅鎺�
-                crnCommand.setDestinationPosY(sourceEnd.getBay1().shortValue());     // 鐩爣搴撲綅鍒�
-                crnCommand.setDestinationPosZ(sourceEnd.getLev1().shortValue());     // 鐩爣搴撲綅灞�
+                crnCommand.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint()));     // 婧愬簱浣嶆帓
+                crnCommand.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint()));     // 婧愬簱浣嶅垪
+                crnCommand.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint()));     // 婧愬簱浣嶅眰
+                crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint()));     // 鐩爣搴撲綅鎺�
+                crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint()));     // 鐩爣搴撲綅鍒�
+                crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint()));     // 鐩爣搴撲綅灞�
                 if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
                     log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
                 } else {
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2fd2706..ba3cc80 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -148,6 +148,13 @@
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
 
+    public static Short getRowShort(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Short.valueOf(locNo.substring(0, 2));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
      */
@@ -169,6 +176,26 @@
     }
 
     /**
+     * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
+     */
+    public static short getBayShort(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Short.parseShort(locNo.substring(2, 5));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
+    /**
+     * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+     */
+    public static short getLevShort(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Short.parseShort(locNo.substring(5, 7));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
+    /**
      * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
      */
     public static void toDeepIfEmptyByShallow(String shallowLoc) {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index b5494f0..55000c9 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -220,7 +220,7 @@
       scale: ${wcs-slave.scale[1].id}
       staNo: 105
       barcode: ${wcs-slave.barcode[1].id}
-      slot: 0
+      #slot: 0
     inSta[2]: #鍏ュ簱鍙�1
       scale: ${wcs-slave.scale[0].id}
       staNo: 109
@@ -233,7 +233,7 @@
       scale: ${wcs-slave.scale[1].id}
       staNo: 117
       barcode: ${wcs-slave.barcode[1].id}
-      slot: 0
+      #slot: 0
     inSta[5]: #鍏ュ簱鍙�1
       scale: ${wcs-slave.scale[0].id}
       staNo: 121
@@ -268,7 +268,7 @@
       scale: ${wcs-slave.scale[1].id}
       staNo: 306
       barcode: ${wcs-slave.barcode[1].id}
-      slot: 0
+      #slot: 0
     outSta[0]: #鍑哄簱鍙�1
       staNo: 307
   devp[3]: #杈撻�佺嚎
@@ -283,7 +283,7 @@
       scale: ${wcs-slave.scale[1].id}
       staNo: 406
       barcode: ${wcs-slave.barcode[1].id}
-      slot: 0
+      #slot: 0
     outSta[0]: #鍑哄簱鍙�1
       staNo: 407
   scale[0]: #纾呯Г

--
Gitblit v1.9.1