diff --git a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java index 728cc2f..e32f06d 100644 --- a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java +++ b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java @@ -528,8 +528,8 @@ public class ModbusCollectServiceImpl downlog.setLamp(nowlamp); threeColorLampDownlogMapper.insert(downlog); }else{ - //如果有最后一条,并且灯是100并是无工单运作,就去更新那最后一条数据 - if(1 == registerData.get(0) && 0 == registerData.get(1) && 0 == registerData.get(2) && "无工单运作".equals(downlogChangeLast.getEventDesc())){ + //如果有最后一条,并且灯是100并是无工单运作做试验,就去更新那最后一条数据 + if(1 == registerData.get(0) && 0 == registerData.get(1) && 0 == registerData.get(2) && "做试验".equals(downlogChangeLast.getEventDesc())){ SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo()); downlogChangeLast.setWorkShop(soscheduled.getSWorkcenterno() == null ? null : soscheduled.getSWorkcenterno()); downlogChangeLast.setOrderNo(soscheduled.getOrderno()== null ? null : soscheduled.getOrderno()); @@ -563,7 +563,7 @@ public class ModbusCollectServiceImpl downlog.setSite(folderLocation.getSite()); downlog.setResourceId(folderLocation.getResourceId()); if(registerData.get(0) == 1){ - downlog.setEventDesc("无工单运作"); + downlog.setEventDesc("做试验"); }else{ downlog.setEventDesc("计划停机"); } @@ -578,7 +578,7 @@ public class ModbusCollectServiceImpl downlog.setSite(folderLocation.getSite()); downlog.setResourceId(folderLocation.getResourceId()); if(registerData.get(0) == 1){ - downlog.setEventDesc("无工单运作"); + downlog.setEventDesc("做试验"); }else{ downlog.setEventDesc("计划停机"); }