From b71144811c970ddb7296f5243f722ec6b00cf805 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期四, 13 三月 2025 18:52:52 +0800
Subject: [PATCH] 程序修改
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 1489 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 1,222 insertions(+), 267 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index e0ef176..eced7d0 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1,10 +1,14 @@
锘�
using Dm.filter;
using DocumentFormat.OpenXml.Bibliography;
+using DocumentFormat.OpenXml.Drawing.Charts;
+using Elastic.Clients.Elasticsearch.Snapshot;
using Elastic.Clients.Elasticsearch.Tasks;
+using Flurl.Util;
using Furion.Logging;
using IoTClient;
using Microsoft.AspNetCore.SignalR;
+using NewLife.Reflection;
using Qiniu.Storage;
using RazorEngine.Compilation.ImpromptuInterface.Dynamic;
using SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models;
@@ -12,12 +16,19 @@
using System.Data;
using System.Reflection.Emit;
using WCS.Application.Entity;
+using WCS.Application.Service.WcsDevice.Dto;
using WCS.Application.Util;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressIntracityUpdateStoreRequest.Types;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.NontaxInsertBillRequest.Types.CardExtra.Types.BillCard.Types;
namespace WCS.Application;
public static class PLCService
{
+ private static readonly object OLock = new object();
+
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
+
+ private static int fendao = 1;
public static void OnChangeEvent(object sender, EventArgs e)
{
@@ -40,7 +51,7 @@
BoxConveyorLine(mod); // 鐮佸灈鏈哄櫒浜�
break;
case PLCTypeEnum.StackingRobot:
- PalletMachine(mod);
+ StackingRobot(mod); //鎷嗗灈鏈哄櫒浜�
break;
default:
break;
@@ -58,41 +69,67 @@
private static void StackingMachine(WcsDeviceDto modDevice)
{
var plcConn = modDevice.PLCUtil;
+ string ledText = "";
switch (modDevice.Value.ToString())
{
case "820":
// 璺烘満绌洪棽锛岃幏鍙栧嚭搴撲换鍔°�佺Щ搴撲换鍔�
{
// 鑾峰彇浠诲姟淇℃伅
- var modTask = _db.Queryable<WcsTask>().OrderBy(m => m.CreateTime).OrderBy(m => m.Levels, OrderByType.Desc)
+ var modTask = _db.Queryable<WcsTask>().OrderBy(m => m.Levels, OrderByType.Asc).OrderBy(m => m.CreateTime)
.First(s => s.Status == TaskStatusEnum.Wait && (s.TaskType == TaskTypeEnum.Out || s.TaskType == TaskTypeEnum.Move)
&& s.StartRoadway == modDevice.StationNum);
if (modTask == null)
{
break;
}
-
- // 鏍规嵁鐩爣鍦板潃鍜屽贩閬撹幏鍙栨斁璐у伐浣嶅搴旂殑鎺掑垪灞�
- PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
- modTask.StartRoadway, modTask.EndRoadway);
-
- // 鐩爣宸ヤ綅涓嶄负null锛岄渶鍏堝垽鏂斁璐у伐浣嶆槸鍚︾┖闂�
- if (!string.IsNullOrEmpty(taskInfo.EndStation))
+ //鍒ゆ柇鍑哄簱閿佸畾鏄惁鎵撳紑
+ if (PLCTaskAction.boOutLock)
{
- // 鎵撳紑瀵瑰簲鐨勮緭閫佺嚎杩炴帴
- var plcConveyorConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == taskInfo.Ip);
- if (plcConveyorConn.Connected)
- {
- // 鑾峰彇鏀捐揣宸ヤ綅閰嶇疆淇℃伅
- var ConveyorMod = PLCTaskAction.plcDevices.First(m => m.StationNum == taskInfo.EndStation
- && m.DeviceType == DeviceTypeEnum.Business);
+ break;//鍑哄簱閿佸畾鎵撳紑鍒欎笉鎵ц鍑哄簱浠诲姟
+ }
- var (result, value) = plcConveyorConn.GetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.PlcPos);
- if (result.IsSucceed)
+ PlcTaskInfo taskInfo = new PlcTaskInfo();
+ if (modTask.TaskType == TaskTypeEnum.Move)
+ {
+ taskInfo = PLCCommon.GetEndPai(modTask.EndRoadway.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
+ modTask.EndLocate.Substring(0, 2), modTask.EndLocate.Substring(4, 2),
+ modTask.EndLocate.Substring(6, 2));
+
+ }
+ else
+ {
+ // 鏍规嵁鐩爣鍦板潃鍜屽贩閬撹幏鍙栨斁璐у伐浣嶅搴旂殑鎺掑垪灞�
+ taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
+ modTask.StartRoadway, modTask.EndRoadway);
+
+ // 鐩爣宸ヤ綅涓嶄负null锛岄渶鍏堝垽鏂斁璐у伐浣嶆槸鍚︾┖闂�
+ if (!string.IsNullOrEmpty(taskInfo.EndStation))
+ {
+ // 鎵撳紑瀵瑰簲鐨勮緭閫佺嚎杩炴帴
+ var plcConveyorConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == taskInfo.Ip);
+ if (plcConveyorConn.Connected)
{
- if (value.ToString() != "720") // 720:鏀捐揣绌轰綅绌洪棽锛屽彲鏀捐揣
+ // 鑾峰彇鏀捐揣宸ヤ綅閰嶇疆淇℃伅
+ var ConveyorMod = PLCTaskAction.plcDevices.First(m => m.StationNum == taskInfo.EndStation
+ && m.DeviceType == DeviceTypeEnum.Business);
+
+ var (result, value) = plcConveyorConn.GetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.PlcPos);
+ if (result.IsSucceed)
{
- Log.Error(string.Format("浠诲姟鍙�:{0}:鏀捐揣宸ヤ綅鍗犵敤锛岀◢鍚庢墽琛屻��", modTask.TaskNo));
+ if (value.ToString() != "720") // 720:鏀捐揣绌轰綅绌洪棽锛屽彲鏀捐揣
+ {
+ Log.Error(string.Format("浠诲姟鍙�:{0}:鏀捐揣宸ヤ綅鍗犵敤锛岀◢鍚庢墽琛屻��", modTask.TaskNo));
+ break;
+ }
+ else if (value.ToString() == "720")
+ {
+ // 鑻ョ┖闂叉彁鍓嶅崰鐢ㄦ宸ヤ綅锛屽悓宸ヤ綅鍑哄叆鍏敤鍙� 鏀惧紑姝ょ▼搴�
+ // var ret = plcConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "730");
+ }
+ }
+ else
+ {
break;
}
}
@@ -100,10 +137,6 @@
{
break;
}
- }
- else
- {
- break;
}
}
@@ -182,8 +215,15 @@
_db.Insertable(modInsertTaskMonitor).ExecuteCommand();
//涓嬪彂浠诲姟鏃ュ織
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
//淇敼led灞忎俊鎭�
- //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+ var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == taskInfo.EndStation && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+ ledText += $"浠诲姟绫诲瀷:{modTask.TaskType.GetDescription()}\n\n";
+ ledText += $"浠诲姟鍙�:{modTask.TaskNo}\n";
+ ledText += $"鎵樼洏鍙�:{modTask.PalletNo}\n\n";
+ ledText += $"璧峰浣�:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
+ ledText += $"鐩爣浣�:{modTask.EndRoadway + " " + modTask.EndLocate}";
+ LedDisplay(ledDevice.LedIP, ledText);
}
}
break;
@@ -250,22 +290,23 @@
modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚:640", startStationVal);
// 鎻掑叆浜や簰鏃ュ織
_db.Insertable(modcTaskMonitor).ExecuteCommand();
- }
- var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
+ var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
- if (!retc.IsSucceed)
- {
- modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚640澶辫触", startStationVal);
- // 鎻掑叆浜や簰鏃ュ織
- _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ if (!retc.IsSucceed)
+ {
+ modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚640澶辫触", startStationVal);
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ break;
+ }
+
//涓嬪彂浠诲姟鏃ュ織
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- break;
}
- //涓嬪彂浠诲姟鏃ュ織
- HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
}
// 璇诲彇wcs鎺у埗瀛�
@@ -335,8 +376,6 @@
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
}
- //淇敼led灞忎俊鎭�
- //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
}
}
break;
@@ -350,7 +389,7 @@
{
string tasknoVal = val.ToString();
var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
- if (modTask == null)
+ if (modTask == null)
{
Log.Error(string.Format("璺烘満鎺у埗瀛�860:鏈壘鍒板搴旂殑浠诲姟銆�"));
break;
@@ -401,7 +440,7 @@
}
else
{
- Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
+ Log.Error(string.Format("c锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
}
}
// 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
@@ -413,8 +452,16 @@
HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
// led鏄剧ず鍐呭
- LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.StartLocate, "鍏ュ簱瀹屾垚 " + $"浠诲姟瀹屾垚:{modTask.TaskNo}", "鎵樼洏鍙�:" + modTask.PalletNo);
+ var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.StartLocate && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+ ledText += $"鍏ュ簱瀹屾垚\n\n";
+ ledText += $"浠诲姟鍙�:{modTask.TaskNo}\n";
+ ledText += $"鎵樼洏鍙�:{modTask.PalletNo}\n\n";
+
+ ledText += $"璧峰浣�:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
+ ledText += $"鐩爣浣�:{modTask.EndRoadway + " " + modTask.EndLocate}";
+
+ LedDisplay(ledDevice.LedIP, ledText);
// 姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
}
break;
@@ -480,13 +527,6 @@
//涓嬪彂浠诲姟鏃ュ織
HubUtil.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
- var taskModel = _db.Queryable<WcsTask>().First(w => w.TaskNo == modTask.TaskNo);
- modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskModel.StartLocate).Select(s => s.LedIP).First();
-
- // led鏄剧ず鍐呭
- LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modDevice.StationNum, "鍑哄簱涓� ", "鎵樼洏鍙�:" + modTask.PalletNo);
-
break;
}
}
@@ -498,21 +538,22 @@
case TaskTypeEnum.Move: // 绉诲簱浠诲姟
{
var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- var result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
+ var result = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
if (!result.IsSucceed)
{
Log.Error($"{modDevice.Text}鍐欏叆浠诲姟鍙峰け璐�");
break;
}
- result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+ result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
if (!result.IsSucceed)
{
- Log.Error($"{modDevice.Text}鎺у埗瀛楀啓鍏�30澶辫触");
+ Log.Error($"{modDevice.Text}鎺у埗瀛楀啓鍏�870澶辫触");
break;
}
// 鏀瑰彉浠诲姟鐘舵��
modTask.Status = TaskStatusEnum.Complete;
modTask.FinishDate = DateTime.Now;
+ modTask.Levels = 999;
_db.Updateable(modTask).ExecuteCommand();
//涓嬪彂浠诲姟鏃ュ織
HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
@@ -534,8 +575,8 @@
{
TaskNo = modTask.TaskNo,
PalletNo = modTask.PalletNo,
- TaskType = TaskTypeEnum.Move.ToString(),
- TaskStatus = TaskStatusEnum.Complete.ToString()
+ TaskType = ((int)TaskTypeEnum.Move).ToString(),
+ TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
};
HttpService httpService = new HttpService();
var modResponseTask = httpService.RequestTask(requestMode).Result;
@@ -543,7 +584,10 @@
{
modcTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
//淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
-
+ }
+ else
+ {
+ Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
}
}
// 鎻掑叆浜や簰鏃ュ織
@@ -575,7 +619,7 @@
var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
if (modTask == null)
{
- Log.Error($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ Log.Error($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿TaskNo}");
break;
}
var res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "844");
@@ -610,7 +654,7 @@
{
//婊℃斁璐у紓甯�
var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- var modPosPalletNo = 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;
@@ -618,7 +662,7 @@
var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
if (modTask == null)
{
- Log.Error($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ Log.Error($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿TaskNo}");
break;
}
modTask.Status = TaskStatusEnum.Exception;
@@ -647,17 +691,38 @@
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));
+
+ PlcTaskInfo taskInfo = new PlcTaskInfo();
+ taskInfo = PLCCommon.GetEndPai(modTask.EndRoadway.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
+ modTask.EndLocate.Substring(0, 2), modTask.EndLocate.Substring(4, 2),
+ modTask.EndLocate.Substring(6, 2));
+
+ // 缁橮LC鍐欏叆浠诲姟鏁版嵁
var listResult = new List<Result>();
// 浠诲姟鍙锋墭鐩樺彿
+ modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+ modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
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));
+ // 鐩爣鏀捐揣宸ヤ綅(鍥哄畾鎺掑垪灞�)
+ modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, taskInfo.EndPai));
+ modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, taskInfo.EndLie));
+ modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType, modDevice.DbNumber, modPosEndStorey.PlcPos, taskInfo.EndCeng));
+
// 鏄惁鍐欏叆鎴愬姛
if (listResult.All(s => s.IsSucceed))
{
@@ -695,7 +760,7 @@
}
}
/// <summary>
- /// 鍫嗗灈鏈轰笉绌鸿窇
+ /// 涓嶇┖璺�
/// </summary>
/// <param name="modTask">鎿嶄綔瀹屾垚鐨勪换鍔�</param>
/// <param name="plcConn">plc杩炴帴</param>
@@ -861,6 +926,11 @@
var plcConn = modDevice.PLCUtil;
// 鑾峰彇妤煎眰鏁癱eshi
var louCeng = PLCCommon.GetRoadwayByStationNew(modDevice.StationNum);
+ if (louCeng == "")
+ {
+ return;
+ }
+ var ledText = "";
switch (modDevice.Value.ToString())
{
case "320":
@@ -868,11 +938,7 @@
// 鐢宠宸烽亾
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);
@@ -880,8 +946,84 @@
{
break;
}
+ var modPosEndLocat = modDevice.listStation.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
+
+
+ //鍒ゆ柇鍏ュ簱閿佸畾鏄惁鎵撳紑
+ if (PLCTaskAction.boEnterLock)
+ {
+ var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ if (res350.IsSucceed && palletVal350 != "350")
+ {
+ ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+ ledText += $"鎵樼洏鍙�:{palletVal}\n";
+ ledText += $"鍏ュ簱浠诲姟宸查攣瀹氾紝璇疯В閿佸悗閲嶈瘯!\n";
+ LedDisplay(modDevice.LedIP, ledText);
+ }
+
+ // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+ if (ret.IsSucceed)
+ {
+ plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+ }
+
+ break;
+ }
+
+ if (palletVal == null)
+ {
+ var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ if (res350.IsSucceed && palletVal350 != "350")
+ {
+ ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+ ledText += $"鎵樼洏鍙�:{palletVal}\n";
+ ledText += $"鎵弿鎵樼洏鍙峰け璐�!\n";
+ LedDisplay(modDevice.LedIP, ledText);
+ }
+
+ // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+ if (ret.IsSucceed)
+ {
+ plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+ }
+
+ break;
+ }
+
var http = new HttpService();
string TaskNo = "", EndLocate = "";
+
+ //鏍规嵁宸ヤ綅鍒ゆ柇鏄惁涓哄彔鎵樻満宸ヤ綅鐢宠绌烘墭鐩樿泛鍏ュ簱锛屾槸锛氬悜WMS鐢宠绌烘墭鐩樿泛缁勬墭
+ string groupMsg = "";
+ if (modDevice.StationNum == "27")
+ {
+ var (res2,Qty) = plcConn.GetPlcDBValue(PLCDataTypeEnum.Short,"DB135","0");//鑾峰彇鍙犳墭鏈哄彔鎵樻暟閲�
+
+ groupMsg = http.BindPlnInHouseWcs(Qty.ToString(), palletVal);
+
+ if (groupMsg.Contains("-1"))
+ {
+ var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ if (res350.IsSucceed && palletVal350 != "350")
+ {
+ ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+ ledText += $"鎵樼洏鍙�:{palletVal}\n";
+ ledText += $"{strMsg}\n";
+ LedDisplay(modDevice.LedIP, ledText);
+ }
+
+ // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+ if (ret.IsSucceed)
+ {
+ plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+ }
+ break;
+ }
+ }
+ string IsBale = "0";
strMsg = http.RequestRoadWay(palletVal, modDevice.StationNum, taskModel, louCeng, ref EndLocate, ref TaskNo);
if (!strMsg.Contains("-1"))
@@ -892,7 +1034,6 @@
// 鍐欏叆330
var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "330");
-
if (ret.IsSucceed)
{
// 鎻掑叆浠诲姟鏄庣粏
@@ -907,27 +1048,67 @@
StartLocat = modDevice.StationNum,
EndLocat = EndLocate,
};
-
// 鎻掑叆浜や簰鏃ュ織
_db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+ //鍒ゆ柇鏄惁瑁瑰寘
+ var gbPos = modDevice.listStation.FirstOrDefault(s => s.Text == "Element_1");
+ strMsg = new HttpService().RequestPackWcs(palletVal);
+ if (strMsg == "1")
+ {
+ //鍐欏叆瑁瑰寘鎸囦护
+ ret = plcConn.SetPlcDBValue(gbPos.PosType, modDevice.DbNumber, gbPos.PlcPos, "2");
+ }
+ else
+ {
+ ret = plcConn.SetPlcDBValue(gbPos.PosType, modDevice.DbNumber, gbPos.PlcPos, "1");
+ }
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
// led鏄剧ず鍐呭
- LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modDevice.StationNum, "鐢宠鍏ュ簱 " + $"鐩爣宸烽亾锛歿EndLocate}", "鎵樼洏鍙�:" + palletVal);
+ try
+ {
+ ledText += $"浠诲姟绫诲瀷:{taskInfo.TaskType.GetDescription()}\n\n";
+
+ ledText += $"浠诲姟鍙�:{taskInfo.TaskNo}\n";
+ ledText += $"鎵樼洏鍙�:{taskInfo.PalletNo}\n\n";
+
+ ledText += $"璧峰浣�:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
+ ledText += $"鐩爣浣�:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
+ LedDisplay(modDevice.LedIP, ledText);
+
+ }
+ catch (Exception ex)
+ {
+ Log.Error(ex.Message);
+ }
+
}
}
else
{
- // 鐢宠宸烽亾澶辫触锛丩ED鏄剧ず
- Log.Error(string.Format($"鐢宠宸烽亾澶辫触:{strMsg},璇诲啓plc閿欒"));
+ var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ if (res350.IsSucceed && palletVal350 != "350")
+ {
+ ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+ ledText += $"鎵樼洏鍙�:{palletVal}\n";
+ ledText += $"{strMsg}\n";
+ LedDisplay(modDevice.LedIP, ledText);
+ }
+
+ // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+ if (ret.IsSucceed)
+ {
+ plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+ }
}
}
break;
case "330":
{
-
// 鍐欏叆浠诲姟 鎵樼洏绉诲姩 340
// 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
@@ -944,6 +1125,11 @@
{
// 姝ゆ墭鐩樻病鏈夊搴旂殑杞Щ浠诲姟 led鏄剧ず
break;
+ }
+ //鍒ゆ柇鍏ュ簱閿佸畾鏄惁鎵撳紑
+ if (PLCTaskAction.boEnterLock)
+ {
+ break;//鍏ュ簱閿佸畾鎵撳紑鍒欎笉鎵ц鍏ュ簱浠诲姟
}
// 鑾峰彇宸烽亾鍙ｅ叆搴撳伐浣�
@@ -1000,8 +1186,6 @@
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- // led鏄剧ず鍐呭
- LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modDevice.StationNum, "鍏ュ簱涓� " + $"鐩爣宸烽亾锛歿endLocatVlue}", "鎵樼洏鍙�:" + palletVal);
}
}
@@ -1037,12 +1221,11 @@
// 鍚慦MS鐢宠鍌ㄤ綅淇℃伅
strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo);
- // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
- var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == TaskNo);
- modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
-
if (!strMsg.Contains("-1"))
{
+ // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+ var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == TaskNo);
+ modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
// 鍐欏叆娴佺▼瀛� 630
var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "630");
@@ -1066,14 +1249,25 @@
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- // led鏄剧ず鍐呭
- LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modDevice.StationNum, "鍏ュ簱涓� " + $"鐢宠鍌ㄤ綅鍦板潃:{strMsg}", "鎵樼洏鍙�:" + palletVal);
+
+ var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+ ledText += $"浠诲姟绫诲瀷:{taskInfo.TaskType.GetDescription()}\n\n";
+ ledText += $"浠诲姟鍙�:{taskInfo.TaskNo}\n";
+ ledText += $"鎵樼洏鍙�:{taskInfo.PalletNo}\n\n";
+ ledText += $"璧峰浣�:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
+ ledText += $"鐩爣浣�:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
+ LedDisplay(modDevice.LedIP, ledText);
}
}
else
{
// 鐢宠鍌ㄤ綅澶辫触锛丩ED鏄剧ず
Log.Error(string.Format($"鐢宠鍌ㄤ綅澶辫触:{strMsg},璇诲啓plc閿欒"));
+ // led鏄剧ず鍐呭
+ var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+ ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+ ledText += $"{strMsg}\n";
+ LedDisplay(modDevice.LedIP, ledText);
}
}
@@ -1121,6 +1315,7 @@
break;
}
+ // 杞崲鐩爣宸ヤ綅鎺掑垪灞� 03010301
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();
@@ -1235,6 +1430,9 @@
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);
+ string tasknoVal = taskVal.ToString();
+ ////string b = taskVal.GetValue();
+ //string a = palletVal.ToString();
// 鎻掑叆浠诲姟鏄庣粏
var modInsertTaskMonitor = new WcsTaskMonitor()
{
@@ -1244,10 +1442,10 @@
InteractiveMsg = $"鍐欏叆鎸囦护430锛氭墭鐩樺埌杈緖modDevice.StationNum}宸ヤ綅",
PalletNo = palletVal,
Status = TaskStatusEnum.Complete,
- StartLocat = starVal,
+ StartLocat = starVal.ToString(),
EndLocat = modDevice.StationNum,
};
-
+
// 鎻掑叆浜や簰鏃ュ織
_db.Insertable(modInsertTaskMonitor).ExecuteCommand();
@@ -1256,10 +1454,18 @@
// 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == modInsertTaskMonitor.TaskNo);
- modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
+ modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.EndLocate).Select(s => s.LedIP).First();
// led鏄剧ず鍐呭
- LedDisplay(modDevice.LedIP, "鍒拌揪宸ヤ綅:" + modDevice.StationNum, "鍑哄簱瀹屾垚 " + $"鍌ㄤ綅鍦板潃锛歿modInsertTaskMonitor.StartLocat}", "鎵樼洏鍙�:" + palletVal);
+ // 鏍规嵁鐩爣宸ヤ綅鍙疯幏鍙栧搴旂殑LEDIP鍦板潃
+ var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId == modDevice.PlcId);
+
+ ledText += $"鍑哄簱瀹屾垚\n\n";
+ ledText += $"浠诲姟鍙�:{taskInfo.TaskNo}\n";
+ ledText += $"鎵樼洏鍙�:{taskInfo.PalletNo}\n\n";
+ ledText += $"璧峰浣�:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
+ ledText += $"鐩爣浣�:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
+ LedDisplay(ledDevice.LedIP, ledText);
}
// 鍙嶉WMS鍑哄簱瀹屾垚
//TaskReques taskReques = new TaskReques();
@@ -1283,7 +1489,7 @@
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);
-
+
string tasknoVal = taskVal.ToString();
var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
if (modTask == null)
@@ -1294,6 +1500,7 @@
// 鏀瑰彉浠诲姟鐘舵��
modTask.Status = TaskStatusEnum.Complete;
modTask.FinishDate = DateTime.Now;
+ modTask.Levels = 999;
_db.Updateable(modTask).ExecuteCommand();
HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
// 鎻掑叆浠诲姟鏄庣粏
@@ -1302,7 +1509,7 @@
TaskNo = modTask.TaskNo,
PlcId = modDevice.Id,
PlcName = modDevice.Text,
- InteractiveMsg = $"鍐欏叆鎸囦护450锛歿modDevice.StationNum}鎷ｉ�夊畬鎴�,鎵樼洏绂诲紑宸ヤ綅",
+ InteractiveMsg = $"鍐欏叆鎸囦护450锛歿modDevice.StationNum}鍑哄簱瀹屾垚",
PalletNo = palletVal,
Status = TaskStatusEnum.Complete,
StartLocat = starVal.ToString(),
@@ -1313,7 +1520,7 @@
// 鍙嶉WMS
var requestMode = new TaskRequestWMS()
{
- TaskNo = modTask.TaskNo,
+ TaskNo = modTask.TaskNo + modTask.EndLocate ,
PalletNo = modTask.PalletNo,
TaskType = ((int)TaskTypeEnum.Out).ToString(),
TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
@@ -1336,8 +1543,14 @@
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
// led鏄剧ず鍐呭
- modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == modTask.StartLocate).Select(s => s.LedIP).First();
- LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.StartLocate, $"鎷ｉ�夊畬鎴愶紝鎵樼洏绂诲紑宸ヤ綅", "鎵樼洏鍙�:" + modTask.PalletNo);
+ var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId == modDevice.PlcId);
+
+ ledText += $"鍑哄簱瀹屾垚\n\n";
+ ledText += $"浠诲姟鍙�:{modTask.TaskNo}\n";
+ ledText += $"鎵樼洏鍙�:{modTask.PalletNo}\n\n";
+ ledText += $"璧峰浣�:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
+ ledText += $"鐩爣浣�:{modTask.EndRoadway + " " + modTask.EndLocate}";
+ LedDisplay(ledDevice.LedIP, ledText);
}
#endregion
}
@@ -1349,6 +1562,13 @@
case "50":
// plc鐢宠绌烘墭
{
+ // 闃叉閲嶅鍙┖鎵樿泛
+ var (res, palletVal) = plcConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos);
+ if (palletVal != 0)
+ {
+ break;
+ }
+
// 璋冪敤WMS绌烘墭鍑哄簱鎺ュ彛锛岃繑鍥炲嚭搴撲换鍔″瓨鍏ュ嚭搴撹〃
var strMsg = "";
var http = new HttpService();
@@ -1371,7 +1591,7 @@
// 璋冪敤wms浠诲姟鍑哄簱浠诲姟瀹屾垚
// 鑾峰彇璺烘満鐐逛綅閰嶇疆
var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
- var (res, val) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosTask.PlcPos);
+ var (res, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
// 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�
if (res.IsSucceed)
{
@@ -1379,7 +1599,7 @@
var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
if (modTask == null)
{
- Log.Error(string.Format($"宸ヤ綅鍙凤細{modDevice.StationNum}绌烘墭鐩樺埌杈撅紝鏈壘鍒板搴旂殑浠诲姟!浠诲姟鍙穥tasknoVal};"));
+ //Log.Error(string.Format($"宸ヤ綅鍙凤細{modDevice.StationNum}绌烘墭鐩樺埌杈撅紝鏈壘鍒板搴旂殑浠诲姟!浠诲姟鍙穥tasknoVal};"));
break;
}
// 鍐欏叆plc娴佺▼瀛�90
@@ -1389,6 +1609,7 @@
// 鏀瑰彉浠诲姟鐘舵��
modTask.Status = TaskStatusEnum.Complete;
modTask.FinishDate = DateTime.Now;
+ modTask.Levels = 999;
_db.Updateable(modTask).ExecuteCommand();
HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
@@ -1408,7 +1629,7 @@
// 鍙嶉WMS
var requestMode = new TaskRequestWMS()
{
- TaskNo = modTask.TaskNo,
+ TaskNo = modTask.TaskNo + modTask.EndLocate ,
PalletNo = modTask.PalletNo,
TaskType = ((int)TaskTypeEnum.Out).ToString(),
TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
@@ -1430,6 +1651,154 @@
HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
}
}
+ }
+ break;
+ #endregion
+ case "10":
+ {
+ #region 缂犺啘瀹屾垚
+ // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+ var strMsg = "";
+ var http = new HttpService();
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+
+ //鍚慦MS鍙嶉鎵樼洏缂犺啘瀹屾垚
+ strMsg = http.RequestPackedWcs(palletVal);
+ if (!strMsg.Contains("-1"))
+ {
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "11");//鏀跺埌缂犺啘瀹屾垚11
+ if (ret.IsSucceed)
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护11锛歿modDevice.StationNum}宸ヤ綅缂犺啘瀹屾垚",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ }
+ }
+ else
+ {
+
+ }
+ #endregion
+ }
+ break;
+ case "20":
+ {
+ #region 鏄惁鎷嗚啘 21锛氬惁 22锛氭槸
+ // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+ var strMsg = "";
+ var http = new HttpService();
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ // 鑾峰彇鎵樼洏浠诲姟鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�,鐩殑宸ヤ綅鏄�009鐨勫啀鍚慦MS鍙戝嚭鎷嗚啘鐢宠
+ if (res1.IsSucceed)
+ {
+ string tasknoVal = val.ToString();
+ var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+ if (modTask == null)
+ {
+ break;
+ }
+ }
+
+ strMsg = http.RequestUnPackWcs(palletVal);
+ if (!strMsg.Contains("-1"))
+ {
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "22");
+ if (ret.IsSucceed)
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护22锛歿modDevice.StationNum}宸ヤ綅闇�瑕佹媶鑶�",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ }
+ }
+ else
+ {
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "21");
+ if (ret.IsSucceed)
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护21锛歿modDevice.StationNum}宸ヤ綅涓嶉渶瑕佹媶鑶�",
+ PalletNo = palletVal,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ }
+ }
+
+
+ #endregion
+
+ }
+ break;
+ #region 灏忚溅鍙斁淇″彿
+ case "150":
+ { // 鑾峰彇宸ヤ綅浠诲姟鍙蜂俊鎭�
+ var strMsg = "";
+ var http = new HttpService();
+ // 鑾峰彇鎵樼洏浠诲姟鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ if (res1.IsSucceed)
+ {
+ string tasknoVal = val.ToString();
+ var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
+ if (modTask == null)
+ {
+ //璇诲彇鎴愬姛鍚庡啓鍏�151
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "151");//鏀跺埌鍙斁淇″彿鍚庡啓鍏�151
+ if (ret.IsSucceed)
+ {
+ //鍥炰紶WMS鍙斁淇″彿
+ strMsg = http.RequesContinueAgv(val.ToString(), modDevice.StationNum);
+ if (!strMsg.Contains("-1"))
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = tasknoVal,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护151锛歿modDevice.StationNum}宸ヤ綅鍙帴鍙桝GV鏀捐揣鍏ュ簱",
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ }
+ }
+ break;
+ }
+ }
+ //
+
}
break;
#endregion
@@ -1483,8 +1852,8 @@
private static async void BoxConveyorLine(WcsDeviceDto modDevice)
{
var plcConn = modDevice.PLCUtil;
-
- if (modDevice.DbNumber == "DB101")
+ //浜屾ゼ涓绘壂鍒嗛亾
+ if (modDevice.DbNumber == "DB101")//&& modDevice.DbNumber == "DB102"&& (modDevice.DbNumber == "DB102"||modDevice.PlcIdIP == "10.18.51.110")
{
// 涓绘壂浜や簰娴佺▼
switch (modDevice.Value.ToString())
@@ -1493,15 +1862,26 @@
// 涓绘壂鐢宠鍒嗛亾 wcs鍐欏叆2
{
// 鍒ゆ柇鏄惁婕旂ず妯″紡 true锛氭紨绀烘ā寮� false:鐢熶骇妯″紡
- if (PLCTaskAction.boDemo)
+ if (PLCTaskAction.boDemo)
{
// 閫氶亾鍙�
var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
- // 婕旂ず妯″紡鐩存帴鍐欏叆1鍒嗛亾
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "1");
+ // 婕旂ず妯″紡鐩存帴鍐欏叆鍒嗛亾鍙�
+ //Random random = new Random();
+ //int ranNumber = random.Next(2) == 0 ? 1 : 5;
+ if (fendao == 1)
+ {
+ fendao = 5;
+ }
+ else
+ {
+ fendao = 1;
+ }
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, fendao.ToString()); //
if (ret.IsSucceed)
{
+ Log.Information(string.Format("鍒嗛亾鎴愬姛锛岄亾鍙锋槸锛�" + fendao));
// 鍐欏叆娴佺▼鎺у埗瀛� 2
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
if (!retVal.IsSucceed)
@@ -1554,11 +1934,12 @@
}
}
}
- // 鏍规嵁绠卞唴鍝佺鍙疯幏鍙栫爜韬茬粦瀹氬伐浣嶅強瀵瑰簲鐨勫垎閬撳彿
- var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo);
- if (checkTaskInfo == null)
+
+
+ // 楠岃瘉鏄惁闆剁
+ if (boxInfo.BitBoxMark == "1")
{
- // 缁戝畾淇℃伅涓簄ull鍐欏叆鍓旈櫎閫氶亾鍙�
+ // 鏄浂绠辩洿鎺ュ墧闄わ紝杩涜浜哄伐缁勬墭
var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
if (ret.IsSucceed)
{
@@ -1566,21 +1947,250 @@
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
if (retVal.IsSucceed)
{
- Log.Error("绠辩爜鏈粦瀹氬垎鎷ｄ换鍔★紝杩涜鍓旈櫎銆�");
+ Log.Error("闆剁锛岃繘琛屽墧闄ゃ��");
break;
+ }
+ }
+ break;
+ }
+
+
+ // 鏍规嵁绠卞唴鍝佺鍙疯幏鍙栫爜韬茬粦瀹氬伐浣嶅強瀵瑰簲鐨勫垎閬撳彿
+ var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo && w.Status == "1");
+ if (checkTaskInfo == null)
+ {
+ // 鍒ゆ柇鏄惁鍏宠仈鍗曟嵁 wcsordertask
+ var orderModel = _db.Queryable<WcsOderTask>()
+ .First(m => m.SkuNo == boxInfo.SkuNo && m.Status == TaskStatusEnum.Wait && m.LotNo == boxInfo.LotNo && m.IsDelete == false);
+ if (orderModel != null)
+ {
+ // 鏍规嵁boxinfo琛ㄤ骇绾垮瓧娈佃嚜鍔ㄧ粦瀹氬垎閬�(1绾夸骇鍝佸彧鑳界粦瀹氬埌8閬�)
+ if (boxInfo.LineNo != "1")
+ {// 缁戝畾鍒伴櫎8閬撳鍏朵粬閬�
+
+ // 鑾峰彇鏈粦瀹氶亾
+ var lineNoModels = _db.Queryable<WcsCheckTask>()
+ .Where(m => m.Status == "0" && m.LineNo != "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer).ToList();
+ if (lineNoModels.Count > 0)
+ {
+ // 鑾峰彇褰撳墠鐗╂枡鍝佺鍙�
+ var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
+ if (skuInfo == null)
+ {
+ // 姝や骇鍝佽嫢娌¤瀹氬搧瑙勶紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+ break;
+ }
+ }
+ break;
+ }
+
+ foreach (var lineNoModel in lineNoModels)
+ {
+ // 璇诲彇璁惧楠岃瘉鏄惁缁戝畾鍒嗛亾
+ var (respg, pzNo) = plcConn.GetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos);
+ if (respg.IsSucceed)
+ {
+ if (pzNo != 0)
+ {
+ // plc姝ゅ垎閬撴湭瑙ｇ粦
+ break;
+ }
+ else
+ {
+ // 鑷姩缁戝畾鍒嗛亾
+ lineNoModel.OrderNo = orderModel.OrderNo;
+ lineNoModel.LotNo = boxInfo.LotNo;
+ lineNoModel.SkuNo = boxInfo.SkuNo;
+ lineNoModel.SkuName = boxInfo.SkuName;
+ lineNoModel.Qty = orderModel.Qty;
+ lineNoModel.Status = "1";//宸茬粦瀹�
+ lineNoModel.PZNo = skuInfo.PZNo;
+
+ // 缁橮LC鍐欏叆鍝佽
+ var ret = plcConn.SetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos, skuInfo.PZNo);
+ if (ret.IsSucceed)
+ {
+ //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+ _db.Updateable(lineNoModel).ExecuteCommand();
+ //鏇存柊WcsOderTask琛�
+ orderModel.Status = TaskStatusEnum.Doing;
+ _db.Updateable(orderModel).ExecuteCommand();
+ // Liudl 閫氱煡鍓嶇鏇存柊鍒嗘嫞浠诲姟
+ //涓嬪彂鍒嗘嫞浠诲姟
+ HubUtil.PublicCheckTask(lineNoModel.Adapt<WcsDeviceTaskOrderDto>());
+ break;
+ }
+ else
+ {
+ throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粦瀹氬け璐ワ紒");
+ }
+ }
+ }
+ else
+ {
+ // 璇诲彇plc澶辫触
+ break;
+ }
+ }
+
+ }
+ else
+ {
+ // 鑻ユ病鏈夌┖闂查亾锛岃繘琛屽墧闄ゅ鐞嗐�傞槻姝㈠牭濉炰欢绠辩嚎
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+ break;
+ }
+ }
+ break;
+ }
+ }
+ else
+ {// 缁戝畾鍒�8閬�
+ // 鑾峰彇鏈粦瀹氶亾
+ var lineNo8Model = _db.Queryable<WcsCheckTask>()
+ .First(m => m.Status == "0" && m.LineNo == "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer);
+ if (lineNo8Model != null)
+ {
+ // 鑾峰彇褰撳墠鐗╂枡鍝佺鍙�
+ var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
+ if (skuInfo == null)
+ {
+ // 姝や骇鍝佽嫢娌¤瀹氬搧瑙勶紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+ break;
+ }
+ }
+ break;
+ }
+
+
+ // 璇诲彇璁惧楠岃瘉鏄惁缁戝畾鍒嗛亾
+ var (respg, pzNo) = plcConn.GetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos);
+ if (respg.IsSucceed)
+ {
+ if (pzNo != 0)
+ {
+ // plc姝ゅ垎閬撴湭瑙ｇ粦
+ break;
+ }
+ else
+ {
+ // 鑷姩缁戝畾鍒嗛亾
+ lineNo8Model.OrderNo = orderModel.OrderNo;
+ lineNo8Model.LotNo = boxInfo.LotNo;
+ lineNo8Model.SkuNo = boxInfo.SkuNo;
+ lineNo8Model.SkuName = boxInfo.SkuName;
+ lineNo8Model.Qty = orderModel.Qty;
+ lineNo8Model.Status = "1";//宸茬粦瀹�
+ lineNo8Model.PZNo = skuInfo.PZNo;
+
+ // 缁橮LC鍐欏叆鍝佽
+ var ret = plcConn.SetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos, skuInfo.PZNo);
+ if (ret.IsSucceed)
+ {
+ //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+ _db.Updateable(lineNo8Model).ExecuteCommand();
+ //鏇存柊WcsOderTask琛�
+ orderModel.Status = TaskStatusEnum.Doing;
+ _db.Updateable(orderModel).ExecuteCommand();
+
+ // Liudl 閫氱煡鍓嶇鏇存柊鍒嗘嫞浠诲姟
+ //涓嬪彂鍒嗘嫞浠诲姟
+ HubUtil.PublicCheckTask(lineNo8Model.Adapt<WcsDeviceTaskOrderDto>());
+ break;
+ }
+ else
+ {
+ throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粦瀹氬け璐ワ紒");
+ }
+ }
+ }
+ else
+ {
+ // 璇诲彇plc澶辫触
+ break;
+ }
+
+
+ }
+ else
+ {
+ // 娌℃湁绌洪棽閬擄紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+ break;
+ }
+ }
+ break;
+ }
+ }
+ }
+ else
+ {
+ // 涓嶅叧鑱斿崟鎹洿鎺ヨ繘琛屽墧闄ゅ鐞�
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("绠辩爜鏈粦瀹氬垎鎷ｄ换鍔★紝杩涜鍓旈櫎銆�");
+ break;
+ }
}
}
}
else
{
// 涓巔lc浜や簰鍐欏叆鍒嗛亾鍙峰拰娴佺▼鎺у埗瀛�
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, checkTaskInfo.RoboatNo);
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, checkTaskInfo.LineNo);
if (ret.IsSucceed)
{
// 鍐欏叆娴佺▼鎺у埗瀛� 2
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
if (retVal.IsSucceed)
{
+ { // liudl 姝ゆ绋嬪簭涓嶄細鎵ц 纭鍚庣洿鎺ュ垹闄�
+ if (modDevice.DbNumber == "DB102")//1L鎷嗚泛鍒嗘嫞鍚庨渶瑕佸洖浼犵鐮�
+ {
+ var http = new HttpService();
+ IsBaleModel2 ret1 = http.RequestBoxno(boxNoVal);
+ if (ret1.Success == -1)
+ {
+ Log.Error("绠辩爜鍒嗘嫞鍥炰紶澶辫触锛岄渶瑕佹墜鍔ㄦ嫞璐с�傚け璐ョ鐮侊細" + boxNoVal);
+ break;
+ }
+ }
+ }
break;
}
}
@@ -1591,11 +2201,89 @@
break;
default: break;
}
- }
- else
+ }
+ //涓�妤间富鎵垎閬�
+ else if (modDevice.DbNumber == "DB102")
+ {
+ switch (modDevice.Value.ToString())
+ {
+ case "1":
+ // 1妤间欢绠盤LC璇锋眰WCS璇荤爜
+ {
+ // 璇诲彇plc绠辩爜
+ var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "涓绘壂鏉＄爜");
+ var (res, boxNo) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
+ if (string.IsNullOrWhiteSpace(boxNo.ToString()))
+ {
+
+ // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
+ break;
+ }
+ }
+ }
+ else
+ {
+ // 绠辩爜
+ string boxNoVal = boxNo.ToString();
+ // 閫氶亾鍙�
+ var modLineNo = modDevice.listStation.FirstOrDefault(m => m.Text == "閫氶亾鍙�");
+
+ // 璋冪敤wms鎺ュ彛楠岃瘉绠辩爜鏄惁鍙嫞璐у苟杩斿洖瑁呰溅鍙�
+ var http = new HttpService();
+ RequestloadingAddre requesModel = http.ResultBoxInfoExportWcs(boxNoVal);
+ if (requesModel.Success != "1")
+ {
+ // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+ var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("鍑哄簱鍒嗘嫞鏍规嵁绠辩爜鑾峰彇瑁呰溅鍙ｅけ璐ワ紝杩涜鍓旈櫎銆�" + requesModel.Message);
+ break;
+ }
+ }
+ }
+ else
+ {
+ // 鍐欏叆鍑哄簱鍒嗛亾鍙�
+ // var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, requesModel.loadingAddre);
+ var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, requesModel.loadingAddre);
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ break;
+ }
+ }
+ }
+ }
+ }; break;
+ case "10":
+ // 1妤间欢绠盤LC璇荤爜澶辫触锛學CS涓嶅仛澶勭悊鐩存帴鍓旈櫎鎵嬫寔鎷ｈ揣銆�
+ {
+
+ }; break;
+ default:
+ break;
+ }
+ }
+ else
{
// 鎻掔爜浜や簰
- switch (modDevice.Value.ToString())
+ switch (modDevice.Value.ToString())
{
case "1":
// 鎵樼洏鏉＄爜鍙
@@ -1605,7 +2293,7 @@
// 璇诲彇PLC鎵樼洏鏉＄爜鍙�
var (res, palletVal) = plcConn.GetPlcDBValue(modPalletNo.PosType, modDevice.DbNumber, modPalletNo.PlcPos);
string palletNo = palletVal.ToString();
- if (string.IsNullOrEmpty(palletNo))
+ if (string.IsNullOrEmpty(palletNo))
{
Log.Error(string.Format("{0}锛岃鍙栫殑鎵樼洏鍙蜂负null", modDevice.Text));
break;
@@ -1613,18 +2301,18 @@
// 鏍规嵁宸ヤ綅鍙峰皢鎵樼洏鍙蜂繚瀛樺湪鍒嗛亾琛�
var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
- if (checkTaskMedel == null)
+ if (checkTaskMedel == null)
{
Log.Error(string.Format("鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栧垎閬撳け璐�!", modDevice.StationNum));
break;
}
checkTaskMedel.PalletNo = palletNo;
var rowCount = _db.Updateable(checkTaskMedel).ExecuteCommand();
- if (rowCount > 0 )
+ if (rowCount > 0)
{
// plc鍐欏叆璇诲彇鎴愬姛琛ㄧず 2
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
+ if (retVal.IsSucceed)
{
// liudl 姝ゅ闇�娣诲姞
// 閫氱煡鍒嗘嫞鐮佸灈椤垫洿鏂�
@@ -1644,25 +2332,26 @@
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
break;
}
- else
+ else
{
// 鑾峰彇绠辨潯鐮�
// 鑾峰彇绠辨潯鐮侀厤缃�
var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "绠辨潯鐮�");
var (res, boxVal) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
string boxNo = boxVal.ToString();
- if (string.IsNullOrEmpty(boxNo))
+ if (string.IsNullOrEmpty(boxNo))
{
- Log.Error(string.Format("鐮佸灈宸ヤ綅{0}锛岀鐮佷负null鎻掔爜澶辫触!璇蜂汉宸ュ己鍒剁粨鎵广��"), modDevice.StationNum);
+ Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮佷负null鎻掔爜澶辫触!璇蜂汉宸ュ己鍒剁粨鎵广��");
// 鍐欏叆鎻掑叆缁撴灉 2锛氭彃鐮佸け璐�
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
+
break;
}
// 楠岃瘉绠辩爜琛ㄦ槸鍚﹀瓨鍦ㄦ绠辩爜
- var boxInfo = _db.Queryable<WcsBoxInfo>().First(w => w.IsDelete == false && w.BoxNo == boxNo);
- if (boxInfo == null)
+ var boxInfo = _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.BoxNo == boxNo).ToList();
+ if (boxInfo.Count == 0)
{
- Log.Error(string.Format("鐮佸灈宸ヤ綅{0}锛岀鐮亄1}涓嶅瓨鍦�!璇蜂汉宸ュ己鍒剁粨鎵广��"), modDevice.StationNum,boxNo);
+ Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮亄boxNo}涓嶅瓨鍦�!璇蜂汉宸ュ己鍒剁粨鎵广��");
// 鍐欏叆鎻掑叆缁撴灉 2锛氭彃鐮佸け璐�
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
break;
@@ -1675,25 +2364,50 @@
break;
}
string palletNo = checkTaskMedel.PalletNo;
- if (string.IsNullOrEmpty(palletNo))
+ if (string.IsNullOrEmpty(palletNo))
{
- Log.Error(string.Format("鑾峰彇鐮佸灈宸ヤ綅{0}涓婄殑鎵樼洏鍙峰け璐ワ紒",modDevice.StationNum));
+ Log.Error(string.Format("鑾峰彇鐮佸灈宸ヤ綅{0}涓婄殑鎵樼洏鍙峰け璐ワ紒", modDevice.StationNum));
break;
}
// 淇敼鎻掔爜琛�
- boxInfo.PalletNo = palletNo;
- boxInfo.UpdateTime = DateTime.Now;
+ foreach (WcsBoxInfo item in boxInfo)
+ {
+ item.PalletNo = palletNo;
+ item.UpdateTime = DateTime.Now;
+ item.OrderCode = checkTaskMedel.OrderNo;
+ }
+
var rowCount = _db.Updateable(boxInfo).ExecuteCommand();
+ Log.Information(string.Format("鎻掔爜鎴愬姛锛岀鐮佹槸锛�" + boxNo, modDevice.StationNum));
if (rowCount > 0)
{
// 鎻掔爜鎴愬姛
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
+
+ //鏄惁缁撴壒绠�
+ if (boxInfo[0].EndLotFlag == "1" && retVal.IsSucceed)
+ {
+ // 瑙﹀彂缁撴壒 鍒嗛亾鍙樹负缁撴壒涓�
+ AutoEndLot(boxInfo[0].LotNo, plcConn, "2");
+ }
+
+ //妫�鏌ュ凡鐮佸灈绠辨暟锛岀爜鍨涙暟閲忎笌瀹屽伐鏁伴噺鐩哥瓑鍚庤嚜鍔ㄧ粨鎵�
+ //var finishiqty = _db.Queryable<WcsBoxInfoLog>().Count(m => m.SkuNo = )
+ //if (true)
+ //{
+
+ //}
}
- else
+ else
{
// 鎻掔爜澶辫触
- Log.Error(string.Format("绠辩爜{0};鐮佸灈宸ヤ綅{1}锛屾彃鐮佸け璐ワ紝璇峰己鍒剁粨鎵�"),boxNo,modDevice.StationNum);
+ Log.Error($"绠辩爜{boxNo};鐮佸灈宸ヤ綅{modDevice.StationNum}锛屾彃鐮佸け璐ワ紝璇峰己鍒剁粨鎵�");
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
+ if (retVal.IsSucceed)
+ {
+ // 瑙﹀彂缁撴壒 涓嶈В缁戝垎閬�
+ AutoEndLot(boxInfo[0].LotNo, plcConn, "1");
+ }
}
}
}
@@ -1701,70 +2415,16 @@
case "40":
// 璇锋眰缁勬墭锛岀敵璇峰叆搴�
{
- // 鏍规嵁宸ヤ綅鍙凤紝鑾峰彇鎵樼洏鍙�
- var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
- // 鏍规嵁宸ヤ綅鍙疯幏鍙� 鎵樼洏绾胯宸ヤ綅鍙风殑閰嶇疆淇℃伅
- var numModel = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId != modDevice.PlcId);
- var posModel = PLCTaskAction.plcPositions.First(m => m.DeviceId == numModel.Id && m.Text == "鐩殑宸ヤ綅" && m.IsDelete == false);
- if (checkTaskMedel == null)
+ lock (OLock)
{
- Log.Error(string.Format("缁勬墭澶辫触鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栨墭鐩樺彿澶辫触!", modDevice.StationNum));
-
- // 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
- var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
- if (retVal.IsSucceed)
+ // 鏍规嵁宸ヤ綅鍙凤紝鑾峰彇鎵樼洏鍙�
+ var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
+ // 鏍规嵁宸ヤ綅鍙疯幏鍙� 鎵樼洏绾胯宸ヤ綅鍙风殑閰嶇疆淇℃伅
+ var numModel = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId != modDevice.PlcId);
+ var posModel = PLCTaskAction.plcPositions.First(m => m.DeviceId == numModel.Id && m.Text == "鐩殑宸ヤ綅" && m.IsDelete == false);
+ if (checkTaskMedel == null)
{
- // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
- retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
- }
- break;
- }
-
- // 鐮佸灈宸ヤ綅鎵樼洏鍙�
- string palletNo = checkTaskMedel.PalletNo;
-
- // 鏄惁婕旂ず妯″紡
- if (PLCTaskAction.boDemo)
- {
- // 鐩存帴绠眞ms鐢宠宸烽亾
- var http = new HttpService();
- string TaskNo = "", EndLocate = "";
- string strMsg = http.RequestRoadWay(palletNo, modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
- if (strMsg.Contains("-1"))
- {
- Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
- break;
- }
- else
- {
- // 鑾峰彇鍏ュ簱浠诲姟淇℃伅
- var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
- if (taskModel != null)
- {
- // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
- string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
-
- // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
- var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
- if (retVal.IsSucceed)
- {
- // 鍐欏叆鐮佸灈浜や簰-缁勬墭鍥炲娴佺▼瀛�
- retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
-
- // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
- taskModel.Status = TaskStatusEnum.Doing;
- _db.Updateable(taskModel).ExecuteCommand();
- }
- }
- }
- }
- else
- {
- // 鏍规嵁鎵樼洏鍙凤紝灏嗙粍鎵樹俊鎭彃鍏oxinfolog琛� 骞跺垹闄oxinfo琛ㄦ暟鎹�
- var boxInfoList = await _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.PalletNo == palletNo).ToListAsync();
- if (boxInfoList.Count <= 0)
- {
- Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0}锛岀鐮佷俊鎭笉瀛樺湪", modDevice.StationNum));
+ Log.Error(string.Format("缁勬墭澶辫触鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栨墭鐩樺彿澶辫触!", modDevice.StationNum));
// 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
@@ -1775,43 +2435,206 @@
}
break;
}
- string sqlStr = $"insert into WCSBoxInfoLog select * from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
- int insertCount = _db.Ado.ExecuteCommand(sqlStr);
- if (insertCount > 0)
+
+ // 鐮佸灈宸ヤ綅鎵樼洏鍙�
+ string palletNo = checkTaskMedel.PalletNo;
+
+ // 鏄惁婕旂ず妯″紡
+ if (PLCTaskAction.boDemo)
{
- string sqlStr2 = $"delete from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
- _db.Ado.ExecuteCommand(sqlStr2);
- }
- // 鍚慦MS鐢宠宸烽亾
- var http = new HttpService();
- string TaskNo = "", EndLocate = "";
- string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo,palletNo, checkTaskMedel.BoxCount.ToDecimal(),"0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "","", boxInfoList,
- modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
- if (!strMsg.Contains("-1"))
- {
- Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
- break;
+ // 鐩存帴绠眞ms鐢宠宸烽亾
+ var http = new HttpService();
+ string TaskNo = "", EndLocate = "";
+ string strMsg = http.RequestRoadWay(palletNo, modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
+ if (strMsg.Contains("-1"))
+ {
+ Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
+ break;
+ }
+ else
+ {
+ // 鑾峰彇鍏ュ簱浠诲姟淇℃伅
+ var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing));
+ if (taskModel != null)
+ {
+ // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
+ string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
+
+ var listResult = new List<Result>();
+
+ // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅銆佷换鍔″彿锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
+ listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue)); // 鐩爣宸ヤ綅
+ var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟鍙�" && s.IsDelete == false);
+ listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
+ var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟绫诲瀷" && s.IsDelete == false);
+ var taskTypeStr = (int)taskModel.TaskType;
+ listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
+
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+ var retVal1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+ if (retVal1.IsSucceed)
+ {
+ // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
+ taskModel.Status = TaskStatusEnum.Doing;
+ _db.Updateable(taskModel).ExecuteCommand();
+
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护50锛氱敵璇峰贩閬撴垚鍔�",
+ PalletNo = palletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum,
+ EndLocat = strMsg,
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+ HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+ }
+
+ //// 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
+ //var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
+ //if (retVal.IsSucceed)
+ //{
+ // // 鍐欏叆鐮佸灈浜や簰-缁勬墭鍥炲娴佺▼瀛�
+ // retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+
+ // // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
+ // taskModel.Status = TaskStatusEnum.Doing;
+ // _db.Updateable(taskModel).ExecuteCommand();
+ //}
+ }
+ }
}
else
{
- // 鑾峰彇鍏ュ簱浠诲姟淇℃伅
- var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
- if (taskModel != null)
+ // 鏍规嵁鎵樼洏鍙凤紝灏嗙粍鎵樹俊鎭彃鍏oxinfolog琛� 骞跺垹闄oxinfo琛ㄦ暟鎹�
+ var boxInfoList = _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.PalletNo == palletNo).ToList();
+ if (boxInfoList.Count <= 0)
{
- // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
- string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
+ Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0}锛岀鐮佷俊鎭笉瀛樺湪", modDevice.StationNum));
- // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
- var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
+ // 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
+ var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
if (retVal.IsSucceed)
{
// 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
- if (retVal.IsSucceed)
+ }
+ break;
+ }
+ //鍒ゆ柇鎵樼洏涓婄殑绠辩爜鏄惁宸茬粍鐩�
+ foreach (var item in boxInfoList)
+ {
+ var groupBoxno = _db.Queryable<WcsBoxInfoLog>().Where(w => w.BoxNo == item.BoxNo).ToList();
+ if (groupBoxno.Count>0)
+ {
+ Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0}锛岀鐮佷俊鎭笉瀛樺湪", modDevice.StationNum));
+ // 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
+ var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
+ if (retVal.IsSucceed)
{
- // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
- taskModel.Status = TaskStatusEnum.Doing;
- _db.Updateable(taskModel).ExecuteCommand();
+ // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+ retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+ }
+ break;
+ }
+ }
+
+ // 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
+ string sqlStr = $"insert into WCSBoxInfoLog select * from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
+ int insertCount = _db.Ado.ExecuteCommand(sqlStr);
+ if (insertCount > 0)
+ {
+ string sqlStr2 = $"delete from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
+ _db.Ado.ExecuteCommand(sqlStr2);
+ }
+
+ // 鍚慦MS鐢宠宸烽亾
+ var http = new HttpService();
+ string TaskNo = "", EndLocate = "";
+ string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo, palletNo, checkTaskMedel.BoxCount.ToDecimal(), "0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "", "", boxInfoList,
+ modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
+ if (strMsg.Contains("-1"))
+ {
+ Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
+ break;
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁缁撴壒涓�
+ var (res, jiepi) = plcConn.GetPlcDBValue(checkTaskMedel.PosType, modDevice.DbNumber, checkTaskMedel.PosLot);
+ if (jiepi == 2)//缁撴壒涓�
+ {
+ // 鍒嗛亾瑙ｇ粦锛屾姄绠卞搧绉嶅啓鍏�0
+ var ret1 = plcConn.SetPlcDBValue(checkTaskMedel.PosTypeLot, modDevice.DbNumber, checkTaskMedel.PlcPos, "0");
+ if (ret1.IsSucceed)
+ {
+ //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟 liudl 鏈�鍚庝竴鎵樼洏鐢宠瀹屽叆搴撴墠鍙竻绌�
+ checkTaskMedel.OrderNo = "";
+ checkTaskMedel.TaskNo = "";
+ checkTaskMedel.LotNo = "";
+ checkTaskMedel.SkuNo = "";
+ checkTaskMedel.SkuName = "";
+ checkTaskMedel.BoxType = "";
+ checkTaskMedel.Qty = 0;
+ checkTaskMedel.PZNo = "";
+ checkTaskMedel.Status = "0"; // 缁戝畾鍒嗛亾 0锛氳В缁� 1锛氱粦瀹�
+
+ //鏇存柊鍒嗘嫞浠诲姟
+ _db.Updateable(checkTaskMedel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
+ }
+ // 鑾峰彇鍏ュ簱浠诲姟淇℃伅
+ var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
+ if (taskModel != null)
+ {
+ // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
+ string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
+
+ var listResult = new List<Result>();
+ // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅銆佷换鍔″彿锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
+ listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue)); // 鐩爣宸ヤ綅
+ var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟鍙�" && s.IsDelete == false);
+ listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
+ var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟绫诲瀷" && s.IsDelete == false);
+ var taskTypeStr = (int)taskModel.TaskType;
+ listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
+
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+ if (retVal.IsSucceed)
+ {
+ // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
+ taskModel.Status = TaskStatusEnum.Doing;
+ _db.Updateable(taskModel).ExecuteCommand();
+
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护50锛氱敵璇峰贩閬撴垚鍔�",
+ PalletNo = palletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum,
+ EndLocat = strMsg,
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+ HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
}
}
}
@@ -1819,28 +2642,85 @@
}
}
break;
- default:break;
- }
+ default: break;
+ }
}
}
/// <summary>
- /// 鎷嗗灈鏈哄櫒浜轰笟鍔″鐞�
+ /// 鍑哄簱浠剁杈撻�佸拰鎷嗗灈鏈哄櫒浜轰笟鍔″鐞�
/// </summary>
/// <param name="modDevice"></param>
private static void StackingRobot(WcsDeviceDto modDevice)
{
var plcConn = modDevice.PLCUtil;
- switch (modDevice.Value.ToString())
+ if (modDevice.DbNumber == "DB131" || modDevice.DbNumber == "DB132" || modDevice.DbNumber == "DB133" || modDevice.DbNumber == "DB134")
{
- case "0":
- {
- // 鑻ユ媶鍨涘伐浣嶄负绌洪棽锛屾煡璇换鍔¤〃鏄惁鏈夋湭缁戝畾鐨勫嚭搴撲换鍔★紝鍋氱粦瀹氭搷浣�
- }
+ switch (modDevice.Value.ToString())
+ {
+ case "10"://10 plc璇锋眰wcs璇绘墭鐩樼爜 20 wcs璇诲彇ok wcs 鍐欏叆鏁伴噺鍙婅鏍� 30
+
+ //wcs璇诲彇ok20
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
+ if (ret.IsSucceed)
+ {
+ //鑾峰彇鎵樼洏鐮�
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
+ // 鑾峰彇鎵樼洏浠诲姟鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ string tasknoVal = val.ToString();
+
+ // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�
+ if (res1.IsSucceed)
+ {
+ var modTask = _db.Queryable<WcsTask>().First(m => m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+ if (modTask == null)
+ {
+ Log.Error(string.Format($"鍑哄簱浠诲姟鏈笅鍙戯紝璇蜂汉宸ュ鐞嗭紝鏃犳硶鎷嗗灈锛�"));
+ break;
+ }
+
+ //閫氳繃浠诲姟鍙峰拰鎵樼洏鍙峰悜WMS鐢宠姝ゆ墭鐩樼殑鎷嗗灈淇℃伅
+ var http = new HttpService();
+ RequestBoxInfoCheckAll tasklist = http.RequestBoxCheckinfo(palletVal, tasknoVal);
+ if (tasklist.Success != -1)
+ {
+ //鑾峰彇鎷嗗灈鐗╂枡鍝佺(闇�瑕佸鍔犵墿鏂欏垽鏂紝鍚屼竴涓墿鏂欏彿鍙兘浼氬嚭鐜颁笉鍚岀殑鐮佸灈瑙勫垯)
+ var pz = _db.Queryable<WcsMateialPzInfo>().First(m => m.SkuNo == tasklist.data.SkuNo);
+ //涓嬪彂鎷嗘墭瑙勬牸锛屾媶绠辨暟鍜屾墭鐩樹笂鎬荤鏁帮紙涓嶇粦瀹氭満鍣ㄤ汉锛屾媶鍨涗换鍔′俊鎭彧涓嬪彂涓�娆★級
+ // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+ // 鑾峰彇鎵樼洏瑙勫垯
+ var Standard = modDevice.listStation.FirstOrDefault(m => m.Text == "瑙勬牸");
+ listResult.Add(plcConn.SetPlcDBValue(Standard.PosType, modDevice.DbNumber, Standard.PlcPos, pz.PZNo));
+ //鎶撶鏁�
+ var qty = modDevice.listStation.FirstOrDefault(m => m.Text == "鎷嗙鏁伴噺");
+ listResult.Add(plcConn.SetPlcDBValue(qty.PosType, modDevice.DbNumber, qty.PlcPos, tasklist.data.Qty.ToString()));
+ //鎬荤鏁�
+ var qtycount = modDevice.listStation.FirstOrDefault(m => m.Text == "鎬荤鏁�");
+ listResult.Add(plcConn.SetPlcDBValue(qtycount.PosType, modDevice.DbNumber, qtycount.PlcPos, tasklist.data.QtyCount.ToString()));
+
+
+ // 鏄惁鍐欏叆鎴愬姛
+ if (listResult.All(s => s.IsSucceed))
+ {
+ //wcs 鍐欏叆鏁伴噺鍙婅鏍� 30
+ var ret1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+
+ }
+ else
+ {
+ Log.Error(string.Format($"鐮佸灈淇℃伅鏈啓鍏ワ紒鎵樼洏鍙凤細" + palletVal + "锛岀爜鍨涗綅锛�" + modDevice.StationNum));
+ break;
+ }
+ }
+ }
+ }
break;
- default:
- break;
- }
+ }
+ }
}
/// <summary>
@@ -1857,57 +2737,132 @@
LedDll Led = new LedDll();
Led.LEDstr(ip, top, content, foot);
}
- catch { }
+ catch (Exception ex)
+ {
+ Log.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// LED淇℃伅灞曠ず
+ /// </summary>
+ /// <param name="ip"></param>
+ /// <param name="text"></param>
+ private static void LedDisplay(string ip,string text)
+ {
+ try
+ {
+ LedDll Led = new LedDll();
+ Led.ConsoleLeds(ip, text);
+ // 璁剧疆瀹炰緥
+ //Led.ConsoleLeds("10.18.51.238", $"浠诲姟绫诲瀷:{TaskTypeEnum.Move.GetDescription()}\n\n浠诲姟鍙�:TK2024102100001\n鎵樼洏鍙�:LN000145\n\n璧峰浣�:033\n鐩爣浣�:R01-02010102");
+ }
+ catch (Exception ex)
+ {
+ Log.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鑷姩缁撴壒 骞� 瑙ｇ粦鍒嗛亾
+ /// </summary>
+ /// <param name="lotNo">鎵规鍙�</param>
+ /// <param name="plcConn">Plc杩炴帴</param>
+ /// <param name="status">鏄惁瑙ｇ粦鍒嗛亾 0锛氳В缁� 1锛氱粦瀹�</param>
+ private static void AutoEndLot(string lotNo,PLCUtil plcConn,string status)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(lotNo))
+ {
+ Console.WriteLine("鎵规鍙蜂负nul");
+ }
+ var checkTaskList = _db.Queryable<WcsCheckTask>().Where(w => w.LotNo == lotNo && w.Status == "1").ToList();
+ if (checkTaskList.Count <= 0)
+ {
+ Console.WriteLine("鏈壘鍒板垎閬撶粦瀹氫俊鎭�");
+ }
+ foreach (var item in checkTaskList)
+ {
+ #region#缁橮LC鍐欏叆缁撴壒鎵规鍙�
+ // 鍐欏叆缁撴壒淇″彿
+ var ret = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
+ // 鍒嗛亾瑙ｇ粦锛屾姄绠卞搧绉嶅啓鍏�0
+ //var ret1 = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟 liudl 鏈�鍚庝竴鎵樼洏鐢宠瀹屽叆搴撴墠鍙竻绌�
+ //item.OrderNo = "";
+ //item.TaskNo = "";
+ //item.LotNo = "";
+ //item.SkuNo = "";
+ //item.SkuName = "";
+ //item.BoxType = "";
+ //item.Qty = 0;
+ item.PZNo = "";
+ item.Status = status; // 缁戝畾鍒嗛亾 0锛氳В缁� 1锛氱粦瀹� 2:缁撴壒涓�
+
+ //鏇存柊鍒嗘嫞浠诲姟
+ _db.Updateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
+ #endregion
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error(ex.Message);
+ throw;
+ }
}
private static void Test(WcsDeviceDto modDevice)
{
- //鍐欐娴嬭瘯璇籹tring
- var (res, val) = modDevice.PLCUtil.GetPlcDBValue(PLCDataTypeEnum.String, "DB100", "64");
- Console.WriteLine("DB100.64----" + val);
- //娴嬭瘯鎵归噺璇诲彇
- Dictionary<string, PLCDataTypeEnum> listaddress = new Dictionary<string, PLCDataTypeEnum>();
- foreach (var modStation in modDevice.listStation)
- {
- listaddress.Add(modStation.PlcPos, modStation.PosType);
- }
- var result = modDevice.PLCUtil.GetPlcBatchDBValue(listaddress);
- if (result.Value.Count > 0)
- {
- foreach (var value in result.Value)
- {
- Console.WriteLine("鍦板潃" + value.Key + "----鍊�" + value, value);
- }
- }
- if (!result.IsSucceed)
- {
- foreach (var err in result.ErrList)
- {
- Console.WriteLine(err);
- }
- if (result.Value.Count > 0)//鏈夐敊璇殑涔熸湁鎴愬姛鐨�
- {
+ //var strMsg = new HttpService().RequestPackWcs("LN000001");
+ ////鍐欐娴嬭瘯璇籹tring
+ //var (res, val) = modDevice.PLCUtil.GetPlcDBValue(PLCDataTypeEnum.String, "DB100", "64");
+ //Console.WriteLine("DB100.64----" + val);
+ ////娴嬭瘯鎵归噺璇诲彇
+ //Dictionary<string, PLCDataTypeEnum> listaddress = new Dictionary<string, PLCDataTypeEnum>();
+ //foreach (var modStation in modDevice.listStation)
+ //{
+ // listaddress.Add(modStation.PlcPos, modStation.PosType);
+ //}
+ //var result = modDevice.PLCUtil.GetPlcBatchDBValue(listaddress);
+ //if (result.Value.Count > 0)
+ //{
+ // foreach (var value in result.Value)
+ // {
+ // Console.WriteLine("鍦板潃" + value.Key + "----鍊�" + value, value);
+ // }
+ //}
+ //if (!result.IsSucceed)
+ //{
+ // foreach (var err in result.ErrList)
+ // {
+ // Console.WriteLine(err);
+ // }
+ // if (result.Value.Count > 0)//鏈夐敊璇殑涔熸湁鎴愬姛鐨�
+ // {
- }
- }
- if (modDevice.Value == 820)
- {
- //娴嬭瘯鍐欏叆830
- //var result = mod.PLCUtil.SetPlcDBValue(mod.PosType.Value, mod.DbNumber, mod.PlcPos, "830");
- ////鍐欏叆鏄惁鎴愬姛
- //if (result.IsSucceed)
- //{
+ // }
+ //}
+ //if (modDevice.Value == 820)
+ //{
+ // //娴嬭瘯鍐欏叆830
+ // //var result = mod.PLCUtil.SetPlcDBValue(mod.PosType.Value, mod.DbNumber, mod.PlcPos, "830");
+ // ////鍐欏叆鏄惁鎴愬姛
+ // //if (result.IsSucceed)
+ // //{
- //}
- }
- else if (modDevice.Value == 840)
- {
+ // //}
+ //}
+ //else if (modDevice.Value == 840)
+ //{
- }
- else if (modDevice.Value == 860)
- {
+ //}
+ //else if (modDevice.Value == 860)
+ //{
- }
+ //}
}
--
Gitblit v1.8.0