From 7bb43fd6a2d62060c2f622e8d9396329ebaf4794 Mon Sep 17 00:00:00 2001 From: hwh <332078369@qq.com> Date: 星期四, 05 九月 2024 11:17:02 +0800 Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6 --- Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs index 8a5e853..7b91e7e 100644 --- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs +++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs @@ -271,4 +271,27 @@ return list; } + + #region 鍒嗘嫞鐮佸灈 + /// <summary> + /// 鑾峰彇鐮佸灈鏈哄櫒浜哄拰鎷嗗灈鏈哄櫒浜哄垪琛� + /// </summary> + /// <returns></returns> + [HttpGet] + [ApiDescriptionSettings(Name = "WcsPackPlcList")] + [DisplayName("鑾峰彇鐮佸灈鏈哄櫒浜哄拰鎷嗗灈鏈哄櫒浜哄垪琛�")] + public async Task<dynamic> WcsPackPlcList() + { + return await _wcsDeviceRep.Context.Queryable<WcsPlc>() + .Where(w => w.Type == PLCTypeEnum.RobotPalletizer || w.Type == PLCTypeEnum.StackingRobot) + .OrderBy(o => o.Type) + .Select(u => new + { + id = u.Id, + name = u.Text + } + ).ToListAsync(); + } + + #endregion } -- Gitblit v1.8.0