From 810c6d3a204615a12705f27d62cd7f765b4fdfaa Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 12 九月 2024 08:23:20 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 557 +++++++++++++++++++++++++
Admin.NET/WCS.Application/Util/HttpService.cs | 283 ++++++++++++
Admin.NET/WCS.Application/Model/PlcTaskInfo.cs | 12
Admin.NET/WCS.Application/PLC/PLCCommon.cs | 431 +++++++++++++++++++
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 3
Admin.NET/WCS.Application/Model/TaskRequest.cs | 12
Admin.NET/WCS.Application/Hub/PlcHub.cs | 4
7 files changed, 1,297 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcHub.cs b/Admin.NET/WCS.Application/Hub/PlcHub.cs
index 2cf316f..c8108e7 100644
--- a/Admin.NET/WCS.Application/Hub/PlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcHub.cs
@@ -63,7 +63,7 @@
PLCTaskAction.boRefresh = context.BoRefresh.Value;
await _sysConfigService.UpdateConfigValue("sys_Refresh", context.BoRefresh.Value);
}
- await _plcHubContext.Clients.All.UpdateService(new PLCServiceModel() { BoRunningState = PLCTaskAction.boRunningState, BoRefresh = PLCTaskAction.boRefresh, BoOffline = PLCTaskAction.boOffline });
+ await _plcHubContext.Clients.All.UpdateService(new PLCServiceModel() { BoRunningState = PLCTaskAction.boRunningState, BoRefresh = PLCTaskAction.boRefresh, BoOffline = PLCTaskAction.boOffline, BoDemo = PLCTaskAction.boDemo});
}
}
public class PLCServiceModel
@@ -75,4 +75,6 @@
public bool? BoRefresh { get; set; }
+
+ public bool? BoDemo { get; set; }
}
\ No newline at end of file
diff --git a/Admin.NET/WCS.Application/Model/PlcTaskInfo.cs b/Admin.NET/WCS.Application/Model/PlcTaskInfo.cs
index d354466..5f30a96 100644
--- a/Admin.NET/WCS.Application/Model/PlcTaskInfo.cs
+++ b/Admin.NET/WCS.Application/Model/PlcTaskInfo.cs
@@ -49,3 +49,15 @@
/// </summary>
public string EndRoadway { get; set; }
}
+
+/// <summary>
+/// 璺烘満瀵瑰簲鐨勮捣濮嬬洰鏍囧浐瀹氫綅缃�
+/// </summary>
+public class StokInfo
+{
+ public string Ip { get; set; }
+ public string Pai { get; set; }
+ public string Lie { get; set; }
+ public string Ceng { get; set; }
+}
+
diff --git a/Admin.NET/WCS.Application/Model/TaskRequest.cs b/Admin.NET/WCS.Application/Model/TaskRequest.cs
index c82e69b..7587e00 100644
--- a/Admin.NET/WCS.Application/Model/TaskRequest.cs
+++ b/Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -16,3 +16,15 @@
public WcsTask TaskList { get; set; }
}
+/// <summary>
+/// 鐢宠鍏ュ簱浠诲姟 宸烽亾鎴栧偍浣�
+/// </summary>
+public class RequestAsnTask
+{
+ public string PalletNo { get; set; }
+ public string HouseNo { get; set; }
+ public string RoadWayNo { get; set; }
+ public string TaskModel { get; set; }
+}
+
+
diff --git a/Admin.NET/WCS.Application/PLC/PLCCommon.cs b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
index b8e8b00..8b64865 100644
--- a/Admin.NET/WCS.Application/PLC/PLCCommon.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
@@ -323,4 +323,435 @@
return taskInfo;
}
+
+ /// <summary>
+ /// 鏍规嵁宸烽亾鍜屽眰鏁扮‘瀹氬贩閬撳彛鍏ュ簱宸ヤ綅
+ /// </summary>
+ /// <param name="endRoadway"></param>
+ /// <param name="ceng"></param>
+ /// <returns></returns>
+ public static string RoadwayToStationNum(string endRoadway, string ceng)
+ {
+ string stationNum = "";
+ switch (endRoadway)
+ {
+ case "R01":
+ if (ceng == "1")
+ {
+ stationNum = "145";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "252";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "401";
+ }
+ break;
+ case "R02":
+ if (ceng == "1")
+ {
+ stationNum = "137";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "260";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "405";
+ }
+ break;
+ case "R03":
+ if (ceng == "1")
+ {
+ stationNum = "127";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "270";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "409";
+ }
+ break;
+ case "R04":
+ if (ceng == "1")
+ {
+ stationNum = "119";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "278";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "413";
+ }
+ break;
+ case "R05":
+ if (ceng == "1")
+ {
+ stationNum = "109";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "288";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "417";
+ }
+ break;
+ case "R06":
+ if (ceng == "1")
+ {
+ stationNum = "101";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "301";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "421";
+ }
+ break;
+ case "R07":
+ if (ceng == "1")
+ {
+ stationNum = "091";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "307";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "425";
+ }
+ break;
+ case "R08":
+ if (ceng == "1")
+ {
+ stationNum = "83";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "315";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "429";
+ }
+ break;
+ case "R09":
+ if (ceng == "1")
+ {
+ stationNum = "73";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "325";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "433";
+ }
+ break;
+ case "R10":
+ if (ceng == "1")
+ {
+ stationNum = "65";
+ }
+ if (ceng == "2")
+ {
+ stationNum = "337";
+ }
+ if (ceng == "3")
+ {
+ stationNum = "437";
+ }
+ break;
+ }
+
+ return stationNum;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁宸ヤ綅鍙疯幏鍙栧搴斿贩閬�
+ /// </summary>
+ /// <param name="StationNum">鍏ュ嚭宸ヤ綅鍙�</param>
+ /// <returns>璺烘満鑱旀満</returns>
+ public static string GetRoadwayByStation(string StationNum)
+ {
+ string value = "";
+ var conveyList1 = new List<string>() { "147", "145", "252", "254", "401", "402", };
+ var conveyList2 = new List<string>() { "139", "137", "260", "262", "405", "406", };
+ var conveyList3 = new List<string>() { "129", "127", "272", "270", "409", "410", };
+ var conveyList4 = new List<string>() { "121", "119", "278", "280", "413", "414", };
+ var conveyList5 = new List<string>() { "111", "109", "288", "290", "417", "418", };
+ var conveyList6 = new List<string>() { "103", "101", "294", "301", "421", "422", };
+ var conveyList7 = new List<string>() { "093", "091", "307", "309", "425", "426", };
+ var conveyList8 = new List<string>() { "085", "083", "315", "317", "429", "430", };
+ var conveyList9 = new List<string>() { "075", "073", "325", "327", "433", "434", };
+ var conveyList10 = new List<string>() { "067", "065", "331", "337", "437", "438", };
+
+ if (conveyList1.Contains(StationNum))
+ {
+ value = "R01";
+ }
+ else if (conveyList2.Contains(StationNum))
+ {
+ value = "R02";
+ }
+ else if (conveyList3.Contains(StationNum))
+ {
+ value = "R03";
+ }
+ else if (conveyList4.Contains(StationNum))
+ {
+ value = "R04";
+ }
+ else if (conveyList5.Contains(StationNum))
+ {
+ value = "R05";
+ }
+ else if (conveyList6.Contains(StationNum))
+ {
+ value = "R06";
+ }
+ else if (conveyList7.Contains(StationNum))
+ {
+ value = "R07";
+ }
+ else if (conveyList8.Contains(StationNum))
+ {
+ value = "R08";
+ }
+ else if (conveyList9.Contains(StationNum))
+ {
+ value = "R09";
+ }
+ else if (conveyList10.Contains(StationNum))
+ {
+ value = "R10";
+ }
+
+ return value;
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸烽亾鍙ｅ嚭鍏ュ簱宸ヤ綅鍙疯幏鍙栧搴旀ゼ灞�
+ /// </summary>
+ /// <param name="StationNum">鍏ュ嚭宸ヤ綅鍙�</param>
+ /// <returns>璺烘満鑱旀満</returns>
+ public static string GetRoadwayByStationNew(string StationNum)
+ {
+ string value = "";
+ var conveyList1 = new List<string>() { "147", "145", "139", "137", "129", "127", "121", "119", "111", "109", "103", "101", "093", "091", "085", "083", "075", "073", "067", "065" };
+ var conveyList2 = new List<string>() { "252", "254", "260", "262", "272", "270", "278", "280", "288", "290", "294", "301", "307", "309", "315", "317", "325", "327", "331", "337" };
+ var conveyList3 = new List<string>() { "401", "402", "405", "406", "409", "410", "413", "414", "417", "418", "421", "422", "425", "426", "429", "430", "433", "434", "437", "438" };
+
+ if (conveyList1.Contains(StationNum))
+ {
+ value = "1";
+ }
+ else if (conveyList2.Contains(StationNum))
+ {
+ value = "2";
+ }
+ else if (conveyList3.Contains(StationNum))
+ {
+ value = "3";
+ }
+ else
+ {
+ throw new Exception("宸ヤ綅鏈煡璇㈠埌");
+ }
+
+ return value;
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸烽亾鍙枫�佸眰鏁� 鑾峰彇瀵瑰簲鐨勮泛鏈篒P鍙婂叆搴撳伐浣嶆帓鍒楀眰淇℃伅
+ /// </summary>
+ /// <param name="roadway">宸烽亾鍙�</param>
+ /// <param name="ceng">杩炴帴闆嗗悎</param>
+ /// <returns></returns>
+ public static StokInfo GetStokePlc(string roadway, string ceng)
+ {
+
+ StokInfo sInfo = new StokInfo();
+ sInfo.Pai = "2";
+
+
+ switch (roadway)
+ {
+ case "R01":
+ sInfo.Ip = "10.18.51.10";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R02":
+ sInfo.Ip = "10.18.51.20";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R03":
+ sInfo.Ip = "10.18.51.30";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R04":
+ sInfo.Ip = "10.18.51.40";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R05":
+ sInfo.Ip = "10.18.51.50";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R06":
+ sInfo.Ip = "10.18.51.60";
+ if (ceng == "2" || ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R07":
+ sInfo.Ip = "10.18.51.70";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R08":
+ sInfo.Ip = "10.18.51.80";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R09":
+ sInfo.Ip = "10.18.51.90";
+ if (ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ case "R10":
+ sInfo.Ip = "10.18.51.100";
+ if (ceng == "2" || ceng == "1")
+ {
+ sInfo.Pai = "3";
+ }
+ break;
+ }
+
+ sInfo.Lie = "65";
+ sInfo.Ceng = "1";
+
+ if (ceng == "2")
+ {
+ sInfo.Ceng = "2";
+ }
+ if (ceng == "3")
+ {
+ sInfo.Ceng = "3";
+ }
+ return sInfo;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鍌ㄤ綅鎺掕幏鍙栬泛鏈哄搴旂殑鍦板潃鎺�
+ /// </summary>
+ /// <param name="road">鎺�</param>
+ /// <param name="pai">鎺�</param>
+ /// <param name="dept">娣卞害</param>
+ /// <returns></returns>
+ public static int GetDjAdress(string road, string pai, string dept)
+ {
+ var roadNum = int.Parse(road);
+ var paiNum = int.Parse(pai);
+ var deptNum = int.Parse(dept);
+
+ var paiVal = 0;
+ // 鍒ゆ柇宸烽亾濂囧伓鏁�
+ if (roadNum % 2 == 0)// 鍋舵暟
+ {
+ // 鍒ゆ柇鎺掑鍋舵暟
+ if (paiNum % 2 == 0)
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 3;
+ }
+ else
+ {
+ paiVal = 4;
+ }
+ }
+ else
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 1;
+ }
+ else
+ {
+ paiVal = 2;
+ }
+ }
+
+ }
+ else // 濂囨暟
+ {
+ // 鍒ゆ柇鎺掑鍋舵暟
+ if (paiNum % 2 == 0)
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 3;
+ }
+ else
+ {
+ paiVal = 4;
+ }
+ }
+ else
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 2;
+
+ }
+ else
+ {
+ paiVal = 1;
+
+ }
+ }
+ }
+
+ return paiVal;
+
+ }
+
+
}
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 6eaf743..da15b60 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -4,8 +4,10 @@
using Furion.Logging;
using IoTClient;
using Microsoft.AspNetCore.SignalR;
+using Qiniu.Storage;
using RazorEngine.Compilation.ImpromptuInterface.Dynamic;
using SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models;
+using System;
using System.Data;
using System.Reflection.Emit;
@@ -146,7 +148,7 @@
.SetColumns(s => s.Status == TaskStatusEnum.Doing)
.Where(s => s.Id == modTask.Id)
.ExecuteCommand();
-
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
WcsTaskMonitor modInsertTaskMonitor;
if (string.IsNullOrEmpty(taskInfo.EndStation))
{
@@ -341,7 +343,7 @@
modTask.Status = TaskStatusEnum.Complete;
modTask.FinishDate = DateTime.Now;
_db.Updateable(modTask).ExecuteCommand();
-
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
var modcTaskMonitor = new WcsTaskMonitor()
{
TaskNo = modTask.TaskNo,
@@ -519,12 +521,128 @@
break;
case "843":
{
-
+ //绌哄彇璐у紓甯�
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ var (result, TaskNo) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ if (!result.IsSucceed)
+ break;
+ string taskNo = Convert.ToString(TaskNo);
+ var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
+ if (modTask == null)
+ {
+ Log.Error($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ break;
+ }
+ var res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "844");
+ if (!res.IsSucceed)
+ break;
+ modTask.Status = TaskStatusEnum.Exception;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ Log.Information($"銆愬爢鍨涙満銆憌cs浠诲姟鍙樻洿绌哄彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestEmptyException(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //璇锋眰鎴愬姛
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ }
+ else
+ {
+ //璇锋眰澶辫触
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.Information = modResponseTask.Message;
+ _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ }
}
break;
case "861":
{
+ //婊℃斁璐у紓甯�
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鍙�");
+ var (result, TaskNo) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ if (!result.IsSucceed)
+ break;
+ string taskNo = Convert.ToString(TaskNo);
+ var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
+ if (modTask == null)
+ {
+ Log.Error($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ break;
+ }
+ modTask.Status = TaskStatusEnum.Exception;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ Log.Information($"銆愬爢鍨涙満銆憌cs浠诲姟鍙樻洿婊″彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestFullException(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //淇敼浠诲姟涓烘鍦ㄦ墽琛�
+ modTask.Status = TaskStatusEnum.Doing;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ // 璧峰鎺掑垪灞�
+ var modPosRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+ var modPosColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+ var modPosStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+ // 鐩爣鏀捐揣宸ヤ綅
+ var modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+ var modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+ var modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+ string endLocat = modResponseTask.TaskList.EndLocate;
+ string row = int.Parse(endLocat.Substring(0, 2)).ToString();
+ string column = int.Parse(endLocat.Substring(2, 2)).ToString();
+ string storey = int.Parse(endLocat.Substring(4, 2)).ToString();
+ // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+ // 浠诲姟鍙锋墭鐩樺彿
+ listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+ listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+ // 璧峰鎺掑垪灞�
+ listResult.Add(plcConn.SetPlcDBValue(modPosRow.PosType, modDevice.DbNumber, modPosRow.PlcPos, "2"));
+ listResult.Add(plcConn.SetPlcDBValue(modPosColumn.PosType, modDevice.DbNumber, modPosColumn.PlcPos, "100"));
+ listResult.Add(plcConn.SetPlcDBValue(modPosStorey.PosType, modDevice.DbNumber, modPosStorey.PlcPos, "1"));
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, row));
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, column));
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType, modDevice.DbNumber, modPosEndStorey.PlcPos, storey));
+ // 鏄惁鍐欏叆鎴愬姛
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 鍚戣泛鏈哄啓鍏ユ帶鍒舵祦绋嬪瓧
+ var res = modDevice.PLCUtil.SetPlcDBValue(modDevice.PosType, modDevice.WcsPos, "862");
+ var modcTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum,
+ EndLocat = endLocat,
+ InteractiveMsg = $"鍐欏叆鎸囦护锛歿modDevice.StationNum}宸ヤ綅====銆�" + endLocat + "鍌ㄤ綅鍦板潃!"
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modcTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+
+ }
+ //else
+ //{
+ // //璇锋眰澶辫触
+ // modTask.IsSuccess = TaskSuccessEnum.Fail;
+ // modTask.Information = modResponseTask.Message;
+ // _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ //}
}
break;
default:
@@ -537,6 +655,439 @@
/// <param name="modDevice"></param>
private static void ConveyorLine(WcsDeviceDto modDevice)
{
+ var plcConn = modDevice.PLCUtil;
+ // 鑾峰彇妤煎眰鏁�
+ var louCeng = PLCCommon.GetRoadwayByStationNew(modDevice.StationNum);
+ switch (modDevice.Value.ToString())
+ {
+ case "320":
+ {
+ // 鐢宠宸烽亾
+ string strMsg = "";
+ string taskModel = "";
+ // 鍒ゆ柇鏄惁婕旂ず妯″紡
+ if (PLCTaskAction.boDemo)
+ {
+ taskModel = "1";// 婕旂ず妯″紡
+ }
+ // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ var http = new HttpService();
+ string TaskNo = "", EndLocate = "";
+ strMsg = http.RequestRoadWay(palletVal, modDevice.StationNum, taskModel, louCeng, ref EndLocate, ref TaskNo);
+
+ if (!strMsg.Contains("-1"))
+ {
+ // 鍐欏叆330
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "330");
+
+ if (ret.IsSucceed)
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护330锛歿modDevice.StationNum}宸ヤ綅鐢宠宸烽亾",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum,
+ EndLocat = EndLocate,
+ };
+
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+ // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+ if (PLCTaskAction.boRefresh)
+ {
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+ // led鏇存柊鍐呭
+ //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and StationNum = '{EndLocat}'")[0];
+ //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+ }
+
+ }
+ else
+ {
+ // 鐢宠宸烽亾澶辫触锛丩ED鏄剧ず
+ Log.Error(string.Format($"鐢宠宸烽亾澶辫触:{ strMsg },璇诲啓plc閿欒"));
+ }
+ }
+ break;
+ case "330":
+ {
+ // 鍐欏叆浠诲姟 鎵樼洏绉诲姩 340
+
+ // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ string pallet = palletVal.ToString();
+ // 鑾峰彇浠诲姟淇℃伅
+ var modTask = _db.Queryable<WcsTask>().First(s => s.IsDelete == false && s.PalletNo == pallet && (s.Status == TaskStatusEnum.Wait || s.Status == TaskStatusEnum.Doing) && s.TaskType == TaskTypeEnum.In && s.StartRoadway == modDevice.StationNum);
+ if (modTask == null)
+ {
+ // 姝ゆ墭鐩樻病鏈夊搴旂殑杞Щ浠诲姟 led鏄剧ず
+ break;
+ }
+
+ // 鑾峰彇宸烽亾鍙ｅ叆搴撳伐浣�
+ string endLocatVlue = PLCCommon.RoadwayToStationNum(modTask.EndRoadway, louCeng);
+ // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+ // 浠诲姟鍙枫�佷换鍔＄被鍨嬨�佹墭鐩樺彿
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+ var modPosTaskType = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, modDevice.DbNumber, modPosTaskType.PlcPos, modTask.TaskType.ToString()));
+ var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+ // 璧峰宸ヤ綅銆佺洰鐨勫伐浣�
+ var modPosStrLocat = modDevice.listStation.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
+ listResult.Add(plcConn.SetPlcDBValue(modPosStrLocat.PosType, modDevice.DbNumber, modPosStrLocat.PlcPos, modDevice.StationNum));
+ var modPosEndLocat = modDevice.listStation.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndLocat.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, endLocatVlue));
+
+
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 灏嗕换鍔＄姸鎬佸彉鏇翠负姝ｅ湪鎵ц
+ _db.Updateable<WcsTask>()
+ .SetColumns(s => s.Status == TaskStatusEnum.Doing)
+ .Where(s => s.Id == modTask.Id)
+ .ExecuteCommand();
+ // 鍐欏叆娴佺▼瀛� 330 340
+
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "340");
+
+
+ if (ret.IsSucceed)
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护340锛歿modDevice.StationNum}鍌ㄤ綅====銆媨endLocatVlue}宸ヤ綅",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum,
+ EndLocat = endLocatVlue,
+ };
+
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+ // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+ if (PLCTaskAction.boRefresh)
+ {
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+
+ // led鏇存柊鍐呭
+ //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+ }
+ }
+
+ }
+ break;
+ case "620":
+ {
+ // 鐢宠鍌ㄤ綅 鏇存柊鍏ュ簱浠诲姟(鍌ㄤ綅鍦板潃) 630
+
+ var strMsg = "";
+ var taskModel = "";
+ // 鍒ゆ柇鏄惁婕旂ず妯″紡
+ if (PLCTaskAction.boDemo)
+ {
+ // 婕旂ず妯″紡
+ taskModel = "1";
+ }
+ // 鏍规嵁宸ヤ綅鍙疯幏鍙栧贩閬撳彿
+ var roadway = PLCCommon.GetRoadwayByStation(modDevice.StationNum);
+ if (roadway == "")
+ {
+ break;
+ }
+ // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ var http = new HttpService();
+ string TaskNo = "";
+ // 鍚慦MS鐢宠鍌ㄤ綅淇℃伅
+ strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo);
+ if (!strMsg.Contains("-1"))
+ {
+ // 鍐欏叆娴佺▼瀛� 630
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "630");
+
+ if (ret.IsSucceed)
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护340锛歿modDevice.StationNum}宸ヤ綅鐢宠鍌ㄤ綅",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum,
+ EndLocat = strMsg,
+ };
+
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+ // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+ if (PLCTaskAction.boRefresh)
+ {
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+ // led鏇存柊鍐呭
+ //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and StationNum = '{EndLocat}'")[0];
+ //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+ }
+ }
+ else
+ {
+ // 鐢宠鍌ㄤ綅澶辫触锛丩ED鏄剧ず
+ Log.Error(string.Format($"鐢宠鍌ㄤ綅澶辫触:{strMsg},璇诲啓plc閿欒"));
+ }
+
+ }
+ break;
+ case "630":
+ {
+ #region 鍐欏叆璺烘満鍙栬揣浠诲姟 640
+
+ // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+ var modPosTaskNo = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (taskRes, taskNoVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosTaskNo.PlcPos);
+ string pallet = palletVal.ToString();
+ string taskNo = taskNoVal.ToString();
+ // 鑾峰彇浠诲姟淇℃伅
+ var modTask = _db.Queryable<WcsTask>().First(s => s.IsDelete == false && s.PalletNo == pallet && s.Status == TaskStatusEnum.Doing && s.TaskType == TaskTypeEnum.In && s.TaskNo == taskNo);
+ if (modTask == null)
+ {
+ // 姝ゆ墭鐩樻病鏈夊搴旂殑杞Щ浠诲姟 led鏄剧ず
+ break;
+ }
+
+ var sInfo = PLCCommon.GetStokePlc(modTask.EndRoadway, louCeng);
+ if (string.IsNullOrWhiteSpace(sInfo.Ip))
+ {
+ throw new Exception("鏍规嵁宸烽亾鑾峰彇璺烘満IP澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // 璺烘満杩炴帴
+ var plcStackeConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == sInfo.Ip);
+ if (plcStackeConn.Connected)
+ {
+ // 鐩爣鎺掑垪灞�
+ var endLocate = modTask.EndLocate;
+ if (string.IsNullOrWhiteSpace(modTask.EndLocate))
+ {
+ Log.Error(string.Format($"鐩爣浣嶇疆涓虹┖锛岃浜哄伐澶勭悊,璇诲啓plc閿欒"));
+ break;
+ }
+
+ var paiVal = PLCCommon.GetDjAdress(modTask.EndRoadway.Substring(1, 2), endLocate.Substring(0, 2), endLocate.Substring(6, 2));
+ string pai = paiVal.ToString();
+ string lie = int.Parse(endLocate.Substring(2, 2)).ToString();
+ string ceng = int.Parse(endLocate.Substring(4, 2)).ToString();
+
+ var djMod = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.EndRoadway
+ && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
+ var djInfos = PLCTaskAction.plcPositions.Where(m => m.IsDelete == false && m.DeviceId == djMod.Id).ToList();
+ var djInfo = djInfos.First(m => m.Text == "PLC娴佺▼瀛�");
+
+ // 鑾峰彇璺烘満褰撳墠鐘舵��
+ var (djRes, djVal) = plcStackeConn.GetPlcDBValue(djMod.PosType, djMod.DbNumber, djMod.PlcPos);
+ if (djVal != "820")
+ {
+ // 璺烘満闈炵┖闂茬瓑寰�
+ break;
+ }
+ // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+
+ // 浠诲姟鍙枫�佷换鍔＄被鍨嬨�佹墭鐩樺彿
+ var modPosTask = djInfos.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosTask.PosType, djMod.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+ var modPosTaskType = djInfos.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosTaskType.PosType, djMod.DbNumber, modPosTaskType.PlcPos, modTask.TaskType.ToString()));
+ var modPosPalletNo = djInfos.FirstOrDefault(s => s.Text == "鎵樼洏鍙�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosPallet.PosType, djMod.DbNumber, modPosPallet.PlcPos, modTask.PalletNo));
+
+ //璧峰宸ヤ綅
+ var modPosStrStationNum = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrStationNum.PosType, djMod.DbNumber, modPosStrStationNum.PlcPos, modDevice.StationNum));
+
+ //鍙栬揣鎺掋�佸垪銆佸眰
+ var modPosStrPai = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrPai.PosType, djMod.DbNumber, modPosStrPai.PlcPos, sInfo.Pai));
+ var modPosStrLie = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrLie.PosType, djMod.DbNumber, modPosStrLie.PlcPos, sInfo.Lie));
+ var modPosStrCeng = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrCeng.PosType, djMod.DbNumber, modPosStrCeng.PlcPos, sInfo.Ceng));
+ //鏀捐揣鎺掋�佸垪銆佸眰
+ var modPosEndPai = djInfos.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosEndPai.PosType, djMod.DbNumber, modPosEndPai.PlcPos, pai));
+ var modPosEndLie = djInfos.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosEndLie.PosType, djMod.DbNumber, modPosEndLie.PlcPos, lie));
+ var modPosEndCeng = djInfos.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+ listResult.Add(plcStackeConn.SetPlcDBValue(modPosEndCeng.PosType, djMod.DbNumber, modPosEndCeng.PlcPos, ceng));
+
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 鍐欏叆璺烘満 830
+ var retc2 = plcStackeConn.SetPlcDBValue(djMod.PosType, djMod.DbNumber, djMod.WcsPos, "830");
+
+ // 鎻掑叆浠诲姟鏄庣粏 浠诲姟鏄庣粏瀹炰綋绫�
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum,
+ EndLocat = modTask.EndLocate // 鐩爣鍌ㄤ綅鍦板潃
+ };
+ if (!retc2.IsSucceed)
+ {
+ modInsertTaskMonitor.InteractiveMsg = $"杈撻�佺嚎鍙栬揣宸ヤ綅锛歿modDevice.StationNum},鍐欏叆鍨涙満鍙栬揣浠诲姟830澶辫触绛夊緟鍐嶆鍐欏叆";
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ break;
+
+ }
+ modInsertTaskMonitor.InteractiveMsg = $"璺烘満鍐欏叆鎸囦护830锛歿modDevice.StationNum}宸ヤ綅====銆�" + modTask.EndLocate + "鍌ㄤ綅鍦板潃!";
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ if (PLCTaskAction.boRefresh)
+ { //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+
+ }
+
+
+
+
+ }
+
+ #endregion
+ }
+ break;
+ #region 鍑哄簱浜や簰
+
+ case "420":
+ {
+ #region 鎵樼洏鍒拌揪鎷ｉ�夊伐浣�/鍑哄簱鍙�
+ // 鍑哄簱鍙�
+ // led鏄剧ず鎵樼洏淇℃伅
+ // 鍐欏叆430
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "430");
+
+ if (ret.IsSucceed)
+ {
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res, taskVal) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res2, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
+ var modPosStarStationNum = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
+ var (res3, starVal) = plcConn.GetPlcDBValue(modPosStarStationNum.PosType, modDevice.DbNumber, modPosStarStationNum.PlcPos);
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = taskVal,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护430锛氭墭鐩樺埌杈緖modDevice.StationNum}宸ヤ綅",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = starVal,
+ EndLocat = modDevice.StationNum,
+ };
+
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+ // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+ if (PLCTaskAction.boRefresh)
+ {
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+
+ // led鏇存柊鍐呭
+ //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and StationNum = '{EndLocat}'")[0];
+ //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+ }
+ // 鍙嶉WMS鍑哄簱瀹屾垚
+ //TaskReques taskReques = new TaskReques();
+ //taskReques.taskNo = TaskNo;
+ //taskReques.TaskType = "1";
+ //taskReques.TaskStatus = "2";
+ //bool bl = wcsMySql.RequestTasks(taskReques);
+ #endregion
+ }
+ break;
+ case "440":
+ {
+ #region 鎷ｉ�夊畬鎴�,鎵樼洏绂诲紑宸ヤ綅
+ // 鍐欏叆450
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "450");
+ if (ret.IsSucceed)
+ {
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res, taskVal) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res2, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
+ var modPosStarStationNum = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
+ var (res3, starVal) = plcConn.GetPlcDBValue(modPosStarStationNum.PosType, modDevice.DbNumber, modPosStarStationNum.PlcPos);
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = taskVal,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护450锛歿modDevice.StationNum}鎷ｉ�夊畬鎴�,鎵樼洏绂诲紑宸ヤ綅",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = starVal,
+ EndLocat = modDevice.StationNum,
+ };
+
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+ // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+ if (PLCTaskAction.boRefresh)
+ {
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+ // led鏇存柊鍐呭
+ //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and StationNum = '{EndLocat}'")[0];
+ //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+ }
+ #endregion
+ }
+ break;
+
+ #endregion
+
+ default: break;
+ }
}
/// <summary>
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index d2ab908..c66cde7 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -13,6 +13,8 @@
public static bool boOffline = false;
//鑷埛鏂�
public static bool boRefresh = false;
+ //婕旂ず妯″紡
+ public static bool boDemo = false;
public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();
@@ -50,6 +52,7 @@
boRunningState = _sysConfigService.GetConfigValue<bool>("sys_RunningState").Result;
boOffline = _sysConfigService.GetConfigValue<bool>("sys_Offline").Result;
boRefresh = _sysConfigService.GetConfigValue<bool>("sys_Refresh").Result;
+ boDemo = _sysConfigService.GetConfigValue<bool>("sys_demo").Result;
}
/// <summary>
/// 鍒濆鍖朠LC杩炴帴
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index cb84eb5..9509fb6 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -1,18 +1,299 @@
锘縰sing Furion.Logging;
using Furion.RemoteRequest.Extensions;
+using Newtonsoft.Json;
using System.Text;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionResponse.Types;
namespace WCS.Application;
public class HttpService
{
private dynamic Urls;
+
+ private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
public HttpService()
{
var _sysConfigService = App.GetService<SysConfigService>();//todo 杩欓噷闇�瑕佹祴璇曚笅鐢熷懡鍛ㄦ湡闂
Urls = _sysConfigService.GetSystemInfo().Result;
}
+
+
/// <summary>
- /// 璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛
+ /// 璋冪敤WMS鎺ュ彛鐢宠宸烽亾鎺ュ彛
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="startLocat"></param>
+ /// <param name="taskModel"></param>
+ /// <param name="ceng"></param>
+ /// <param name="endLocat"></param>
+ /// <param name="taskNo"></param>
+ /// <returns></returns>
+ public string RequestRoadWay(string palletNo, string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
+ {
+ string returnStr = "";
+
+
+ var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo);
+
+ if (task == null)
+ {
+ var model = new RequestAsnTask()
+ {
+ PalletNo = palletNo,
+ HouseNo = "W01",
+ TaskModel = taskModel
+ };
+
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+ if (result.StatusCode == "0")
+ {
+
+ var taskAdd = new WcsTask()
+ {
+ TaskType = TaskTypeEnum.In,
+ Origin = "WMS",
+ StartLocate = startLocat,
+ TaskNo = result.TaskList.TaskNo,
+ EndLocate = result.TaskList.EndLocate,
+ EndRoadway = result.TaskList.EndRoadway
+ };
+
+ _db.Insertable(taskAdd).ExecuteCommand();
+ endLocat = result.TaskList.EndRoadway;
+ returnStr = result.TaskList.EndLocate;
+
+ }
+ else
+ {
+ returnStr = "-1:" + result.Message;
+ return returnStr;
+ }
+ }
+ else
+ {
+ returnStr = task.EndLocate;
+ endLocat = task.EndRoadway;
+ taskNo = task.TaskNo;
+ }
+
+ endLocat = PLCCommon.RoadwayToStationNum(endLocat, ceng);
+
+ return returnStr;
+ // 纭畾鐩爣宸ヤ綅//闇�娣诲姞灞傛暟纭
+ //switch (endLocat)
+ //{
+ // case "R01":
+ // if (ceng == "1")
+ // {
+ // endLocat = "145";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "252";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "101";
+ // }
+ // break;
+ // case "R02":
+ // if (ceng == "1")
+ // {
+ // endLocat = "137";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "260";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "405";
+ // }
+ // break;
+ // case "R03":
+ // if (ceng == "1")
+ // {
+ // endLocat = "127";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "270";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "409";
+ // }
+ // break;
+ // case "R04":
+ // if (ceng == "1")
+ // {
+ // endLocat = "119";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "278";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "413";
+ // }
+ // break;
+ // case "R05":
+ // if (ceng == "1")
+ // {
+ // endLocat = "109";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "288";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "417";
+ // }
+ // break;
+ // case "R06":
+ // if (ceng == "1")
+ // {
+ // endLocat = "101";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "301";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "421";
+ // }
+ // break;
+ // case "R07":
+ // if (ceng == "1")
+ // {
+ // endLocat = "091";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "307";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "425";
+ // }
+ // break;
+ // case "R08":
+ // if (ceng == "1")
+ // {
+ // endLocat = "083";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "315";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "429";
+ // }
+ // break;
+ // case "R09":
+ // if (ceng == "1")
+ // {
+ // endLocat = "073";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "325";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "433";
+ // }
+ // break;
+ // case "R10":
+ // if (ceng == "1")
+ // {
+ // endLocat = "065";
+ // }
+ // else if (ceng == "2")
+ // {
+ // endLocat = "337";
+ // }
+ // else if (ceng == "3")
+ // {
+ // endLocat = "437";
+ // }
+ // break;
+ //}
+
+
+
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鐢宠鍌ㄤ綅鎺ュ彛
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="startLocat"></param>
+ /// <param name="taskModel"></param>
+ /// <param name="starRoadWay"></param>
+ /// <param name="taskNo"></param>
+ /// <returns></returns>
+ public string RequestLocate(string palletNo, string startLocat, string taskModel, string starRoadWay, ref string taskNo)
+ {
+ string returnStr = "";
+
+
+ var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo && string.IsNullOrWhiteSpace(m.EndLocate));
+
+ if (task == null)
+ {
+ var model = new RequestAsnTask()
+ {
+ PalletNo = palletNo,
+ HouseNo = "W01",
+ RoadWayNo = starRoadWay,
+ TaskModel = taskModel
+ };
+
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/RequestLocation").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+ Log.Information("璋冪敤WMS鐢宠鍌ㄤ綅鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+ if (result.StatusCode == "0")
+ {
+
+ var taskAdd = new WcsTask()
+ {
+ TaskType = TaskTypeEnum.In,
+ Origin = "WMS",
+ StartLocate = startLocat,
+ TaskNo = result.TaskList.TaskNo,
+ EndLocate = result.TaskList.EndLocate,
+ EndRoadway = result.TaskList.EndRoadway
+ };
+
+ _db.Updateable(taskAdd).ExecuteCommand();
+ returnStr = result.TaskList.EndLocate;
+ taskNo = result.TaskList.TaskNo;
+ }
+ else
+ {
+ returnStr = "-1:" + result.Message;
+ return returnStr;
+ }
+ }
+ else
+ {
+ returnStr = task.EndLocate;
+ taskNo = task.TaskNo;
+ }
+
+ return returnStr;
+
+ }
+
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛 鍙嶉浠诲姟鎺ュ彛
/// </summary>
/// <param name="model">浠诲姟瀹屾垚鐘舵��</param>
/// <returns></returns>
--
Gitblit v1.8.0