From a96f1b21f67e4fba1005ba5e2263ab03378ea8e3 Mon Sep 17 00:00:00 2001 From: yiming Date: Fri, 29 Apr 2022 16:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=9B=98=E7=82=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/java/com/zhehekeji/web/service/TestService.java | 4 ++-- web/src/main/resources/application-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 54601c9..6a56782 100644 --- a/web/src/main/java/com/zhehekeji/web/service/TestService.java +++ b/web/src/main/java/com/zhehekeji/web/service/TestService.java @@ -34,12 +34,12 @@ public class TestService { for(int i = 1;i<=row;i++){ for(int j = 1; j<= column;j++){ - String code = "3224112150069"; + String code = "123456789013"; String taskId = i +"-"+ j+"-"+LocalDateTime.now().format(DateTimeFormatter.ofPattern("hhmmss")); 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,"21234-trayCode"); + plcService.check(plcCmdInfo,"E"+co,code,"123456789013"); try { Thread.sleep(1000); } catch (InterruptedException e) { diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 297c5fd..577e7da 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -68,8 +68,8 @@ sensor: # -----goods 货物 # 扫码模式 1：球机扫码 2：扫码枪 scanCodeMode: - tray: 0 - goods: 1 + tray: 1 + goods: 0 goodsCodeTypes: - 14 trayCodeTypes: