From a665ac26aea3e2bf5bfdd42094766e1c90c7b1aa Mon Sep 17 00:00:00 2001 From: yiming Date: Tue, 15 Mar 2022 13:55:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=96=B9=E5=90=91=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/PlcService.java | 2 +- .../java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 08b92c6..8b14886 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -439,7 +439,7 @@ public class PlcService { public void check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode){ Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId()); - Integer cameraId = getCameraByPlcCmd(plcCmdInfo,1); + Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1()); gyrateCameraByCode(cameraId, cmdCode); String path = cameraCapture(cameraId,true,3000L); OrderInfo orderInfo = new OrderInfo(street,plcCmdInfo,1,cmdCode); diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java index 9846488..8114a49 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java @@ -86,7 +86,7 @@ public class ProtocolDecoder extends FixedLengthFrameDecoder { byte[] bytesBarNumSys = {b5, b6, b7, b8}; int boxNumAlgo = b3; int boxNumSys = b4; - //String barCodeSys = String.valueOf(b5)+b6+b7+b8; + String barCodeSys = new String(bytesBarNumSys, "UTF-8"); if(!type.equals(HEART)){ //log.info("plcId:{},原始信号：{}", plcId, signal);