root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev: 修改任务下发

Browse Source
This commit is contained in:
liyongde
2023-04-04 17:01:37 +08:00
parent 16fe28ce3b
commit a3a0f637a2
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java
View File

@@ -139,7 +139,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
try { try {
pointConfirm(task); pointConfirm(task);
JSONArray data = new JSONArray(); JSONArray data = new JSONArray();
data.add(task); JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
data.add(result);
// 下发 // 下发
wms.issueTaskToAcs(data); wms.issueTaskToAcs(data);
} catch (Exception ex) { } catch (Exception ex) {

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java
View File

@@ -135,7 +135,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
try { try {
pointConfirm(task); pointConfirm(task);
JSONArray data = new JSONArray(); JSONArray data = new JSONArray();
data.add(task); JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
data.add(result);
// 下发 // 下发
wms.issueTaskToAcs(data); wms.issueTaskToAcs(data);
} catch (Exception ex) { } catch (Exception ex) {

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java
View File

@@ -62,7 +62,6 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode()); pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode());
pointObj.put("update_time", DateUtil.now()); pointObj.put("update_time", DateUtil.now());
pointTab.update(pointObj); pointTab.update(pointObj);
// todo: 是否需要载具类型
} }
// 2任务完成 // 2任务完成
taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode());
@@ -136,7 +135,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
try { try {
pointConfirm(task); pointConfirm(task);
JSONArray data = new JSONArray(); JSONArray data = new JSONArray();
data.add(task); JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
data.add(result);
// 下发 // 下发
wms.issueTaskToAcs(data); wms.issueTaskToAcs(data);
} catch (Exception ex) { } catch (Exception ex) {

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java
View File

@@ -139,7 +139,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask {
try { try {
pointConfirm(task); pointConfirm(task);
JSONArray data = new JSONArray(); JSONArray data = new JSONArray();
data.add(task); JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
data.add(result);
// 下发 // 下发
wms.issueTaskToAcs(data); wms.issueTaskToAcs(data);
} catch (Exception ex) { } catch (Exception ex) {