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'
---
Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs b/Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs
index 0491508..8a99d5e 100644
--- a/Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs
@@ -8,9 +8,11 @@
public class WcsPositionService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WcsPosition> _WcsPositionRep;
- public WcsPositionService(SqlSugarRepository<WcsPosition> WcsPositionRep)
+ private readonly SqlSugarRepository<WcsPlc> _wcsPlcRep;
+ public WcsPositionService(SqlSugarRepository<WcsPosition> WcsPositionRep, SqlSugarRepository<WcsPlc> wcsPlcRep)
{
_WcsPositionRep = WcsPositionRep;
+ _wcsPlcRep = wcsPlcRep;
}
/// <summary>
@@ -32,6 +34,7 @@
var query = _WcsPositionRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.Text.Contains(input.SearchKey)
+ || u.StationNum.Contains(input.SearchKey)
)
.WhereIF(input.DeviceId > 0, u => u.DeviceId == input.DeviceId)
.WhereIF(!string.IsNullOrWhiteSpace(input.Text), u => u.Text.Contains(input.Text.Trim()))
@@ -145,7 +148,22 @@
).ToListAsync();
}
-
+ /// <summary>
+ /// 鑾峰彇璁惧ID鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [ApiDescriptionSettings(Name = "WcsPlcIdDropdown"), HttpGet]
+ [DisplayName("鑾峰彇璁惧ID鍒楄〃")]
+ public async Task<dynamic> WcsPlcIdDropdown()
+ {
+ return await _wcsPlcRep.Context.Queryable<WcsPlc>()
+ .Select(u => new
+ {
+ Label = u.Text,
+ Value = u.Id
+ }
+ ).ToListAsync();
+ }
}
--
Gitblit v1.8.0