From 66526de6f133301eca1b72596f05a29f21f5aee7 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Tue, 17 May 2022 11:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhehekeji/web/service/StockCheckRunnable.java  | 6 ++----
 .../main/java/com/zhehekeji/web/service/TestService.java    | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java b/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java
index 14ef48a..660c082 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java
+++ b/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java
@@ -81,7 +81,8 @@ public class StockCheckRunnable implements Runnable {
                 }
             }
 
-        }else if(configProperties.getScanCodeMode().getTray() == 1){
+        }
+        if(configProperties.getScanCodeMode().getTray() == 1){
             //托盘使用球机扫码
             if("".equals(wmsCode)){
                 //空货物的处理
@@ -104,10 +105,7 @@ public class StockCheckRunnable implements Runnable {
                     trayCheck = wmsCode.equals(trayCode);
                 }
             }
-
         }
-
-
         log.info("code:{}",scanCode);
         //核对异常
         Integer status = 1;
diff --git a/web/src/main/java/com/zhehekeji/web/service/TestService.java b/web/src/main/java/com/zhehekeji/web/service/TestService.java
index 1aaf23b..7bf1c22 100644
--- a/web/src/main/java/com/zhehekeji/web/service/TestService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/TestService.java
@@ -42,7 +42,7 @@ public class TestService {
                     PlcCmdInfo plcCmdInfo = new PlcCmdInfo(street.getPlcId(),taskId,1,leftRight,j,i,1,1,1,1,1,1,"");
                     plcCmdInfo.setTimes(1);
                     int co = j%3 + 1;
-                    plcService.check(plcCmdInfo,"E"+co,code,"123456789013");
+                    plcService.check(plcCmdInfo,"E"+co,code,code);
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException e) {