From 66da0f6808fa8496a3216c94973a552389ab96ba Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:27:25 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 19 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 9c8e36d..9c32c01 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -28,19 +28,20 @@
input.Field = "u.Id";
input.Order = "desc";
}
- input.SearchKey = input.SearchKey?.Trim();
+ input.SearchKey = input.SearchKey?.Trim();
var query = _wcsDeviceRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.Text.Contains(input.SearchKey)
)
- .WhereIF(input.PlcId>0, u => u.PlcId == input.PlcId)
+ .WhereIF(input.PlcId > 0, u => u.PlcId == input.PlcId)
.WhereIF(!string.IsNullOrWhiteSpace(input.Text), u => u.Text.Contains(input.Text.Trim()))
//澶勭悊澶栭敭鍜孴reeSelector鐩稿叧瀛楁鐨勮繛鎺�
- .LeftJoin<WcsPlc>((u, plcid) => u.PlcId == plcid.Id )
+ .LeftJoin<WcsPlc>((u, plcid) => u.PlcId == plcid.Id)
.Select((u, plcid) => new WcsDeviceOutput
{
Id = u.Id,
- PlcId = u.PlcId,
+ PlcId = u.PlcId,
+ DeviceType = (DeviceTypeEnum)u.DeviceType,
PlcIdIP = plcid.IP,
Level = (DeviceLevelEnum)u.Level,
DbNumber = u.DbNumber,
@@ -60,7 +61,7 @@
CreateOrgName = u.CreateOrgName,
IsDelete = u.IsDelete,
});
- return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+ return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
@@ -121,19 +122,6 @@
}
/// <summary>
- /// 鑾峰彇璁惧淇℃伅鍒楄〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "List")]
- [DisplayName("鑾峰彇璁惧淇℃伅鍒楄〃")]
- public async Task<List<WcsDeviceOutput>> List([FromQuery] PageWcsDeviceInput input)
- {
- return await _wcsDeviceRep.AsQueryable().Select<WcsDeviceOutput>().ToListAsync();
- }
-
- /// <summary>
/// 鑾峰彇PlcId鍒楄〃
/// </summary>
/// <returns></returns>
@@ -150,7 +138,78 @@
).ToListAsync();
}
+ /// <summary>
+ /// 鐢熸垚鐐逛綅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "GeneratePos")]
+ [DisplayName("鐢熸垚鐐逛綅")]
+ public async Task GeneratePos(GeneratePosInput input)
+ {
+ var modDevice = await _wcsDeviceRep.GetByIdAsync(input.Id);
+
+ var listPosition = new List<WcsPosition>();
+ listPosition.Add(new WcsPosition()
+ {
+ DeviceId = modDevice.Id,
+ StationNum = modDevice.StationNum,
+ PlcPos = input.Pos.ToString(),
+ PosType = PLCDataTypeEnum.String,
+ Text = "TaskNo"
+ });
+ listPosition.Add(new WcsPosition()
+ {
+ DeviceId = modDevice.Id,
+ StationNum = modDevice.StationNum,
+ PlcPos = (input.Pos + 4).ToString(),
+ PosType = PLCDataTypeEnum.UShort,
+ Text = "TaskType"
+ });
+ listPosition.Add(new WcsPosition()
+ {
+ DeviceId = modDevice.Id,
+ StationNum = modDevice.StationNum,
+ PlcPos = (input.Pos + 6).ToString(),
+ PosType = PLCDataTypeEnum.UShort,
+ Text = "StartLocatNo"
+ });
+ listPosition.Add(new WcsPosition()
+ {
+ DeviceId = modDevice.Id,
+ StationNum = modDevice.StationNum,
+ PlcPos = (input.Pos + 8).ToString(),
+ PosType = PLCDataTypeEnum.UShort,
+ Text = "EndLocatNo"
+ });
+
+ await _wcsDeviceRep.Context.Insertable(listPosition).ExecuteCommandAsync();
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧淇℃伅鍒楄〃
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "List")]
+ [DisplayName("鑾峰彇璁惧淇℃伅鍒楄〃")]
+ public async Task<List<WcsDeviceOutput>> List([FromQuery] PageWcsDeviceInput input)
+ {
+ var list = await _wcsDeviceRep.AsQueryable()
+ .LeftJoin<WcsPlc>((a, b) => a.PlcId == b.Id)
+ .Select<WcsDeviceOutput>((a, b) => new WcsDeviceOutput() { Type = b.Type }, true)
+ .ToListAsync();
+ //鑾峰彇璺烘満鐨勭姸鎬�
+ var listConn = PLCTaskAction.listPlcConn;
+ foreach (var modDevice in list)
+ {
+ var modUtil = listConn.FirstOrDefault(s => s != null && s.PlcId == modDevice.PlcId);
+ modDevice.Status = modUtil == null ? false : modUtil.Connected;
+ }
-
+ return list;
+ }
}
--
Gitblit v1.8.0