From a95c4e748b01da8bea6ba0f8e6af9c281bc582d7 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期二, 29 七月 2025 09:22:13 +0800 Subject: [PATCH] 优化日志格式并增强库存查询逻辑在 CommonConveyorLineJob.cs和CommonConveyorLine_GWJob.cs文件中,修改了日志输出格式,添加了时间戳以提高可读性和可追溯性。部分代码中的ToJsonString()方法被替换为 Serialize()方法,以统一序列化方式。与此同时,在 Dt_TaskService.cs文件中增加了库存信息查询逻辑,以确保出库时能够正确处理库存条件,增强系统的健壮性。 --- Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 4 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue index 520ee72..2e660c2 100644 --- a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue +++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue @@ -1,9 +1,61 @@ <template> - <div> - 甯告俯搴� - </div> + <el-row> + <el-col :span="3"> + <device-stacker v-for="stacker in Stackers" :key="stacker.deviceName" :Stacker="stacker"></device-stacker> + </el-col> + <el-col :span="21"> + <DeviceLineVo v-for="device in devices" :key="device.deviceName" :device="device" /> + </el-col> + </el-row> </template> <script setup> +import { onMounted, ref, reactive, toRaw } from "vue"; +import eventBus from "@/uitils/eventBus"; +import DeviceLineVo from "@/components/DeviceLineVo.vue"; +import DeviceStacker from "@/components/DeviceStacker.vue"; +// 鍫嗗灈鏈� +const Stackers = reactive([]); +var i = 0; +// 璁惧鍒楄〃锛堜慨鏀归噸澶嶈澶囧悕绉帮級 +const devices = reactive([]); +const num = reactive([]) +onMounted(() => { + eventBus.on('locationData', eventData => { + // console.log(eventData) + console.log(eventData) -</script> \ No newline at end of file + 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) { + device.data = eventData.data + } else { + devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode }); + } + } + + } + }) + eventBus.on('stackerData', eventData => { + if (eventData.deviceName.indexOf("甯告俯") != -1) { + if (Stackers.length == 0) { + Stackers.push({ deviceName: eventData.deviceName, data: eventData.data }); + } + else { + const Stacker = Stackers.find(c => c.deviceName == eventData.deviceName); + if (Stacker) { + Stacker.data = eventData.data + } + else { + Stackers.push({ deviceName: eventData.deviceName, data: eventData.data }); + } + } + } + }) +}) +</script> +<style scoped></style> \ No newline at end of file -- Gitblit v1.9.3