diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java b/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java index d7cf186..d48cee0 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java @@ -44,13 +44,23 @@ public class Init implements ApplicationRunner { isStart = true; System.out.println("系统启动成功!"); //将窑设备的信息导入内存中 - /* JSONArray kilnarr = WQLObject.getWQLObject("pdm_bi_kilnrecord").query("out_time<>''", "in_time ").getResultJSONArray(0); + initKiln(); + + } + + /** + * + * @throws Exception + */ + private void initKiln() throws Exception { + JSONArray kilnarr = WQLObject.getWQLObject("pdm_bi_kilnrecord").query("out_time<>''", "in_time ").getResultJSONArray(0); for (int i = 0; i quartzJobs = quartzJobRepository.findByIsPauseIsFalse(); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java index 6c8388e..4e5ac0e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java @@ -158,6 +158,11 @@ public class CallEmptyVehicleTask extends AbstractAcsTask { } + @Override + public JSONObject renotifyAcs(String task_id) { + return super.renotifyAcs(task_id); + } + @Override public String createTask(JSONObject form) { //请求参数 终点不能为空 起点点位为空时,托盘类型不能为空,托盘不能为空! diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index d3411e1..047d7ae 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -171,6 +171,10 @@ public class TaskServiceImpl implements TaskService { } } + /** + * + * @param map + */ @Override @Transactional(rollbackFor = Exception.class) public void operation(Map map) { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoCleanUpLogs.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoCleanUpLogs.java index ebfb290..70f25f5 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoCleanUpLogs.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoCleanUpLogs.java @@ -38,4 +38,5 @@ public class AutoCleanUpLogs { e.printStackTrace(); } } + } diff --git a/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java b/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java index 27f325f..14baf15 100644 --- a/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java +++ b/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java @@ -445,4 +445,5 @@ public class Test3 extends BaseTest { } + }