From b4083a6b047fc9e0964133c87227213c5154e37a Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期三, 15 一月 2025 15:47:44 +0800
Subject: [PATCH] 11111111
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 1093 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,061 insertions(+), 32 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 713e769..c0c19d2 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 Microsoft.CodeAnalysis.Text;
+using StackExchange.Profiling.Internal;
+using System.Drawing.Drawing2D;
using WCS.Application.Entity;
using WCS.Application.Service.WcsDevice.Dto;
@@ -12,13 +15,708 @@
[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100)]
public class WcsDeviceService : IDynamicApiController, ITransient
{
+ private readonly SqlSugarRepository<WcsPlc> _wcsPlcRep;
private readonly SqlSugarRepository<WcsDevice> _wcsDeviceRep;
private readonly SysCacheService _sysCacheService;
- public WcsDeviceService(SqlSugarRepository<WcsDevice> wcsDeviceRep, SysCacheService sysCacheService)
+ public WcsDeviceService(SqlSugarRepository<WcsPlc> wcsPlcRep, SqlSugarRepository<WcsDevice> wcsDeviceRep, SysCacheService sysCacheService)
{
+ _wcsPlcRep = wcsPlcRep;
_wcsDeviceRep = wcsDeviceRep;
_sysCacheService = sysCacheService;
}
+
+ #region 宸ヤ綔鍙版搷浣�
+
+
+ /// <summary>
+ /// 鎵嬪姩鎿嶄綔PLC閿佸畾鍐欏叆宸ヤ綅淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "WriteLocationInfo")]
+ [DisplayName("鎵嬪姩鎿嶄綔PLC閿佸畾鍐欏叆宸ヤ綅淇℃伅")]
+ public async Task WriteLocationInfo(WcsDeviceUpInfo input)
+ {
+ WcsPlc modPlc;
+ string DbNum = "";// DB鍧�
+
+ if (string.IsNullOrWhiteSpace(input.LocatNo))//濡傛灉宸ヤ綅涓虹┖
+ {
+ throw Oops.Bah("宸ヤ綅涓嶈兘涓虹┖");
+ }
+ var plcList = await _wcsPlcRep.Context.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.ConveyorLine && s.IsDelete == false).ToListAsync();
+ switch (input.Layer)
+ {
+ case "1":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "1灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "";
+ break;
+ case "2":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "2灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "DB91";
+ break;
+ case "3":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "3灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "";
+ break;
+ default:
+ throw Oops.Bah("妤煎眰淇℃伅閿欒");
+ }
+
+ var device = await _wcsDeviceRep.Context.Queryable<WcsDevice>().FirstAsync(s => s.PlcId == modPlc.Id && s.StationNum == input.LocatNo && s.IsDelete == false && s.DeviceType == DeviceTypeEnum.Show);
+ if (device == null)
+ {
+ throw Oops.Bah("褰撳墠妤煎眰鏈煡璇㈠埌璇ュ伐浣嶄俊鎭�");
+ }
+ PLCUtil modUtil = new PLCUtil(modPlc);
+
+ switch (input.TypeName)
+ {
+ case "suoding": // 閿佸畾
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "48.0", input.LocatNo);
+ break;
+
+ default:
+ break;
+ }
+
+ modUtil.Close();
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇宸ヤ綅涓婁俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "GetLocationInfo")]
+ [DisplayName("鑾峰彇宸ヤ綅涓婁俊鎭�")]
+ public async Task<WcsDeviceUpInfo> GetLocationInfo(WcsDeviceUpInfo input)
+ {
+ WcsPlc modPlc;
+ string DbNum = "";// DB鍧�
+
+ if (string.IsNullOrWhiteSpace(input.LocatNo))//濡傛灉宸ヤ綅涓虹┖
+ {
+ throw Oops.Bah("宸ヤ綅涓嶈兘涓虹┖");
+ }
+ var plcList = await _wcsPlcRep.Context.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.ConveyorLine && s.IsDelete == false).ToListAsync();
+ switch (input.Layer)
+ {
+ case "1":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "1灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "";
+ break;
+ case "2":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "2灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "DB1100";
+ break;
+ case "3":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "3灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "";
+ break;
+ default:
+ throw Oops.Bah("妤煎眰淇℃伅閿欒");
+ }
+
+ var device = await _wcsDeviceRep.Context.Queryable<WcsDevice>().FirstAsync(s => s.PlcId == modPlc.Id && s.StationNum == input.LocatNo && s.IsDelete == false && s.DeviceType == DeviceTypeEnum.Show);
+ if (device == null)
+ {
+ throw Oops.Bah("褰撳墠妤煎眰鏈煡璇㈠埌璇ュ伐浣嶄俊鎭�");
+ }
+ PLCUtil modUtil = new PLCUtil(modPlc);
+ WcsDeviceUpInfo data = new WcsDeviceUpInfo();
+ data.FuncName = "";
+ data.Layer = "";
+ data.LocatNo = input.LocatNo;
+ data.TypeName = "";
+ var (result2, value2) = modUtil.GetPlcDBValue(PLCDataTypeEnum.String, DbNum, "4");
+ data.PalletNo = value2;
+ var (result3, value3) = modUtil.GetPlcDBValue(PLCDataTypeEnum.String, DbNum, "14");
+ data.TaskNo = value3;
+ var (result4, value4) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "34");
+ data.StartLoction = value4.ToString();
+ var (result5, value5) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "36");
+ data.EndLoction = value5.ToString();
+
+ var (result6, value6) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "38");
+ data.StartPai = value6.ToString();
+ var (result7, value7) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "40");
+ data.StartLie = value7.ToString();
+ var (result8, value8) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "42");
+ data.StartCeng = value8.ToString();
+
+
+ var (result9, value9) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "44");
+ data.EndPai = value9.ToString();
+ var (result10, value10) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "46");
+ data.EndLie = value10.ToString();
+ var (result11, value11) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "48");
+ data.EndCeng = value11.ToString();
+
+ modUtil.Close();
+ return data;
+ }
+ /// <summary>
+ /// 鎵嬪姩鎿嶄綔PLC淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "WriteInfo")]
+ [DisplayName("鎵嬪姩鎿嶄綔Plc")]
+ public async Task WriteInfo(WcsDeviceUpInfo input)
+ {
+ WcsPlc modPlc;
+ string DbNum = "DB91";// DB鍧�
+
+ if (string.IsNullOrWhiteSpace(input.LocatNo))//濡傛灉宸ヤ綅涓虹┖
+ {
+ throw Oops.Bah("宸ヤ綅涓嶈兘涓虹┖");
+ }
+ var plcList = await _wcsPlcRep.Context.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.ConveyorLine).ToListAsync();
+ switch (input.Layer)
+ {
+ case "1":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "1灞傛墭鐩樿緭閫佺嚎");
+ //DbNum = "";
+ break;
+ case "2":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "2灞傛墭鐩樿緭閫佺嚎");
+ //DbNum = "DB91";
+ break;
+ case "3":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "3灞傛墭鐩樿緭閫佺嚎");
+ //DbNum = "";
+ break;
+ default:
+ throw Oops.Bah("妤煎眰淇℃伅閿欒");
+ }
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+
+ var device = await _wcsDeviceRep.Context.Queryable<WcsDevice>().FirstAsync(s => s.PlcId == modPlc.Id && s.StationNum == input.LocatNo && s.DeviceType == DeviceTypeEnum.Show);
+ if (device == null)
+ {
+ throw Oops.Bah("褰撳墠妤煎眰鏈煡璇㈠埌璇ュ伐浣嶄俊鎭�");
+ }
+ PLCUtil modUtil = new PLCUtil(modPlc);
+
+
+ // true 锛� 鎵嬪姩妯″紡 false:鑷姩妯″紡
+ var (result, value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.4");
+ if (result.IsSucceed)
+ {
+ if (input.TypeName != "shoudong" && value.ToString().ToLower() == "false" && input.TypeName != "huifu" && input.TypeName != "UpTask")
+ {
+ throw Oops.Bah("褰撳墠涓鸿嚜鍔ㄦā寮忥紝璇峰厛鍒囨崲涓烘墜鍔ㄦā寮�");
+ }
+ }
+ else
+ {
+ throw Oops.Bah("璇诲彇PLC鎵嬭嚜鍔ㄥ�煎け璐�");
+ }
+
+ switch (input.TypeName)
+ {
+ case "zidong": // 鑷姩
+ //modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "48.0", input.LocatNo);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.4", "false");
+ break;
+ case "shoudong": // 鎵嬪姩
+ //modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "48.0", input.LocatNo);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.4", "true");
+ break;
+ case "huifu": // 鎶ヨ鎭㈠
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "47.0", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "47.0", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+
+ break;
+ case "1diandong": // 1鐐瑰姩
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.7", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.7", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "1liandong": // 1鑱斿姩
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.3", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.3", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "2diandong":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.0", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.0", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "2liandong":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.4", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.4", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "3diandong":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.5", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.5", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "3liandong":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.1", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.1", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "4diandong":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.6", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.6", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "4liandong":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.2", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.2", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "yizaisheng":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.5", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.5", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "yizaijiang":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.6", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "51.6", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "fanzhuansheng":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "59.0", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "59.0", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "fanzhuanjiang":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "59.1", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "59.1", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "UpTask":
+ var (result1, value2) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.0");
+ if (result.IsSucceed)
+ {
+ if (value2 == true)
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.0", "false");
+ }
+ else
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.0", "true");
+ }
+ }
+ else
+ {
+ throw Oops.Bah("璇诲彇PLC鍊煎け璐�");
+ }
+
+
+ break;
+ default:
+ break;
+ }
+
+ modUtil.Close();
+ }
+
+
+ /// <summary>
+ /// 鎵嬪姩鍐欏叆PLC浠诲姟淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "WriteTaskInfo")]
+ [DisplayName("鍐欏叆Plc浠诲姟淇℃伅")]
+ public async Task WriteTaskInfo(WcsDeviceUpInfo input)
+ {
+ WcsPlc modPlc;
+ string DbNum = "";// DB鍧�
+ string TaskDbNum = "";// DB鍧�
+
+ if (string.IsNullOrWhiteSpace(input.LocatNo))//濡傛灉宸ヤ綅涓虹┖
+ {
+ throw Oops.Bah("宸ヤ綅涓嶈兘涓虹┖");
+ }
+ var plcList = await _wcsPlcRep.Context.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.ConveyorLine && s.IsDelete == false).ToListAsync();
+ switch (input.Layer)
+ {
+ case "1":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "1灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "";
+ break;
+ case "2":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "2灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "DB91";
+ TaskDbNum = "DB1100";
+ break;
+ case "3":
+ modPlc = plcList.FirstOrDefault(m => m.Text == "3灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌{input.Layer}妤煎眰PLC淇℃伅");
+ DbNum = "";
+ break;
+ default:
+ throw Oops.Bah("妤煎眰淇℃伅閿欒");
+ }
+
+ var device = await _wcsDeviceRep.Context.Queryable<WcsDevice>().FirstAsync(s => s.PlcId == modPlc.Id && s.StationNum == input.LocatNo && s.IsDelete == false && s.DeviceType == DeviceTypeEnum.Show);
+ if (device == null)
+ {
+ throw Oops.Bah("褰撳墠妤煎眰鏈煡璇㈠埌璇ュ伐浣嶄俊鎭�");
+ }
+
+ PLCUtil modUtil = new PLCUtil(modPlc);
+ //var (result, value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.0");
+ //if (result.IsSucceed)
+ //{
+ // if (value.ToString().ToLower() != "false")
+ // {
+ // throw Oops.Bah("璇峰厛鍒囨崲涓烘洿鏀逛换鍔℃ā寮�");
+ // }
+ //}
+ //else
+ //{
+ // throw Oops.Bah("璇诲彇PLC鎵嬭嚜鍔ㄥ�煎け璐�");
+ //}
+ //modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "48.0", input.LocatNo);
+ switch (input.TypeName)
+ {
+ case "writeTask":
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.String, TaskDbNum, "4", input.PalletNo);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.String, TaskDbNum, "14", input.TaskNo);
+ //modUtil.SetPlcDBValue(PLCDataTypeEnum.Int, TaskDbNum, "34", input.StartLoction);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, TaskDbNum, "36.0", input.EndLoction);
+
+
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, TaskDbNum, "38", input.StartPai);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, TaskDbNum, "40", input.StartLie);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, TaskDbNum, "42", input.StartCeng);
+
+
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, TaskDbNum, "44", input.EndPai);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, TaskDbNum, "46", input.EndLie);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Short, TaskDbNum, "48", input.EndCeng);
+
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.3", "true");
+ Thread.Sleep(1000);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.3", "false");
+ break;
+ case "writeTaskDelete":
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.2", "true");
+ Thread.Sleep(1000);
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "50.2", "false");
+ break;
+
+ default:
+ break;
+ }
+
+ modUtil.Close();
+ }
+
+
+
+ /// <summary>
+ /// 鎵嬪姩鍐欏叆PLC鍚仠淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "WriteStartStop")]
+ [DisplayName("鍐欏叆PLC鍚仠淇℃伅")]
+ public async Task WriteStartStop(WcsDeviceStartStop input)
+ {
+ WcsPlc modPlc;
+ string DbNum = "";// DB鍧�
+
+
+ var plcList = await _wcsPlcRep.Context.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.ConveyorLine && s.IsDelete == false).ToListAsync();
+ if (input.Layer == "1")
+ {
+ modPlc = plcList.FirstOrDefault(m => m.Text == "1灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌1妤煎眰PLC淇℃伅");
+ DbNum = "";
+ }
+ else if (input.Layer == "2")
+ {
+ modPlc = plcList.FirstOrDefault(m => m.Text == "2灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌2妤煎眰PLC淇℃伅");
+ DbNum = "DB91";
+ PLCUtil modUtil = new PLCUtil(modPlc);
+ switch (input.Type)
+ {
+ case "TwoPalletStart":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.0", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.0", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "TwoPalletStop":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.1", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.1", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "TwoMaStart":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.0", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.0", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "TwoMaStop":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.1", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.1", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "TwoMaTwoStart":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.2", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.2", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "TwoMaTwoStop":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.3", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "58.3", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "TwoBoxStart":
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.2", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.2", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ case "TwoBoxStop":
+
+ if (input.FuncName == "true")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.3", "true");
+ }
+ else if (input.FuncName == "false")
+ {
+ modUtil.SetPlcDBValue(PLCDataTypeEnum.Bit, DbNum, "46.3", "false");
+ }
+ else
+ {
+ throw Oops.Bah("浜嬩欢缁撴灉閿欒");
+ }
+ break;
+ default:
+ break;
+ }
+ modUtil.Close();
+ }
+ else if (input.Layer == "3")
+ {
+ modPlc = plcList.FirstOrDefault(m => m.Text == "3灞傛墭鐩樿緭閫佺嚎");
+ if (modPlc == null)
+ throw Oops.Bah($"鏈煡璇㈠埌3妤煎眰PLC淇℃伅");
+ DbNum = "";
+ }
+ else
+ {
+ throw Oops.Bah("鎿嶄綔绫诲瀷淇℃伅閿欒");
+ }
+
+ }
+
+ #endregion
/// <summary>
/// 鍒嗛〉鏌ヨ璁惧淇℃伅
@@ -39,8 +737,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)
@@ -212,9 +912,9 @@
//鑾峰彇璺烘満鐨勭姸鎬�
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)
{
@@ -233,28 +933,97 @@
modDevice.Wcs = Convert.ToString(wcs);
//浠诲姟鍙�
var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
- 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, modPositionPalletNo.StringLength);
- modDevice.PalletNo = Convert.ToString(palletNo);
- }
- catch (Exception)
- {
+ 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 ex)
+ {
+ Console.WriteLine(ex.Message);
}
}
}
@@ -276,6 +1045,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>
/// 鑾峰彇鐮佸灈鏈哄櫒浜哄拰鎷嗗灈鏈哄櫒浜哄垪琛�
@@ -287,7 +1233,7 @@
public async Task<dynamic> WcsPackPlcList()
{
return await _wcsDeviceRep.Context.Queryable<WcsPlc>()
- .Where(w => w.Type == PLCTypeEnum.RobotPalletizer || w.Type == PLCTypeEnum.StackingRobot)
+ .Where(w => w.Type == PLCTypeEnum.RobotPalletizer /*|| w.Type == PLCTypeEnum.StackingRobot*/)
.OrderByDescending(o => o.Type)
.Select(u => new
{
@@ -304,24 +1250,107 @@
[HttpGet]
[ApiDescriptionSettings(Name = "WcsPackStationPlcList")]
[DisplayName("鑾峰彇璁惧瀵瑰簲宸ヤ綅鍒楄〃")]
- public async Task<List<WcsDeviceTaskOrderDto>> WcsPackStationPlcList([FromQuery]WcsDeviceBaseInput entry)
- {
- return await _wcsDeviceRep.Context.Queryable<WcsDevice>()
- .LeftJoin<WcsCheckTask>((device, task) => device.StationNum == task.Port)
- .Where((device, task) => device.PlcId == entry.PlcId)
- .OrderBy((device, task) => device.CreateTime)
- .Select((device, task) => new WcsDeviceTaskOrderDto()
+ 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,
- OrderNo=task.OrderNo,
- LotNo=task.LotNo,
- SkuNo=task.SkuNo,
- SkuName=task.SkuName,
- Status=task.Status,
- Qty=task.Qty
+ 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;
+ }
+ /// <summary>
+ /// 鑾峰彇璁惧瀵瑰簲宸ヤ綅鍒楄〃
+ /// </summary>
+ /// <param name="entry"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "WcsStackingRobotList")]
+ [DisplayName("鑾峰彇璁惧瀵瑰簲宸ヤ綅鍒楄〃")]
+ public async Task<List<WcsDeviceTaskOrderDto>> WcsStackingRobotList()
+ {
+ //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<WcsCheckTask>()
+ .LeftJoin<WcsDevice>((task, device) => device.StationNum == task.Port)
+ .InnerJoin<WcsPlc>((task, device, plc) => device.PlcId == plc.Id)
+ .Where((task, device, plc) => task.Id <= 3)
+ .OrderBy((task, device, plc) => device.CreateTime)
+ .Select((task, device, plc) => new WcsDeviceTaskOrderDto()
+ {
+ Id = device.Id,
+ TaskId = task.Id,
+ Text = task.Id.ToString() + "鍙峰嚭搴撳垎鎷ｇ嚎",
+ 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