From 29d13ac5455333228598f9814fca70fcc8b6bb70 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 24 四月 2025 14:46:20 +0800
Subject: [PATCH] 临时修改码垛变量值判断
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index fbb86c4..6476703 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -89,7 +89,7 @@
var plcConn = modDevice.modbusUtil;
string station = "B" + modDevice.StationNum;
string value = Convert.ToString(modDevice.Value);
- if (value == "1")
+ if (value == "1"||value == "2")
{
if (modDevice.Level == DeviceLevelEnum.DB)
{
@@ -420,7 +420,7 @@
{
var modPosPallet = modDevice.listStation.First(s => s.Text == "鎵樼洏鏉＄爜");
//todo:杩欓噷璇荤爜鍣ㄨ�佽涓嶅埌鏉＄爜淇℃伅 鍏堝啓姝� 璇荤爜鍣ㄩ棶棰樿В鍐充簡鍙互娉ㄩ噴鎺�
- plcConn.SetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos, "T2400001");
+ //plcConn.SetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos, "T2400001");
var (res, palletNo) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos, modPosPallet.StringLength);
if (!res.IsSucceed || palletNo == "")
{
@@ -512,7 +512,7 @@
TaskNo = _taskService.GetTaskCode(),
TaskType = TaskTypeEnum.Move,
Type = PLCTypeEnum.AGV,
- StartLocate = AGVStaionEnum.A2.ToString(),
+ StartLocate = AGVStaionEnum.A1.ToString(),
EndLocate = AGVStaionEnum.F1.ToString(),
PalletNo = modTask.PalletNo,
Status = TaskStatusEnum.Wait,
@@ -529,7 +529,7 @@
TaskNo = _taskService.GetTaskCode(),
TaskType = TaskTypeEnum.Move,
Type = PLCTypeEnum.AGV,
- StartLocate = AGVStaionEnum.A2.ToString(),
+ StartLocate = AGVStaionEnum.A1.ToString(),
EndLocate = AGVStorageUtil.GetPalletInStorage(),
PalletNo = modTask.PalletNo,
Status = TaskStatusEnum.Wait,
@@ -675,9 +675,11 @@
//濡傛灉鎷夋墭鐩樺幓鎴愬搧宸ヤ綅锛屽厛妫�鏌ユ湁娌℃湁缂烘墭
if (modTask.StartLocate.Substring(0, 1) == "D" && modTask.EndLocate.Substring(0, 1) == "B")
{
+ //鍒ゆ柇鐩爣浣嶇疆鏄媶鎵樻満鐨勪换鍔℃湁娌℃湁锛屾湁灏辫烦杩囨媶鎵樻満鍒版垚鍝佸伐浣嶇殑浠诲姟
if (listTask.Any(s => s.EndLocate.Substring(0, 1) == "D"))
continue;
}
+ //濡傛灉鐩殑宸ヤ綅鏄師鏂欎粨锛屽厛妫�鏌ュ師鏂欎粨鍌ㄤ綅鐘舵��
if (modTask.EndLocate == AGVStaionEnum.F1.ToString())
{
if (_sysConfigService.GetConfigValue<bool>("cache_Materal").Result)
@@ -688,12 +690,17 @@
// if (!_sysConfigService.GetConfigValue<bool>("cache_Materal").Result)
// continue;
//}
+
+ //濡傛灉璧峰宸ヤ綅鏄媶鎵樻満
if (modTask.StartLocate == AGVStaionEnum.D1.ToString())
{
+ //鑾峰彇鍙犳媶鎵樻満IP
var modPlc = PLCTaskAction.plcs.FirstOrDefault(s => s.Type == PLCTypeEnum.PalletMachine);
+ //鑾峰彇鍙犳媶鎵樻満宸ヤ綅
var modDevice2 = PLCTaskAction.plcDevices.FirstOrDefault(s => s.PlcId == modPlc.Id && s.Text == "鎷嗘墭鏈�");
+ //鎵撳紑杩炴帴
var modConn = new PLCUtil(modPlc);
- //鏄惁缂烘墭淇″彿
+ //鏄惁鍏佽鍙栨墭淇″彿
var modPos = PLCTaskAction.plcPositions.FirstOrDefault(s => s.DeviceId == modDevice2.Id && s.Text == "鍏佽鍙栨墭");
var (result, value) = modConn.GetPlcDBValue(modPos.PosType, modDevice2.DbNumber, modPos.PlcPos);
if (result.IsSucceed)
@@ -724,6 +731,7 @@
}
else
{
+ //涓嶅厑璁稿彇鎵橈紝鍒ゆ柇鏄惁鎷嗘墭鏈哄噯澶囧畬鎴�
modPos = PLCTaskAction.plcPositions.FirstOrDefault(s => s.DeviceId == modDevice2.Id && s.Text == "鍑嗗瀹屾垚");
(result, value) = modConn.GetPlcDBValue(modPos.PosType, modDevice2.DbNumber, modPos.PlcPos);
if (!value)
@@ -738,6 +746,7 @@
continue;
}
}
+ //濡傛灉鐩殑宸ヤ綅鏄彁鍗囨満鏀捐揣宸ヤ綅锛屽厛妫�鏌ユ湁娌℃湁鎵樼洏绾跨殑浠诲姟
if (modTask.EndLocate == AGVStaionEnum.A1.ToString())
{
if (_db.Queryable<WcsTask>().Where(s => s.Type == PLCTypeEnum.ConveyorLine && s.Status == TaskStatusEnum.Doing).Any())
--
Gitblit v1.8.0