From 8bc65cd3363d7148c356fe2eecca3590a9a3b4e0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期二, 21 十月 2025 09:34:41 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index f118c60..7206108 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -11,6 +11,7 @@
{
private readonly SqlSugarRepository<WcsPlc> _wcsPlcRep;
private readonly SysCacheService _sysCacheService;
+ private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
public WcsPlcService(SqlSugarRepository<WcsPlc> wcsPlcRep, SysCacheService sysCacheService)
{
_wcsPlcRep = wcsPlcRep;
@@ -139,6 +140,38 @@
var modService = new { PLCTaskAction.boRunningState, PLCTaskAction.boOffline, PLCTaskAction.boRefresh, PLCTaskAction.boDemo, PLCTaskAction.boDrumReversal, PLCTaskAction.boOutLock, PLCTaskAction.boEnterLock };
return new { listPlc, modService };
}
+
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "GetCarDL")]
+ [DisplayName("鑾峰彇绌挎杞︾數閲�")]
+ public async Task<dynamic> GetCarDL()
+ {
+ var listPlc = await _wcsPlcRep.AsQueryable()
+ .Where(s => s.Type == PLCTypeEnum.ShuttleCar)
+ .ToListAsync();
+
+ List<Dictionary<string, string>> _dicList = new List<Dictionary<string, string>>();
+ foreach (var modPlc in listPlc)
+ {
+ var modbus = new ModbusUtil(modPlc);
+ var listPlcDevice = _db.Queryable<WcsDevice>().First(s => s.PlcId == modPlc.Id);
+ var (result, value) = modbus.GetDBValue(listPlcDevice.PosType, listPlcDevice.PlcPos);
+ if (result.IsSucceed)
+ {
+ var listPlcStation = _db.Queryable<WcsPosition>().Where(s => s.DeviceId == listPlcDevice.Id).ToList();
+ var modCarDl = listPlcStation.FirstOrDefault(s => s.Text == "鐢垫睜鐢甸噺");
+ var (resultDl, valueDl) = modbus.GetDBValue(modCarDl.PosType, modCarDl.PlcPos);
+ if (resultDl.IsSucceed)
+ {
+ Dictionary<string, string> _dic = new Dictionary<string, string>();
+ _dic.Add(modPlc.Text, Convert.ToString(valueDl));
+
+ _dicList.Add(_dic);
+ }
+ }
+ }
+ return new { _dicList };
+ }
/// <summary>
/// 鑾峰彇浣嶇疆淇℃伅
/// </summary>
--
Gitblit v1.8.0