From 70cdea5f6e57d1ebc29c25ef60f311fadca6ab21 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 26 九月 2024 19:10:18 +0800
Subject: [PATCH] Merge branch 'wxw'
---
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 bd4ff21..8c1f777 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>
@@ -45,6 +47,7 @@
StationNum = u.StationNum,
PlcPos = u.PlcPos,
PosType = u.PosType,
+ StringLength = u.StringLength,
LedIP = u.LedIP,
Text = u.Text,
CreateUserId = u.CreateUserId,
@@ -144,7 +147,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