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/Devicestatus/Craftlibrary/Volume.vue | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue index cf2b85a..e6efdac 100644 --- a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue +++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue @@ -15,28 +15,30 @@ import DeviceStacker from "@/components/DeviceStacker.vue"; // 鍫嗗灈鏈� const Stackers = reactive([]); -var i=0; +var i = 0; // 璁惧鍒楄〃锛堜慨鏀归噸澶嶈澶囧悕绉帮級 const devices = reactive([]); const num = reactive([]) onMounted(() => { - eventBus.on('stackerData', eventData => { - if (eventData.deviceName === "鍒嗗3绾垮叆搴撹緭閫佺嚎"||eventData.deviceName === "鍒嗗鍑哄簱杈撻�佺嚎") { - if (devices.length <= 0) { + eventBus.on('locationData', eventData => { + if (eventData.deviceName.indexOf("鍒嗗") != -1) { + if (devices.length <= 0) { devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode }); } else { const device = devices.find(c => c.childDeviceCode == eventData.data.childDeviceCode) - if(device){ + if (device) { device.data = eventData.data - }else{ + } else { devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode }); } } } }) eventBus.on('stackerData', eventData => { - if (eventData.deviceName == "鍒嗗3鍙峰爢鍨涙満"||eventData.deviceName == "鍒嗗2鍙峰爢鍨涙満") { + // if (eventData.deviceName == "鍒嗗3鍙峰爢鍨涙満"||eventData.deviceName == "鍒嗗2鍙峰爢鍨涙満") { + console.log(eventData.deviceName) + if (eventData.deviceName.indexOf("鍒嗗") != -1) { if (Stackers.length == 0) { Stackers.push({ deviceName: eventData.deviceName, data: eventData.data }); } @@ -53,6 +55,4 @@ }) }) </script> -<style scoped> - -</style> \ No newline at end of file +<style scoped></style> \ No newline at end of file -- Gitblit v1.9.3