Browse Source

rev 修改bug

master
汪菘 4 months ago
parent
commit
a1251eb389
  1. 2
      acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
  2. 5
      acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@ -117,7 +117,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
(byte) 0X00, (byte) 0X12, (byte) 0X00, (byte) 0X12,
(byte) 0X00, (byte) 0X01, (byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X71, (byte) 0X00, (byte) 0X71,
(byte) 0X00, (byte) 0X12, (byte) 0X00, (byte) 0X0E,
(byte) 0X01, (byte) 0X80, (byte) 0X01, (byte) 0X80,
(byte) 0X00, (byte) 0X01, (byte) 0X00, (byte) 0X01,
(byte) ikeyhigh, (byte) ikeylow, (byte) ikeyhigh, (byte) ikeylow,

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@ -412,11 +412,6 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
if (StrUtil.isEmpty(dto.getLink_num())) { if (StrUtil.isEmpty(dto.getLink_num())) {
dto.setIs_send(task.getLink_num()); dto.setIs_send(task.getLink_num());
} }
if (ObjectUtil.isNotEmpty(task.getTask_type()) && task.getClass_type().length()==2) {
dto.setInstruction_type(task.getClass_type());
} else {
dto.setInstruction_type(task.getTask_type());
}
// 起点设备与终点设备相同则为初始指令 // 起点设备与终点设备相同则为初始指令
if (StrUtil.equals(task.getStart_device_code(), dto.getStart_device_code())) { if (StrUtil.equals(task.getStart_device_code(), dto.getStart_device_code())) {

Loading…
Cancel
Save