From e3d6e8ddbfc930db88bef1e7f170ddfe71b06cf1 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 04 七月 2025 17:25:43 +0800
Subject: [PATCH] 1
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs | 2 +-
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs | 5 ++++-
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs | 5 ++++-
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 28 +++++++++++++++++++++++++++-
4 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
index 9f783b6..0b21cea 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
@@ -2040,7 +2040,7 @@
}
- internal static void senderpTaskDG(string startBit, string trayCode)
+ internal static bool senderpTaskDG(string startBit, string trayCode)
{
try
{
@@ -2094,6 +2094,7 @@
//鍙樻洿娉ㄩ噴
mesSucess = "0"
}, "SendErpTaskInfoTableDG");
+ return true;
}
else
{
@@ -2109,6 +2110,8 @@
CMMLog.Info("鎻掑叆SendErpTaskInfoTableDG琛�err:" + ex.Message);
}
+
+ return false;
}
internal static void SendERPTaskCompleteFuncDG()
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
index a4b374b..6529bb7 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
@@ -4873,7 +4873,7 @@
/// </summary>
public string CN_T_PRODUCTION_S { get; set; }
- public int CN_S_EXT8 { get; set; }
+ public string CN_S_EXT8 { get; set; }
}
#endregion
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 2de3602..ce7e3bc 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -175,6 +175,32 @@
end.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
}
}
+
+ var conn1 = Settings.GetDGConnectingbitsList().Where(a => a.enable == 1).ToList();
+ if (conn1.Count == 2)
+ {
+ //涓や釜鎺ラ┏骞冲彴
+ if (mst.CN_S_START_BIT == conn1[0].locCode || mst.CN_S_START_BIT == conn1[1].locCode)
+ {
+ start.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[1];
+ }
+ if (mst.CN_S_END_BIT == conn1[0].locCode || mst.CN_S_END_BIT == conn1[1].locCode)
+ {
+ end.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
+ }
+ }
+ if (conn1.Count == 1)
+ {
+ //涓�釜鎺ラ┏骞冲彴
+ if (mst.CN_S_START_BIT == conn1[0].locCode)
+ {
+ start.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[1];
+ }
+ if (mst.CN_S_END_BIT == conn1[0].locCode)
+ {
+ end.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
+ }
+ }
#endregion
string FRow = string.IsNullOrEmpty(start.CN_S_FLOOR) ? "1" : start.CN_S_FLOOR;
@@ -208,7 +234,7 @@
}
}
}
- if (mst.CN_S_BUSS_TYPE == "缂撳瓨鏋跺叆绔嬪簱")
+ if (mst.CN_S_BUSS_TYPE == "缂撳瓨鏋跺叆绔嬪簱" || mst.CN_S_BUSS_TYPE == "鐢甸挻缂撳瓨鏋跺叆绔嬪簱")
{
TRow = "1";
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index 44e376a..1ac220b 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
@@ -409,7 +409,10 @@
model.trayCode = trayCode;
model.endArea = endArea;
//灏嗘暟鎹彃鍏ヤ腑闂磋〃
- ERPService.senderpTaskDG(startBit, trayCode);
+ if(!ERPService.senderpTaskDG(startBit, trayCode))
+ {
+ return false;
+ }
}
else if (ItemCode == "time" || ItemCode == "鎷嗙洏鍙樻洿" || ItemCode == "鎵撳寘涓嬬嚎")
{
--
Gitblit v1.9.1