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/basicinfo/Dt_needBarcode.vue | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
index 5359a18..287deaa 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
@@ -24,43 +24,46 @@
sortName: "AreaCode"
});
const editFormFields = ref({
- // "toArea": "",
- // "fromArea": "",
- // "barcodeType": "",
+ "id":"",
+ "toArea": "",
+ "fromArea": "",
+ "barcodeType": "",
"productLine": "",
"inLineNum": "",
"cacheNum":""
});
const editFormOptions = ref([
- // [
- // { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
- // { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
- // { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
- // ],
[
- { "title": "鎵�灞炰骇绾�", "field": "productLine", type: "text" },
{ "title": "鍦ㄩ�旀暟閲�", "field": "inLineNum", type: "text" },
{ "title": "鍙紦瀛樻暟閲�", "field": "cacheNum", type: "text" },
]
]);
- const searchFormFields = ref({});
+ const searchFormFields = ref({
+ "iD":"",
+ "toArea": "",
+ "fromArea": "",
+ "barcodeType": "",
+ "productLine": "",
+ "inLineNum": "",
+ "cacheNum":""
+ });
const searchFormOptions = ref([
- // [
- // { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
- // { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
- // { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
- // ],
+ [
+ { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
+ { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
+ { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
+ ],
[
{ "title": "鎵�灞炰骇绾�", "field": "productLine", type: "text" },
{ "title": "鍦ㄩ�旀暟閲�", "field": "inLineNum", type: "text" },
{ "title": "鍙紦瀛樻暟閲�", "field": "cacheNum", type: "text" },
]
]);
- const columns = ref([{ field: 'ID', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
- //{ field: 'toArea', title: '鐩爣搴撳尯', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
- //{ field: 'fromArea', title: '鏉ユ簮搴撳尯', type: 'string', sort: true, width: 110, align: 'left' },
- //{ field: 'barcodeType', title: '鎵樼洏绫诲瀷', type: 'string', sort: true, width: 110, align: 'left' },
- { field: 'productLine', title: '鎵�灞炰骇绾�', type: 'string', sort: true, width: 110, align: 'left',},
+ const columns = ref([{ field: 'iD', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
+ { field: 'toArea', title: '鐩爣搴撳尯', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
+ { field: 'fromArea', title: '鏉ユ簮搴撳尯', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'barcodeType', title: '鎵樼洏绫诲瀷', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'productLine', title: '鎵�灞炰骇绾�', type: 'string', sort: true, width: 110, align: 'left',bind: { key: "ProductionLine", data: [] } },
{ field: 'inLineNum', title: '鍦ㄩ�旀暟閲�', type: 'int', sort: true, width: 110, align: 'left' },
{ field: 'cacheNum', title: '鍙紦瀛樻暟閲�', type: 'int', sort: true, width: 100, align: 'left' },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
--
Gitblit v1.9.3