From 64274de013b172d31d6cda1349786e5c165cf79f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 05 九月 2024 16:55:45 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index 6eff76c..e4fce43 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -106,7 +106,7 @@
[DisplayName("鑾峰彇PLC鍒楄〃")]
public async Task<List<WcsPlcOutput>> List([FromQuery] PageWcsPlcInput input)
{
- return await _wcsPlcRep.AsQueryable().Select<WcsPlcOutput>().ToListAsync();
+ return await _wcsPlcRep.AsQueryable().WhereIF(input.Type != null, s => s.Type == input.Type).Select<WcsPlcOutput>().ToListAsync();
}
/// <summary>
@@ -124,9 +124,9 @@
.ToListAsync();
foreach (var modPlc in listPlc)
{
- if (_sysCacheService.ExistKey("PlcConn" + modPlc.Id))
+ if (_sysCacheService.ExistKey("PLCCONN:" + modPlc.Id))
{
- var cachePlc = _sysCacheService.Get<WcsPlc>("PlcConn" + modPlc.Id);
+ var cachePlc = _sysCacheService.Get<WcsPlc>("PLCCONN:" + modPlc.Id);
modPlc.IsConn = cachePlc.IsConn;
}
else
@@ -139,23 +139,14 @@
return new { listPlc, modService };
}
/// <summary>
- /// 鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ
+ /// 鑾峰彇浣嶇疆淇℃伅
/// </summary>
/// <returns></returns>
[HttpGet]
[ApiDescriptionSettings(Name = "ListPosition")]
- [DisplayName("鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ")]
+ [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;
}
--
Gitblit v1.8.0