From 9732b795df7827a870cd160c6df3618684dcf432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 18 Dec 2025 16:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E5=8F=B0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/service/PlcService.java | 10 +++++----- .../com/zhehekeji/web/service/ksec/KsecDecoder.java | 4 ++-- 2 files changed, 7 insertions(+), 7 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 0e78b31..6e7f62d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -469,8 +469,8 @@ public class PlcService { kuKouService.save(kuKou); return true; } - public boolean checkVision(KsecDataInfo dataInfo,Boolean flag){ - + public Integer checkVision(KsecDataInfo dataInfo,Boolean flag){ + int i = 2; IndustrialCameraVO scTransmission = new IndustrialCameraVO(); scTransmission.setTypeMacth(dataInfo.getTypeNum()); scTransmission.setCount(dataInfo.getQuantity()); @@ -501,7 +501,7 @@ public class PlcService { scTransmission.setTypeMacth(response.getBody().getData().getCategoryName()); scTransmission.setFlag(response.getBody().getData().getFlag()); kuKouService.setHttp(scTransmission,flag); - return true; + return i; }else { scTransmission.setWmsTrayCode(dataInfo.getTrayCode()); @@ -512,7 +512,7 @@ public class PlcService { scTransmission.setTrayCode(""); scTransmission.setCount(0); kuKouService.setHttp(scTransmission,flag); - return false; + return i; } } catch (Exception e) { log.error("3D get pcd error", e); @@ -522,7 +522,7 @@ public class PlcService { scTransmission.setTrayCode(""); scTransmission.setCount(0); kuKouService.setHttp(scTransmission,flag); - return false; + return i; } } diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java index 43729bc..6dbef00 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java @@ -222,10 +222,10 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { log.info("盘点结束:"+ksecInfo.getData().toString()); }else if (Cmd.SC.name().equals(ksecInfo.getType())) { - boolean flag = plcService.checkVision(dataInfo,true); + int flag = plcService.checkVision(dataInfo,true); ksecInfo.getData().setCmdName("SC02"); - ksecInfo.getData().setCheckRlt(flag?1:0); + ksecInfo.getData().setCheckRlt(flag); try { Thread.sleep(2000); } catch (InterruptedException e) {