From 3942151eea031aee17de2dc2890df33d845aae6b Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期日, 29 九月 2024 16:46:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 147 ++++++++++++++++++++++++++++++++----------------
1 files changed, 97 insertions(+), 50 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 1be1883..ae1bd5a 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -72,27 +72,47 @@
break;
}
- // 鏍规嵁鐩爣鍦板潃鍜屽贩閬撹幏鍙栨斁璐у伐浣嶅搴旂殑鎺掑垪灞�
- PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
- modTask.StartRoadway, modTask.EndRoadway);
-
- // 鐩爣宸ヤ綅涓嶄负null锛岄渶鍏堝垽鏂斁璐у伐浣嶆槸鍚︾┖闂�
- if (!string.IsNullOrEmpty(taskInfo.EndStation))
+ PlcTaskInfo taskInfo = new PlcTaskInfo();
+ if (modTask.TaskType == TaskTypeEnum.Move)
{
- // 鎵撳紑瀵瑰簲鐨勮緭閫佺嚎杩炴帴
- 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);
+ taskInfo = PLCCommon.GetEndPai(modTask.EndLocate.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);
- var (result, value) = plcConveyorConn.GetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.PlcPos);
- if (result.IsSucceed)
+ // 鐩爣宸ヤ綅涓嶄负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 +120,6 @@
{
break;
}
- }
- else
- {
- break;
}
}
@@ -498,16 +514,16 @@
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;
}
// 鏀瑰彉浠诲姟鐘舵��
@@ -534,8 +550,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 +559,10 @@
{
modcTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
//淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
-
+ }
+ else
+ {
+ Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
}
}
// 鎻掑叆浜や簰鏃ュ織
@@ -695,7 +714,7 @@
}
}
/// <summary>
- /// 鍫嗗灈鏈轰笉绌鸿窇
+ /// 涓嶇┖璺�
/// </summary>
/// <param name="modTask">鎿嶄綔瀹屾垚鐨勪换鍔�</param>
/// <param name="plcConn">plc杩炴帴</param>
@@ -873,10 +892,10 @@
string strMsg = "";
string taskModel = "";
// 鍒ゆ柇鏄惁婕旂ず妯″紡
- if (PLCTaskAction.boDemo)
- {
- taskModel = "1";// 婕旂ず妯″紡
- }
+ //if (PLCTaskAction.boDemo)
+ //{
+ // taskModel = "1";// 婕旂ず妯″紡
+ //}
// 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
@@ -1353,6 +1372,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();
@@ -1375,7 +1401,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)
{
@@ -1742,23 +1768,45 @@
else
{
// 鑾峰彇鍏ュ簱浠诲姟淇℃伅
- var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
+ 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");
+ string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
- // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
- var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
- if (retVal.IsSucceed)
+ 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))
{
- // 鍐欏叆鐮佸灈浜や簰-缁勬墭鍥炲娴佺▼瀛�
- retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
-
- // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
- taskModel.Status = TaskStatusEnum.Doing;
- _db.Updateable(taskModel).ExecuteCommand();
+ // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+ var retVal1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+ if (retVal1.IsSucceed)
+ {
+ // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
+ taskModel.Status = TaskStatusEnum.Doing;
+ _db.Updateable(taskModel).ExecuteCommand();
+ }
}
+
+ //// 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
+ //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();
+ //}
}
}
}
@@ -1807,13 +1855,12 @@
var listResult = new List<Result>();
// 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅銆佷换鍔″彿锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
- listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue));
- var modPosTask = PLCTaskAction.plcPositions.First(s => s.Text == "浠诲姟鍙�");
- listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, TaskNo));
- var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.Text == "浠诲姟绫诲瀷");
+ 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, modDevice.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
-
+ listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
if (listResult.All(s => s.IsSucceed))
{
--
Gitblit v1.8.0