From dd973f741617e3bbf5ecf11747ff71960991549c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 15 十月 2024 10:21:19 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 341 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 324 insertions(+), 17 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 7b91e7e..612c67d 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -1,6 +1,9 @@
锘�
using Admin.NET.Core.Service;
using Elastic.Clients.Elasticsearch;
+using StackExchange.Profiling.Internal;
+using WCS.Application.Entity;
+using WCS.Application.Service.WcsDevice.Dto;
namespace WCS.Application;
@@ -37,8 +40,10 @@
var query = _wcsDeviceRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.Text.Contains(input.SearchKey)
+ || u.StationNum.Contains(input.SearchKey)
)
.WhereIF(input.PlcId > 0, u => u.PlcId == input.PlcId)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.StationNum), u => u.StationNum.Contains(input.StationNum.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Text), u => u.Text.Contains(input.Text.Trim()))
//澶勭悊澶栭敭鍜孴reeSelector鐩稿叧瀛楁鐨勮繛鎺�
.LeftJoin<WcsPlc>((u, plcid) => u.PlcId == plcid.Id)
@@ -210,16 +215,18 @@
//鑾峰彇璺烘満鐨勭姸鎬�
foreach (var modDevice in list)
{
- if (_sysCacheService.ExistKey("PLCCONN" + modDevice.PlcId))
+ if (_sysCacheService.ExistKey("PLCCONN:" + modDevice.PlcId))
{
- var cachePlc = _sysCacheService.Get<WcsPlc>("PLCCONN" + modDevice.PlcId);
+ var cachePlc = _sysCacheService.Get<WcsPlc>("PLCCONN:" + modDevice.PlcId);
modDevice.Status = cachePlc.IsConn;
if (modDevice.Status)
{
//璇诲彇plc鐨勫��
var modConn = PLCTaskAction.listPlcConn.FirstOrDefault(s => s != null && s.PlcId == modDevice.PlcId);
if (modConn == null)
- break;
+ {
+ continue;
+ }
try
{
var listPosition = await _wcsDeviceRep.Context.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice.Id).ToListAsync();
@@ -229,28 +236,97 @@
modDevice.Wcs = Convert.ToString(wcs);
//浠诲姟鍙�
var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos);
- modDevice.TaskNo = Convert.ToString(taskNo);
+ if (modPositionTask != null)
+ {
+ (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
+ modDevice.TaskNo = Convert.ToString(taskNo);
+ }
//浠诲姟绫诲瀷
var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
- (result, var taskType) = modConn.GetPlcDBValue(modPositionTaskType.PosType, modDevice.DbNumber, modPositionTaskType.PlcPos);
- modDevice.TaskType = (TaskTypeEnum)Convert.ToInt32(taskType);
+ if (modPositionTaskType != null)
+ {
+ (result, var taskType) = modConn.GetPlcDBValue(modPositionTaskType.PosType, modDevice.DbNumber, modPositionTaskType.PlcPos);
+ modDevice.TaskType = (TaskTypeEnum)Convert.ToInt32(taskType);
+ }
//璧峰宸ヤ綅
var modPositionStartLocatNo = listPosition.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
- (result, var startLocatNo) = modConn.GetPlcDBValue(modPositionStartLocatNo.PosType, modDevice.DbNumber, modPositionStartLocatNo.PlcPos);
- modDevice.StartLocatNo = Convert.ToString(startLocatNo);
+ if (modPositionStartLocatNo != null)
+ {
+ (result, var startLocatNo) = modConn.GetPlcDBValue(modPositionStartLocatNo.PosType, modDevice.DbNumber, modPositionStartLocatNo.PlcPos);
+ modDevice.StartLocatNo = Convert.ToString(startLocatNo);
+ }
//鐩殑宸ヤ綅
var modPositionEndLocatNo = listPosition.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
- (result, var endLocatNo) = modConn.GetPlcDBValue(modPositionEndLocatNo.PosType, modDevice.DbNumber, modPositionEndLocatNo.PlcPos);
- modDevice.EndLocatNo = Convert.ToString(endLocatNo);
+ if (modPositionEndLocatNo != null)
+ {
+ (result, var endLocatNo) = modConn.GetPlcDBValue(modPositionEndLocatNo.PosType, modDevice.DbNumber, modPositionEndLocatNo.PlcPos);
+ modDevice.EndLocatNo = Convert.ToString(endLocatNo);
+ }
//鎵樼洏鐮�
var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
- (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos);
- modDevice.PalletNo = Convert.ToString(palletNo);
+ if (modPositionPalletNo != null)
+ {
+ (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
+ modDevice.PalletNo = Convert.ToString(palletNo);
+ Console.WriteLine(modDevice.DbNumber + "." + modPositionPalletNo.PlcPos + "----------");
+ }
+ if (cachePlc.Type == PLCTypeEnum.ConveyorLine || cachePlc.Type == PLCTypeEnum.StackingMachine)
+ {
+ //鏀捐揣鎺�
+ var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+ if (modPositionReleaseRow != null)
+ {
+ (result, var releaseRow) = modConn.GetPlcDBValue(modPositionReleaseRow.PosType, modDevice.DbNumber, modPositionReleaseRow.PlcPos);
+ modDevice.ReleaseRow = Convert.ToInt32(releaseRow);
+ }
+ //鏀捐揣鍒�
+ var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+ if (modPositionReleaseCol != null)
+ {
+ (result, var releaseCol) = modConn.GetPlcDBValue(modPositionReleaseCol.PosType, modDevice.DbNumber, modPositionReleaseCol.PlcPos);
+ modDevice.ReleaseCol = Convert.ToInt32(releaseCol);
+ }
+ //鏀捐揣灞�
+ var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+ if (modPositionReleaseStorey != null)
+ {
+ (result, var releaseStorey) = modConn.GetPlcDBValue(modPositionReleaseStorey.PosType, modDevice.DbNumber, modPositionReleaseStorey.PlcPos);
+ modDevice.ReleaseStorey = Convert.ToInt32(releaseStorey);
+ }
+ //鍙栬揣鎺�
+ var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+ if (modPositionPickRow != null)
+ {
+ (result, var pickRow) = modConn.GetPlcDBValue(modPositionPickRow.PosType, modDevice.DbNumber, modPositionPickRow.PlcPos);
+ modDevice.PickRow = Convert.ToInt32(pickRow);
+ }
+ //鍙栬揣鍒�
+ var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+ if (modPositionPickCol != null)
+ {
+ (result, var pickCol) = modConn.GetPlcDBValue(modPositionPickCol.PosType, modDevice.DbNumber, modPositionPickCol.PlcPos);
+ modDevice.PickCol = Convert.ToInt32(pickCol);
+ }
+ //鍙栬揣灞�
+ var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+ if (modPositionPickStorey != null)
+ {
+ (result, var pickStorey) = modConn.GetPlcDBValue(modPositionPickStorey.PosType, modDevice.DbNumber, modPositionPickStorey.PlcPos);
+ modDevice.PickStorey = Convert.ToInt32(pickStorey);
+ }
+
+ if (cachePlc.Type == PLCTypeEnum.StackingMachine)
+ {
+ //璺烘満鐨勮捣濮嬪伐浣嶇敤鍙栬揣鎺掑垪灞�
+ modDevice.StartLocatNo = $"{modDevice.PickRow.ToString().PadLeft(2,'0')}{modDevice.PickCol.ToString().PadLeft(2, '0')}{modDevice.PickStorey.ToString().PadLeft(2, '0')}";
+ //璺烘満鐨勭洰鐨勫伐浣嶇敤鏀捐揣鎺掑垪灞�
+ modDevice.EndLocatNo = $"{modDevice.ReleaseRow.ToString().PadLeft(2, '0')}{modDevice.ReleaseCol.ToString().PadLeft(2, '0')}{modDevice.ReleaseStorey.ToString().PadLeft(2, '0')}";
+ }
+ }
}
- catch (Exception)
+ catch (Exception ex)
{
-
+ Console.WriteLine(ex.Message);
}
}
}
@@ -272,6 +348,183 @@
return list;
}
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "WriteValue")]
+ [DisplayName("鍐欏叆鍊�")]
+ public async Task WriteValue(WriteWcsDeviceInput modDevice)
+ {
+ var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == modDevice.PlcId);
+ if (modPlc == null)
+ throw Oops.Bah("鎵句笉鍒癙LC淇℃伅");
+ var modDbDevice = await _wcsDeviceRep.AsQueryable().FirstAsync(s => s.Id == modDevice.Id);
+ PLCUtil modUtil = new PLCUtil(modPlc);
+ var listPosition = await _wcsDeviceRep.Context.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice.Id).ToListAsync();
+ var result = new IoTClient.Result();
+ //浠诲姟鍙�
+ if (modDevice.TaskNo != null)
+ {
+ var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ if (modPositionTask != null)
+ result = modUtil.SetPlcDBValue(modPositionTask.PosType, modDbDevice.DbNumber, modPositionTask.PlcPos, modDevice.TaskNo);
+ }
+ //浠诲姟绫诲瀷
+ if (modDevice.TaskType != null)
+ {
+ var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
+ if (modPositionTaskType != null)
+ result = modUtil.SetPlcDBValue(modPositionTaskType.PosType, modDbDevice.DbNumber, modPositionTaskType.PlcPos, ((int)modDevice.TaskType).ToString());
+ }
+ //璧峰宸ヤ綅
+ if (modDevice.StartLocatNo != null)
+ {
+ if (modPlc.Type == PLCTypeEnum.StackingMachine)
+ {
+ if (modDevice.StartLocatNo.Length != 6)
+ {
+ throw Oops.Bah("璧峰宸ヤ綅鏍煎紡杈撳叆閿欒锛岃杈撳叆鎺掑垪灞傦紝渚嬶細010203锛�");
+ }
+ modDevice.PickRow = Convert.ToInt32(modDevice.StartLocatNo.Substring(0, 2));
+ modDevice.PickCol = Convert.ToInt32(modDevice.StartLocatNo.Substring(2, 2));
+ modDevice.PickStorey = Convert.ToInt32(modDevice.StartLocatNo.Substring(4, 2));
+
+ //鍙栬揣鎺�
+ if (modDevice.PickRow != null)
+ {
+ var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+ if (modPositionPickRow != null)
+ modUtil.SetPlcDBValue(modPositionPickRow.PosType, modDbDevice.DbNumber, modPositionPickRow.PlcPos, modDevice.PickRow.ToString());
+ }
+ //鍙栬揣鍒�
+ if (modDevice.PickCol != null)
+ {
+ var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+ if (modPositionPickCol != null)
+ modUtil.SetPlcDBValue(modPositionPickCol.PosType, modDbDevice.DbNumber, modPositionPickCol.PlcPos, modDevice.PickCol.ToString());
+ }
+ //鍙栬揣灞�
+ if (modDevice.PickStorey != null)
+ {
+ var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+ if (modPositionPickStorey != null)
+ modUtil.SetPlcDBValue(modPositionPickStorey.PosType, modDbDevice.DbNumber, modPositionPickStorey.PlcPos, modDevice.PickStorey.ToString());
+ }
+ }
+ else
+ {
+ var modPositionStartLocatNo = listPosition.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
+ if (modPositionStartLocatNo != null)
+ result = modUtil.SetPlcDBValue(modPositionStartLocatNo.PosType, modDbDevice.DbNumber, modPositionStartLocatNo.PlcPos, modDevice.StartLocatNo.ToString());
+ }
+ }
+ //鐩殑宸ヤ綅
+ if (modDevice.EndLocatNo != null)
+ {
+ if (modPlc.Type == PLCTypeEnum.StackingMachine)
+ {
+ if (modDevice.EndLocatNo.Length != 6)
+ {
+ throw Oops.Bah("鐩殑宸ヤ綅鏍煎紡杈撳叆閿欒锛岃杈撳叆鎺掑垪灞傦紝渚嬶細010203锛�");
+ }
+ modDevice.ReleaseRow = Convert.ToInt32(modDevice.EndLocatNo.Substring(0, 2));
+ modDevice.ReleaseCol = Convert.ToInt32(modDevice.EndLocatNo.Substring(2, 2));
+ modDevice.ReleaseStorey = Convert.ToInt32(modDevice.EndLocatNo.Substring(4, 2));
+
+ //鏀捐揣鎺�
+ if (modDevice.ReleaseRow != null)
+ {
+ var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+ if (modPositionReleaseRow != null)
+ modUtil.SetPlcDBValue(modPositionReleaseRow.PosType, modDbDevice.DbNumber, modPositionReleaseRow.PlcPos, modDevice.ReleaseRow.ToString());
+ }
+ //鏀捐揣鍒�
+ if (modDevice.ReleaseCol != null)
+ {
+ var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+ if (modPositionReleaseCol != null)
+ modUtil.SetPlcDBValue(modPositionReleaseCol.PosType, modDbDevice.DbNumber, modPositionReleaseCol.PlcPos, modDevice.ReleaseCol.ToString());
+ }
+ //鏀捐揣灞�
+ if (modDevice.ReleaseStorey != null)
+ {
+ var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+ if (modPositionReleaseStorey != null)
+ modUtil.SetPlcDBValue(modPositionReleaseStorey.PosType, modDbDevice.DbNumber, modPositionReleaseStorey.PlcPos, modDevice.ReleaseStorey.ToString());
+ }
+ }
+ else
+ {
+ var modPositionEndLocatNo = listPosition.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
+ if (modPositionEndLocatNo != null)
+ result = modUtil.SetPlcDBValue(modPositionEndLocatNo.PosType, modDbDevice.DbNumber, modPositionEndLocatNo.PlcPos, modDevice.EndLocatNo.ToString());
+ }
+ }
+ //鎵樼洏鐮�
+ if (modDevice.PalletNo != null)
+ {
+ var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+ if (modPositionPalletNo != null)
+ result = modUtil.SetPlcDBValue(modPositionPalletNo.PosType, modDbDevice.DbNumber, modPositionPalletNo.PlcPos, modDevice.PalletNo.ToString());
+ }
+ if (modDevice.Plc != null)
+ {
+ var modPositionPLC = listPosition.FirstOrDefault(s => s.Text == "PLC娴佺▼瀛�");
+ if (modPositionPLC != null)
+ result = modUtil.SetPlcDBValue(modPositionPLC.PosType, modDbDevice.DbNumber, modPositionPLC.PlcPos, modDevice.Plc);
+ }
+ if (modDevice.Wcs != null)
+ {
+ var modPositionWCS = listPosition.FirstOrDefault(s => s.Text == "WCS娴佺▼瀛�");
+ if (modPositionWCS != null)
+ result = modUtil.SetPlcDBValue(modPositionWCS.PosType, modDbDevice.DbNumber, modPositionWCS.PlcPos, modDevice.Wcs);
+ }
+ if (modPlc.Type == PLCTypeEnum.ConveyorLine)
+ {
+ //鏀捐揣鎺�
+ if (modDevice.ReleaseRow != null)
+ {
+ var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+ if (modPositionReleaseRow != null)
+ modUtil.SetPlcDBValue(modPositionReleaseRow.PosType, modDbDevice.DbNumber, modPositionReleaseRow.PlcPos, modDevice.ReleaseRow.ToString());
+ }
+ //鏀捐揣鍒�
+ if (modDevice.ReleaseCol != null)
+ {
+ var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+ if (modPositionReleaseCol != null)
+ modUtil.SetPlcDBValue(modPositionReleaseCol.PosType, modDbDevice.DbNumber, modPositionReleaseCol.PlcPos, modDevice.ReleaseCol.ToString());
+ }
+ //鏀捐揣灞�
+ if (modDevice.ReleaseStorey != null)
+ {
+ var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+ if (modPositionReleaseStorey != null)
+ modUtil.SetPlcDBValue(modPositionReleaseStorey.PosType, modDbDevice.DbNumber, modPositionReleaseStorey.PlcPos, modDevice.ReleaseStorey.ToString());
+ }
+ //鍙栬揣鎺�
+ if (modDevice.PickRow != null)
+ {
+ var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+ if (modPositionPickRow != null)
+ modUtil.SetPlcDBValue(modPositionPickRow.PosType, modDbDevice.DbNumber, modPositionPickRow.PlcPos, modDevice.PickRow.ToString());
+ }
+ //鍙栬揣鍒�
+ if (modDevice.PickCol != null)
+ {
+ var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+ if (modPositionPickCol != null)
+ modUtil.SetPlcDBValue(modPositionPickCol.PosType, modDbDevice.DbNumber, modPositionPickCol.PlcPos, modDevice.PickCol.ToString());
+ }
+ //鍙栬揣灞�
+ if (modDevice.PickStorey != null)
+ {
+ var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+ if (modPositionPickStorey != null)
+ modUtil.SetPlcDBValue(modPositionPickStorey.PosType, modDbDevice.DbNumber, modPositionPickStorey.PlcPos, modDevice.PickStorey.ToString());
+ }
+ }
+ modUtil.Close();
+ }
+
#region 鍒嗘嫞鐮佸灈
/// <summary>
/// 鑾峰彇鐮佸灈鏈哄櫒浜哄拰鎷嗗灈鏈哄櫒浜哄垪琛�
@@ -284,14 +537,68 @@
{
return await _wcsDeviceRep.Context.Queryable<WcsPlc>()
.Where(w => w.Type == PLCTypeEnum.RobotPalletizer || w.Type == PLCTypeEnum.StackingRobot)
- .OrderBy(o => o.Type)
+ .OrderByDescending(o => o.Type)
.Select(u => new
{
id = u.Id,
- name = u.Text
+ name = u.Text
}
).ToListAsync();
}
+ /// <summary>
+ /// 鑾峰彇璁惧瀵瑰簲宸ヤ綅鍒楄〃
+ /// </summary>
+ /// <param name="entry"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "WcsPackStationPlcList")]
+ [DisplayName("鑾峰彇璁惧瀵瑰簲宸ヤ綅鍒楄〃")]
+ public async Task<List<WcsDeviceTaskOrderDto>> WcsPackStationPlcList([FromQuery] WcsDeviceBaseInput entry)
+ {
+ //var list = await _wcsDeviceRep.AsQueryable()
+ // .LeftJoin<WcsPlc>((a, b) => a.PlcId == b.Id)
+ // .Where((a, b) => a.DeviceType == DeviceTypeEnum.Business)
+ // .Select<WcsDeviceOutput>((a, b) => new WcsDeviceOutput() { Type = b.Type }, true)
+ // .ToListAsync();
+
+ var list = await _wcsDeviceRep.Context.Queryable<WcsDevice>()
+ .InnerJoin<WcsPlc>((device, plc) => device.PlcId == plc.Id)
+ .LeftJoin<WcsCheckTask>((device, plc, task) => device.StationNum == task.Port)
+ .Where((device, plc, task) => device.PlcId == entry.PlcId)
+ .OrderBy((device, plc, task) => device.CreateTime)
+ .Select((device, plc, task) => new WcsDeviceTaskOrderDto()
+ {
+ Id = device.Id,
+ Text = device.Text,
+ TaskNo = task.TaskNo,
+ OrderNo = task.OrderNo,
+ LotNo = task.LotNo,
+ SkuNo = task.SkuNo,
+ SkuName = task.SkuName,
+ LineNo = task.LineNo,
+ Status = task.Status,
+ PZNo = task.PZNo,
+ Qty = task.Qty,
+
+ PlcId=device.PlcId,
+ Type = plc.Type
+ })
+ .ToListAsync();
+
+ bool connStatus = false;
+ //鑾峰彇璁惧鐨勭姸鎬�
+ var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == list[0].PlcId);
+ PLCUtil modUtil = new PLCUtil(modPlc);
+ if (modUtil.Connected)
+ {
+ connStatus = true;
+ }
+ foreach (var item in list)
+ {
+ item.PlcStatus = connStatus;
+ }
+ return list;
+ }
#endregion
}
--
Gitblit v1.8.0