From 67e758f3477eb057e3458a0a3e8a2e8c6e94592e Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 16 六月 2025 17:32:19 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs | 11 +++++++----
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs | 4 +++-
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs | 2 +-
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs | 4 ++++
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
index 9107ef9..56acb2c 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
@@ -201,12 +201,15 @@
#region 10006-鍙犵洏鏈烘弧鎵樹笅绾匡紙3妤煎彔鐩樹笅绾匡級-3妤煎彔鐩樹笅绾�-宸插畬鎴�寰呮祴璇�
if (currActionModel.CN_N_ACTION_CODE == 10006)
{
- var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).FirstOrDefault();
- if (plc != null)
+ var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).ToList();
+ if (plc.Count >0 )
{
- if (PickUpStartFree(plc.location))
+ foreach(var a in plc)
{
- PLCControl.StackingLineEmpty(plc);
+ if (PickUpStartFree(a.location))
+ {
+ PLCControl.StackingLineEmpty(a);
+ }
}
}
//Thread.Sleep(500);
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
index 9fedace..e356c85 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -1470,8 +1470,10 @@
/// </summary>
/// <param name="ip"></param>
/// <param name="taskNo"></param>
- internal static void CacheStackingMouth6(Settings.PlcInfo plc)
+ internal static void CacheStackingMouth6(Settings.PlcInfo plc, string taskNo)
{
+ var taskInfo = MongoDBSingleton.Instance.FindOne<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), "TN_I_TASK_MST");
+ MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", taskInfo.CN_S_BATCH_NO), RemoveFlags.Single);
var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
addr = plc.writeAddr + 1,
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
index ee8401a..06d31b3 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
@@ -254,7 +254,7 @@
if (mst.CN_S_BUSS_TYPE == "鍖呰绾胯ˉ绌�) PLCControl.PackingLineComplete(plc.ip);
if (mst.CN_S_BUSS_TYPE == "鐢垫鍙栬揣") PLCControl.LiftAction(plc, mst.CN_S_TASK_NO,false);
if (mst.CN_S_BUSS_TYPE == "鍥涢挻鎴愬搧鍑哄簱" || mst.CN_S_BUSS_TYPE == "鍥涢挻杈呮潗鍑哄簱") PLCControl.productOutWare(mst.CN_S_END_BIT, mst.CN_S_TASK_NO, false);
- if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�) PLCControl.CacheStackingMouth6(plc);
+ if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�) PLCControl.CacheStackingMouth6(plc,mst.CN_S_TASK_NO);
}
}
}
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
index 5934831..2536868 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
@@ -153,6 +153,10 @@
MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", mst.CN_S_BATCH_NO), "TimeCuoInfoCom", RemoveFlags.None);
}
if (mst.CN_S_BUSS_TYPE == "3妤煎寘瑁呰ˉ绌�) PLCControl.PickUpBlankComplete(mst.CN_S_END_BIT);
+ if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�)
+ {
+ MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", mst.CN_S_BUSS_TYPE),RemoveFlags.None);
+ }
}
}
--
Gitblit v1.9.1