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

fix: 修复任务完成类型

Browse Source
This commit is contained in:
liyongde
2023-04-04 14:03:56 +08:00
parent 570d84f3c3
commit 3b05bf4318
6 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
View File

@@ -50,6 +50,9 @@ public enum AcsTaskEnum {
TASK_TYPE_PLOTTER_FILL_THE_BLANK_BOX("010302","刻字补空框"),
TASK_TYPE_WARP_CALL_MATERIAL("010401","包装叫料"),
TASK_TYPE_WARP_SEND_BLANK_BOX("010402","包装送空框"),
TASK_FINISHED_TYPE_AUTO("1", "自动完成任务"),
TASK_FINISHED_TYPE_MANUAL("2", "手动完成任务"),
;
private String code;
private String desc;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.enums.AcsTaskEnum;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
@@ -199,6 +200,7 @@ public class TaskServiceImpl implements TaskService {
JSONObject res = new JSONObject();
res.put("task_id", task_id);
res.put("task_status", "2");
res.put("finished_type", AcsTaskEnum.TASK_FINISHED_TYPE_MANUAL.getCode()); // 手动完成
finish.add(res);
acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(finish));
break;

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

@@ -68,6 +68,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
// 2任务完成
taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode());
taskObj.put("update_time", DateUtil.now());
taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))?
task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode());
taskTab.update(taskObj);
} else {
/**

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

@@ -67,6 +67,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
// 2任务完成
taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode());
taskObj.put("update_time", DateUtil.now());
taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))?
task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode());
taskTab.update(taskObj);
} else {
/**

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

@@ -67,6 +67,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
// 2任务完成
taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode());
taskObj.put("update_time", DateUtil.now());
taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))?
task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode());
taskTab.update(taskObj);
} else {
/**

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

@@ -68,6 +68,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask {
// 2任务完成
taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode());
taskObj.put("update_time", DateUtil.now());
taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))?
task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode());
taskTab.update(taskObj);
} else {
/**