From 2fa8455e7ef6f43138c009ff0e7248aedaac3785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E9=B8=A3?= <wangyiming@zhehekeji.com>
Date: Mon, 22 Feb 2021 14:02:33 +0800
Subject: [PATCH] =?UTF-8?q?C6=20=E4=B8=8D=E6=8B=8D=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/MyProtocolDecoder.java        |  3 ---
 .../com/zhehekeji/web/service/PlcService.java | 27 +++++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java b/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java
index 5bd616d..7512f80 100644
--- a/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java
+++ b/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java
@@ -96,9 +96,6 @@ public class MyProtocolDecoder extends FixedLengthFrameDecoder {
             }else {
                 plcService.action(plcOrderInfo, plcId, 1, code);
             }
-
-
-
         } else if (type.equals("0D")) {
             log.info(" warn code:{}", code);
             if ("D0".equals(code)) {
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 773c5ea..10ae0d3 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -51,6 +51,11 @@ public class PlcService {
     @Resource
     private CameraIOMapper ioMapper;
 
+    /**
+     * 原点位
+     */
+    private static String originalPoint = "C6";
+
     public Integer plcStatus(){
         List<Street> streets = streetMapper.selectByMap(new HashMap<>(0));
         List<Integer> connIds = StreetConn.connList();
@@ -115,18 +120,18 @@ public class PlcService {
             log.error("异常的任务次数，orderInfo:{},plcId:{},time:{}",plcOrderInfo.toString(),plcId,times);
             return;
         }
-        if(true){
-            //找到球机IO配置的预置点
-            if(!"C6".equals(code)){
-                if(leftRight == 1){
-                    code = code+"-L";
-                }else if(leftRight == 2){
-                    code = code+"-R";
-                }
+        //找到球机IO配置的预置点
+        if(!originalPoint.equals(code)){
+            if(leftRight == 1){
+                code = code+"-L";
+            }else if(leftRight == 2){
+                code = code+"-R";
             }
-            log.info("预置点：{}",code);
-
-            move(street.getCamera1Id(),street.getCamera2Id(),code);
+        }
+        log.info("预置点：{}",code);
+        move(street.getCamera1Id(),street.getCamera2Id(),code);
+        if(originalPoint.equals(code)){
+            return;
         }
         //2 得到相应的货架号(目前订单 只支持单伸货架)
         //todo 后面可能会有双伸，这里要改，plc那里也要改