diff --git a/hd/nladmin-system/pom.xml b/hd/nladmin-system/pom.xml index 828bb20..fe24ac0 100644 --- a/hd/nladmin-system/pom.xml +++ b/hd/nladmin-system/pom.xml @@ -95,6 +95,13 @@ + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 7eefe4f..adf3012 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -418,7 +418,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } - try { + /*try { // != 0 为agv任务 if (!StrUtil.equals(type, "0")) { if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.AGVTYPE).toString(), "1")) { @@ -455,7 +455,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } catch (Exception e) { dto.setSend_status("2"); e.printStackTrace(); - } + }*/ WQLObject wo = WQLObject.getWQLObject("acs_instruction"); JSONObject json = JSONObject.fromObject(dto);