From 8b0d749cfbec8bf0afe71a8956bfeeed6f27cdfc Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 16 一月 2025 15:32:30 +0800
Subject: [PATCH] Merge branch 'csc'
---
Web/src/views/device/deviceInfo/index.vue | 14 ++++++++++++++
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 5 +++++
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs | 10 ++++++++++
3 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index 8bcd3a2..9414df3 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -361,6 +361,16 @@
/// </summary>
public string EndCeng { get; set; }
+
+ /// <summary>
+ /// 缂犺啘浜や簰
+ /// </summary>
+ public string ChanMo { get; set; }
+ /// <summary>
+ /// 鎷嗘ā浜や簰
+ /// </summary>
+ public string ChaiMo { get; set; }
+
}
public class WcsDeviceStartStop
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index c0c19d2..aef96fc 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -168,6 +168,11 @@
var (result11, value11) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "48");
data.EndCeng = value11.ToString();
+ var (result12, value12) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Byte, DbNum, "50");
+ data.ChanMo = value12.ToString();
+ var (result13, value13) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Byte, DbNum, "51");
+ data.ChaiMo = value13.ToString();
+
modUtil.Close();
return data;
}
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 4965b80..3dd560a 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -185,6 +185,16 @@
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="缂犺啘淇″彿">
+ <el-input v-model="stationValue.chanMo" disabled style="width: 200px; margin-right: 10px;"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎷嗚啘淇″彿">
+ <el-input v-model="stationValue.chaiMo" disabled style="width: 200px; margin-right: 10px;"></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -232,6 +242,10 @@
endPai:'',
endLie:'',
endCeng:'',
+
+ chanMo:'',
+ chaiMo:'',
+
});
--
Gitblit v1.8.0