From d9a9bf107dedd903a12392dd89749ccdc7b11bfb Mon Sep 17 00:00:00 2001 From: Comair <1464848666@qq.com> Date: Fri, 14 Feb 2025 14:18:25 +0700 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=B1=BB=E5=9E=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E5=8F=96=E6=B6=88=E5=85=A5=E5=BA=93=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=9C=89=E9=A2=84=E5=8D=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/shkj/wcs/plc/PlcEventTask.java | 9 +++++++-- .../shkj/wms/service/impl/BusinOutInPlanServiceImpl.java | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java b/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java index 4dcc8d1..ed45cd2 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java @@ -208,7 +208,12 @@ public class PlcEventTask { String devpName = property.getDevpName(); String address = property.getAddress(); businPlcException = new BusinPlcException(); - if (pointType.equals("99")) { + if (pointType.equals("oneBoverlength")||pointType.equals("oneAoverlength") + ||pointType.equals("oneLwide")||pointType.equals("oneRwide") + ||pointType.equals("oneHigh")||pointType.equals("ontExit") + ||pointType.equals("twoBoverlength")||pointType.equals("twoAoverlength") + ||pointType.equals("twoLwide")||pointType.equals("twoRwide") + ||pointType.equals("twoHigh")) { if (pointMap.containsKey(address) && Boolean.valueOf((pointMap.get(address).toString()))) { businPlcException.setPlcPoint(address); businPlcException.setExecMsg(devpName); @@ -217,7 +222,7 @@ public class PlcEventTask { execList.add(businPlcException); } } - // iBusinPlcExceptionService.saveBatch(execList); + // iBusinPlcExceptionService.saveBatch(execList); } redisTemplate.opsForValue().set(RedisConstant.redisPlcExecMsg + devType, execList); } catch (Exception e) { diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java index e0c0b72..9dd9282 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java @@ -943,8 +943,10 @@ public class BusinOutInPlanServiceImpl extends ServiceImpl