From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index 65e0050..f306f76 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -26,8 +26,23 @@
url: "/Task/",
sortName: "CreateDate",
});
- const editFormFields = ref({});
- const editFormOptions = ref([]);
+ const editFormFields = ref({
+ taskNum:"",
+ palletCode: "",
+ roadway: "",
+ taskType:"",
+ taskState:"",
+ wMSId:"",
+ sourceAddress: "",
+ targetAddress: "",
+ currentAddress: "",
+ nextAddress: "",
+ creater: "",
+ createDate: "",
+ grade: "",
+ productionLine:""
+ });
+ const editFormOptions = ref([[{ title: "浼樺厛绾�", field: "grade", type: "int" },]]);
const searchFormFields = ref({
taskNum: "",
palletCode: "",
@@ -42,7 +57,7 @@
const searchFormOptions = ref([
[
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
- { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode", type: "text" },
{
title: "浠诲姟绫诲瀷",
field: "taskType",
@@ -59,15 +74,15 @@
},
],
[
- { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
- { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
- { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
+ { title: "璧峰鍦板潃", field: "sourceAddress", type: "text" },
+ { title: "鐩爣鍦板潃", field: "targetAddress", type: "text" },
+ { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "text" },
+ { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "text" },
],
[
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ { title: "宸烽亾鍙�", field: "roadway", type: "text" },
{ "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ { title: "鍒涘缓浜�", field: "creater", type: "text" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -152,7 +167,8 @@
title: "浜х嚎",
type: "string",
width: 70,
- align: "left",
+ align: "left",
+ bind: { key: "ProductionLine", data: [] }
},
{
field: "exceptionMessage",
--
Gitblit v1.9.3