From 70b4bdc6f999c55b75138e013abf436100e9987b Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期一, 23 六月 2025 15:33:16 +0800
Subject: [PATCH] 修改手自动
---
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index 6eff76c..7aa3764 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -30,11 +30,12 @@
input.SearchKey = input.SearchKey?.Trim();
var query = _wcsPlcRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
- u.IP.Contains(input.SearchKey)
+ u.IP.Contains(input.SearchKey) && u.Text.Contains(input.SearchKey)
)
.WhereIF(input.PLCType.HasValue, u => u.PLCType == input.PLCType)
.WhereIF(!string.IsNullOrWhiteSpace(input.IP), u => u.IP.Contains(input.IP.Trim()))
.WhereIF(input.Type.HasValue, u => u.Type == input.Type)
+ .WhereIF(input.Enable.HasValue, u => u.Enable == input.Enable)
.Select<WcsPlcOutput>();
return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
@@ -106,7 +107,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 +125,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
@@ -135,27 +136,18 @@
}
}
//鏈嶅姟鐘舵��
- var modService = new { PLCTaskAction.boRunningState, PLCTaskAction.boOffline, PLCTaskAction.boRefresh };
+ var modService = new { PLCTaskAction.boRunningState, PLCTaskAction.boOffline, PLCTaskAction.boRefresh, PLCTaskAction.boDemo, PLCTaskAction.boDrumReversal, PLCTaskAction.boOutLock, PLCTaskAction.boEnterLock };
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