代码更新

This commit is contained in:
ludj
2022-12-24 16:57:48 +08:00
parent 7199c82ec7
commit 5b7821af49

View File

@@ -158,10 +158,11 @@ public class OutTask extends AbstractAcsTask {
jo.put("label_uuid", disObj.getString("label_uuid"));
jo.put("area_type", "'03'");
// JSONObject structObj = WQL.getWO("QSCH_OUTTASK01").addParam("flag", "1").addParam("material_uuid", material_uuid).process().uniqueResult(0);
JSONObject structObj = StructFindUtil.getOutStruct(jo).getJSONObject(0);
if (ObjectUtil.isEmpty(structObj)) {
JSONArray outStruct = StructFindUtil.getOutStruct(jo);
if (ObjectUtil.isEmpty(outStruct)) {
continue;
}
JSONObject structObj = outStruct.getJSONObject(0);
//更新分配表
String bill_uuid = "";
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
@@ -268,7 +269,15 @@ public class OutTask extends AbstractAcsTask {
if (StrUtil.isEmpty(task_uuid)) {
throw new BadRequestException("任务id不能为空");
}
JSONObject taskjo = WQLObject.getWQLObject("sch_base_task").query("task_uuid='" + task_uuid + "'").uniqueResult(0);
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject taskjo = taskTab.query("task_uuid='" + task_uuid + "'").uniqueResult(0);
//确定终点
if ("02".equals(taskjo.getString("task_status"))){
taskjo.put("task_status","06");
taskTab.update(taskjo);
return;
}
taskjo.optString("taskfinish_mode", "02");
this.updateTaskStatus(taskjo, TaskStatusEnum.FINISHED.getCode());