From 5b66c8f27503abfd07e04a1fa490ae796c916d12 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 12 Dec 2022 17:38:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java | 5 +++-- .../src/main/java/org/nl/wms/sch/tasks/OutHotTask.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index 74eef8420..e1d0cdf41 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -14,6 +15,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.sch.AcsTaskDto; +import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.PointService; @@ -259,7 +261,7 @@ public class CallEmpReelTask extends AbstractAcsTask { json.put("acs_task_type", "1"); tab.insert(json); - this.immediateNotifyAcs(); + this.immediateNotifyAcs(null); return json.getString("task_id"); } @@ -275,5 +277,4 @@ public class CallEmpReelTask extends AbstractAcsTask { public void cancel(String task_id) { } - } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java index 46c2d9b91..730a13052 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java @@ -176,7 +176,7 @@ public class OutHotTask extends AbstractAcsTask { json.put("priority", "1"); json.put("acs_task_type", "1"); tab.insert(json); - immediateNotifyAcs(); + immediateNotifyAcs(null); return json.getString("task_id"); } From 2eaa82d462c308b1b0b47a9671f046c6d4b26440 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 12 Dec 2022 17:39:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/service/impl/PdaTaskServiceImpl.java | 13 +++- .../java/org/nl/wms/pda/task/wql/PDA_TASK.wql | 18 ++--- .../service/impl/CoolPointIvtServiceImpl.java | 16 +++-- .../nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql | 24 +++++-- .../nl/wms/sch/manage/AbstractAcsTask.java | 2 +- .../service/impl/CheckOutBillServiceImpl.java | 2 +- .../wms/pdm/ivt/coolpointivt/coolregionio.vue | 69 +++++++++++-------- .../views/wms/pdm/ivt/coolpointivt/index.vue | 5 +- 8 files changed, 99 insertions(+), 50 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java index 24b495d53..28c91c01b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java @@ -4,6 +4,7 @@ package org.nl.wms.pda.task.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -54,8 +55,15 @@ public class PdaTaskServiceImpl implements PdaTaskService { JSONObject jsonTask = tab.query("task_code = '" + task_rows.getString("task_code") + "'").uniqueResult(0); jsonTask.put("method_name", "immediateNotifyAcs"); + + if (StrUtil.equals(jsonTask.getString("task_status"), "07") || StrUtil.equals(jsonTask.getString("task_status"), "06")) { + throw new BadRequestException("任务已完成或正在执行中"); + } SpringContextHolder.getBean(TaskService.class).operation(jsonTask); + jsonTask.put("task_status","05"); + tab.update(jsonTask); + JSONObject result = new JSONObject(); result.put("message", "下发成功"); return result; @@ -68,10 +76,13 @@ public class PdaTaskServiceImpl implements PdaTaskService { JSONObject jsonTask = tab.query("task_code = '" + task_rows.getString("task_code") + "'").uniqueResult(0); jsonTask.put("method_name", "forceFinish"); + if (StrUtil.equals(jsonTask.getString("task_status"), "07")) { + throw new BadRequestException("任务已完成"); + } SpringContextHolder.getBean(TaskService.class).operation(jsonTask); JSONObject result = new JSONObject(); - result.put("message", "下发成功"); + result.put("message", "操作完成"); return result; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql index 866f45aae..1de40c63a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql @@ -50,12 +50,12 @@ point_code4, ( CASE task_status - WHEN '1' THEN '生成' - WHEN '2' THEN '确定起点' - WHEN '3' THEN '确定终点' - WHEN '4' THEN '起点和终点确定' - WHEN '5' THEN '下发' - WHEN '6' THEN '执行中' + WHEN '01' THEN '生成' + WHEN '02' THEN '确定起点' + WHEN '03' THEN '确定终点' + WHEN '04' THEN '起点和终点确定' + WHEN '05' THEN '下发' + WHEN '06' THEN '执行中' END ) AS task_status, ( @@ -78,12 +78,14 @@ END ) AS task_type, car_no, - create_time + create_time, + vehicle_code2, + material_code FROM SCH_BASE_Task WHERE is_delete = '0' - AND task_status <> '7' + AND task_status <> '07' OPTION 输入.search <> "" (vehicle_code like 输入.search or diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index 9642500bf..6c331fee4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.pdm.ivt.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; @@ -149,13 +150,20 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { */ @Override public Map coolRegionIOQueryAll(Map whereJson, Pageable page) { - HashMap map = new HashMap(); + String start_point_code = MapUtil.getStr(whereJson, "start_point_code"); + String end_point_code = MapUtil.getStr(whereJson, "end_point_code"); + String pcsn = MapUtil.getStr(whereJson, "pcsn"); + String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code"); + + JSONObject map = new JSONObject(); map.put("flag", "2"); - if (whereJson.get("start_point_code")!=null) - map.put("start_point_code", "%" + whereJson.get("start_point_code") + "%"); - map.put("bill_status", whereJson.get("bill_status")); map.put("begin_time", whereJson.get("begin_time")); map.put("end_time", whereJson.get("end_time")); + if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code","%"+start_point_code+"%"); + if (ObjectUtil.isNotEmpty(end_point_code)) map.put("end_point_code","%"+end_point_code+"%"); + if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn","%"+pcsn+"%"); + if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code","%"+vehicle_code+"%"); + JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql index 722c195a8..dffe1e6e5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -24,6 +24,9 @@ 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string 输入.start_point_code TYPEAS s_string + 输入.end_point_code TYPEAS s_string + 输入.pcsn TYPEAS s_string + 输入.vehicle_code TYPEAS s_string 输入.bill_status TYPEAS s_string @@ -89,23 +92,36 @@ IF 输入.flag = "2" PAGEQUERY SELECT - coolregionio.* + * FROM - st_ivt_coolregionio coolregionio + st_ivt_coolregionio WHERE 1=1 + OPTION 输入.start_point_code <> "" start_point_code LIKE 输入.start_point_code ENDOPTION - OPTION 输入.bill_status <> "" - bill_status = 输入.bill_status + + OPTION 输入.end_point_code <> "" + end_point_code like 输入.end_point_code ENDOPTION + + OPTION 输入.pcsn <> "" + pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.vehicle_code <> "" + vehicle_code like 输入.vehicle_code + ENDOPTION + OPTION 输入.begin_time <> "" create_time >= 输入.begin_time ENDOPTION + OPTION 输入.end_time <> "" create_time <= 输入.end_time ENDOPTION + ENDSELECT ENDPAGEQUERY ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index d4c3d0190..c9afb704b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -107,7 +107,7 @@ public abstract class AbstractAcsTask { /** * */ - public JSONObject immediateNotifyAcs() { + public JSONObject immediateNotifyAcs(String task_id) { List taskList = this.schedule(); if (ObjectUtil.isNotEmpty(taskList)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 7a7806550..e8f3074eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -1761,7 +1761,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } } // 下发 - outTask.immediateNotifyAcs(); + outTask.immediateNotifyAcs(null); } } diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue index 185b5022a..5922c66be 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue @@ -21,22 +21,35 @@ @keyup.enter.native="crud.toQuery" /> - - + - - + class="filter-item" + @keyup.enter.native="crud.toQuery" + /> + + + + + + - + - - - + + + + + + +