From 75a1cfdc9b88519fa7a2af57e8b7d615c063b656 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 04 九月 2024 11:28:50 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Hub/IPlcHub.cs | 14 ++
Web/src/views/device/deviceInfo/index.vue | 102 ++++++++++++++------
Admin.NET/WCS.Application/Entity/WcsDevice.cs | 20 +++-
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 20 ++++
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 104 ++++++++++++++++++++
Web/src/api/wcs/wcsPlc.ts | 9 +
6 files changed, 230 insertions(+), 39 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsDevice.cs b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
index c1675c9..fec62ff 100644
--- a/Admin.NET/WCS.Application/Entity/WcsDevice.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
@@ -4,8 +4,8 @@
/// <summary>
/// 璁惧淇℃伅琛�
/// </summary>
-[SugarTable("WCSPLCDevice","璁惧淇℃伅琛�")]
-public class WcsDevice : EntityBaseData
+[SugarTable("WCSPLCDevice", "璁惧淇℃伅琛�")]
+public class WcsDevice : EntityBaseData
{
/// <summary>
/// PlcId
@@ -62,17 +62,27 @@
[Required]
[SugarColumn(ColumnName = "PosType", ColumnDescription = "娴佺▼瀛楃被鍨�")]
public PLCDataTypeEnum PosType { get; set; }
-
+
/// <summary>
/// 鏄剧ず灞廼p鍦板潃
/// </summary>
[SugarColumn(ColumnName = "LedIP", ColumnDescription = "鏄剧ず灞廼p鍦板潃", Length = 50)]
public string? LedIP { get; set; }
-
+
/// <summary>
/// 鎻忚堪
/// </summary>
[SugarColumn(ColumnName = "Text", ColumnDescription = "鎻忚堪", Length = 20)]
public string? Text { get; set; }
-
+
+ /// <summary>
+ /// 浣嶇疆鏈夌墿鍝�
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public bool BoHaveItem { get; set; }
+ /// <summary>
+ /// 楂樺害
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public int BoxHeight { get; set; }
}
diff --git a/Admin.NET/WCS.Application/Hub/IPlcHub.cs b/Admin.NET/WCS.Application/Hub/IPlcHub.cs
index e3a92ab..e1db5de 100644
--- a/Admin.NET/WCS.Application/Hub/IPlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/IPlcHub.cs
@@ -33,5 +33,19 @@
/// </summary>
/// <param name="context"></param>
Task UpdateService(PLCServiceModel context);
+
+ /// <summary>
+ /// 涓嬪彂鎺у埗鍙颁綅缃俊鎭�
+ /// </summary>
+ /// <param name="context"></param>
+ /// <returns></returns>
+ Task PublicPosition(PlcPositionInfo context);
+ }
+ public class PlcPositionInfo
+ {
+ public string StationNum { get; set; }
+ public bool BoHaveItem { get; set; }
+ public PLCTypeEnum Type { get; set; }
+ public int BoxHeight { get; set; }
}
}
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 9576ac4..08cbcc6 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -13,6 +13,8 @@
//鑷埛鏂�
public static bool boRefresh = false;
+ public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();
+
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
@@ -65,6 +67,7 @@
StartRead();
ConnectionStatus();
StartWatchAlarm();
+ StartWatchPosition();
}
/// <summary>
/// 寮�鍚鍙杙lc绾跨▼
@@ -232,11 +235,11 @@
var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcId.ToString());
foreach (var modAlarm in listAlarm)
{
- (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, modAlarm.AlarmCode, "");
+ (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Bit, modAlarm.AlarmCode, "");
if (result.IsSucceed)
{
//鍋囪涓嶄负0灏辩畻鎶ヨ
- if (value != 0)
+ if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.N)
{
//淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
modAlarm.AlarmTime = DateTime.Now;
@@ -248,7 +251,7 @@
_plcHubContext.Clients.All.PublicAlarm(modAlarm.Adapt<WcsAlarmInfoOutput>());
}
//鍙栨秷鎶ヨ
- else if (modAlarm.Status == YesNoEnum.Y)
+ else if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.Y)
{
modAlarm.AlarmTime = null;
modAlarm.Status = YesNoEnum.N;
@@ -263,6 +266,101 @@
}, cts.Token);
}
/// <summary>
+ /// 寮�鍚綅缃洃鎺�
+ /// </summary>
+ public static void StartWatchPosition()
+ {
+ Task.Run(() =>
+ {
+ while (true)
+ {
+ //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
+ if (cts.Token.IsCancellationRequested)
+ {
+ foreach (var modPlcUtil in listPlcUtil)
+ {
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
+ }
+ break;
+ //throw new OperationCanceledException();
+ }
+ try
+ {
+ foreach (var modPlcUtil in listPlcUtil)
+ {
+ if (modPlcUtil == null)
+ break;
+ var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList();
+ foreach (var modDevice in listDevice)
+ {
+ var modPlc = listPlc.FirstOrDefault(s => s.Id == modDevice.PlcId);
+ (var result, var value) = modPlcUtil.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
+ if (result.IsSucceed)
+ {
+ if (modPlc.Type == PLCTypeEnum.ConveyorLine)
+ {
+ //鍋囪涓嶄负0灏辩畻鏈変笢瑗�
+ if (value != 0 && !modDevice.BoHaveItem)
+ {
+ modDevice.BoHaveItem = true;
+ //涓嬪彂鐘舵��
+ var modInfo = new PlcPositionInfo() { StationNum = modDevice.StationNum, BoHaveItem = true };
+ _plcHubContext.Clients.All.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
+ else if (value == 0 && modDevice.BoHaveItem)
+ {
+ modDevice.BoHaveItem = false;
+ //涓嬪彂鐘舵��
+ var modInfo = new PlcPositionInfo()
+ {
+ StationNum = modDevice.StationNum,
+ BoHaveItem = false,
+ Type = modPlc.Type,
+ };
+ _plcHubContext.Clients.All.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
+ }
+ else if (modPlc.Type == PLCTypeEnum.StackingMachine)
+ {
+ //todo:杩欓噷鐨勯珮搴﹀彲鑳介渶瑕佸墠绔睍绀哄�煎拰plc鐨勫�艰繘琛屼竴涓崲绠�
+ var BoxHeight = Convert.ToInt32(value);
+ if (value != 0 && modDevice.BoxHeight != BoxHeight)
+ {
+ modDevice.BoxHeight = BoxHeight;
+ //涓嬪彂鐘舵��
+ var modInfo = new PlcPositionInfo() { StationNum = modDevice.StationNum, BoxHeight = BoxHeight };
+ _plcHubContext.Clients.All.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
+ }
+ }
+
+ }
+ }
+ }
+ catch (Exception)
+ {
+
+ }
+ }
+ });
+ }
+ private static void UpdatePosition(PlcPositionInfo modInfo)
+ {
+ var modTemp = listPositionInfo.FirstOrDefault(s => s.StationNum == modInfo.StationNum);
+ if (modTemp == null)
+ {
+ listPositionInfo.Add(modInfo);
+ }
+ else
+ {
+ modTemp.BoHaveItem = modInfo.BoHaveItem;
+ }
+ }
+ /// <summary>
/// 鍋滄鏈嶅姟
/// </summary>
public static void Stop()
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index ae15fb6..6eff76c 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -138,5 +138,25 @@
var modService = new { PLCTaskAction.boRunningState, PLCTaskAction.boOffline, PLCTaskAction.boRefresh };
return new { listPlc, modService };
}
+ /// <summary>
+ /// 鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "ListPosition")]
+ [DisplayName("鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ")]
+ public List<PlcPositionInfo> ListPosition()
+ {
+ //娴嬭瘯鐢�
+ //return new List<PlcPositionInfo>()
+ //{
+ // new PlcPositionInfo(){ Type=PLCTypeEnum.ConveyorLine, StationNum="147", BoHaveItem=true },
+ // new PlcPositionInfo(){ Type=PLCTypeEnum.ConveyorLine, StationNum="143", BoHaveItem=true },
+ // new PlcPositionInfo(){ Type=PLCTypeEnum.StackingMachine, StationNum="002", BoxHeight=30 },
+ //};
+
+ var list = PLCTaskAction.listPositionInfo.ToList();
+ return list;
+ }
}
diff --git a/Web/src/api/wcs/wcsPlc.ts b/Web/src/api/wcs/wcsPlc.ts
index 22483d2..9c8386a 100644
--- a/Web/src/api/wcs/wcsPlc.ts
+++ b/Web/src/api/wcs/wcsPlc.ts
@@ -5,7 +5,8 @@
UpdateWcsPlc = '/api/wcsPlc/update',
PageWcsPlc = '/api/wcsPlc/page',
DetailWcsPlc = '/api/wcsPlc/detail',
- ListStatus='/api/wcsPlc/ListStatus'
+ ListStatus = '/api/wcsPlc/ListStatus',
+ ListPosition = 'api/wcsPlc/ListPosition'
}
// 澧炲姞PLC
@@ -56,3 +57,9 @@
method: 'get'
});
+// 鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ
+export const listPosition = () =>
+ request({
+ url: Api.ListPosition,
+ method: 'get'
+ });
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 3d13bff..28b3860 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -37,9 +37,9 @@
</el-col>
<el-col :span="21">
<div class="card-page">
- <el-button type="primary" :plain="isPlain1" @click="floorTogglePlain(1)">涓�灞傚钩闈�</el-button>
- <el-button type="primary" :plain="isPlain2" @click="floorTogglePlain(2)">浜屽眰骞抽潰</el-button>
- <el-button type="primary" :plain="isPlain3" @click="floorTogglePlain(3)">涓夊眰骞抽潰</el-button>
+ <el-button type="primary" :plain="floorStates.isPlain1" @click="floorTogglePlain(1)">涓�灞傚钩闈�</el-button>
+ <el-button type="primary" :plain="floorStates.isPlain2" @click="floorTogglePlain(2)">浜屽眰骞抽潰</el-button>
+ <el-button type="primary" :plain="floorStates.isPlain3" @click="floorTogglePlain(3)">涓夊眰骞抽潰</el-button>
</div>
<div style="margin: 40px; height: 50%;">
<div class="grid-container-line">
@@ -71,7 +71,7 @@
<script lang="ts" setup>
import { ref, reactive, onMounted } from 'vue';
-import { listStatus } from '/@/api/wcs/wcsPlc';
+import { listStatus, listPosition } from '/@/api/wcs/wcsPlc';
import { signalR } from './signalR';
const state = ref<any>({});
@@ -83,6 +83,24 @@
state.value = res.data.result.modService;
stackers.value = res.data.result.listPlc.filter(s => s.type == 0);
conveyors.value = res.data.result.listPlc.filter(s => s.type == 1 || s.type == 4);
+
+ var res2 = await listPosition();
+ res2.data.result.forEach(s => {
+ if (s.type == 0) {
+ // 鏇存柊鍫嗗灈鏈烘暟鎹�
+ const foundCell = cellsDataLine.value.find(cell => cell.Code === s.stationNum);
+ if (foundCell) {
+ //淇敼楂樺害
+ foundCell.BoxHeight = s.boxHeight;
+ }
+ }
+ else if (s.type == 1) {
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCellData(cellsDataOne, s);
+ updateCellData(cellsDataTwo, s);
+ updateCellData(cellsDataThree, s);
+ }
+ });
};
handleQuery();
@@ -110,19 +128,46 @@
signalR.on('UpdateService', (data: any) => {
state.value = data;
});
+ signalR.off('PublicPosition');
+ signalR.on('PublicPosition', (data: any) => {
+
+ if (data.type == 1) {
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCellData(cellsDataOne, data);
+ updateCellData(cellsDataTwo, data);
+ updateCellData(cellsDataThree, data);
+ }
+ else if (data.type == 0) {
+ // 鏇存柊鍫嗗灈鏈烘暟鎹�
+ const foundCell = cellsDataLine.value.find(cell => cell.Code === data.stationNum);
+ if (foundCell) {
+ //淇敼楂樺害
+ foundCell.BoxHeight = data.boxHeight;
+ }
+ }
+ });
});
const handleSwitchChange = (field: string, value: boolean) => {
- signalR.invoke('UpdateService',state.value);
+ signalR.invoke('UpdateService', state.value);
};
+// 鏇存柊杈撻�佺嚎鏁版嵁鐨勯�氱敤鍑芥暟
+function updateCellData(cellsData: any[], data: any) {
+ const foundCell = cellsData.find(cell => cell.Code === data.stationNum);
+ if (foundCell) {
+ if (data.boHaveItem) {
+ foundCell.IsUse = 1;
+ }
+ else {
+ foundCell.IsUse = 0;
+ }
+ }
+}
const activeName = ['1', '2', '3'];
-const value1 = ref(false);
-const value2 = ref(false);
-const value3 = ref(false);
//鍫嗗灈鏈烘暟鎹�
-const cellsDataLine = [
+const cellsDataLine = ref([
{ Id: 1, Code: '001', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 2, Code: '002', LineCode: '01', EndLocat: '01010101', IsShow: 0, IsUse: 0, BoxHeight: 10 },
{ Id: 3, Code: '003', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
@@ -174,7 +219,7 @@
{ Id: 49, Code: '049', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 50, Code: '050', LineCode: '10', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
{ Id: 51, Code: '051', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
-];
+]);
//涓�灞傝緭閫佺嚎鏁版嵁
const cellsDataOne = [
@@ -1924,29 +1969,26 @@
//杈撻�佺嚎鏁版嵁
let cellsData = ref(cellsDataOne);
-const isPlain1 = ref(false);//涓�灞�
-const isPlain2 = ref(true);//浜屽眰
-const isPlain3 = ref(true);//涓夊眰
+
+// 灞傚钩闈㈢姸鎬�
+const floorStates = ref({
+ isPlain1: false,
+ isPlain2: true,
+ isPlain3: true
+});
+
//鍒囨崲灞傚钩闈�
function floorTogglePlain(buttonNumber) {
- if (buttonNumber === 1) {
- isPlain1.value = !isPlain1.value;
- isPlain2.value = true;
- isPlain3.value = true;
+ const floorData = [cellsDataOne, cellsDataTwo, cellsDataThree];
- cellsData.value = cellsDataOne;
- } else if (buttonNumber === 2) {
- isPlain2.value = !isPlain2.value;
- isPlain1.value = true;
- isPlain3.value = true;
-
- cellsData.value = cellsDataTwo;
- } else if (buttonNumber === 3) {
- isPlain3.value = !isPlain3.value;
- isPlain1.value = true;
- isPlain2.value = true;
-
- cellsData.value = cellsDataThree;
+ if (buttonNumber >= 1 && buttonNumber <= 3) {
+ const index = buttonNumber - 1;
+ floorStates.value = {
+ isPlain1: index !== 0,
+ isPlain2: index !== 1,
+ isPlain3: index !== 2
+ };
+ cellsData.value = floorData[index];
}
}
</script>
--
Gitblit v1.8.0