From 823a7818345dedc7e460b3009c7ee2a89fa03e03 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 23 六月 2025 17:29:33 +0800
Subject: [PATCH] 11
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
index 350756e..3d7b0da 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
@@ -237,13 +237,25 @@
{
AMSHelper.SetStatus(action.CN_S_TASK_NO, 1, "1", action.CN_S_DEVICE_CODE, true);
WMSHelper.ExecuteState(mst.CN_S_SOURCE_NO, action.CN_N_ACTION_CODE);
- if (mst.CN_S_BUSS_TYPE == "缂撳瓨鏋跺叆绔嬪簱")
+ if (mst.CN_S_BUSS_TYPE.Contains("缂撳瓨鏋跺叆绔嬪簱"))
{
- //灏嗕换鍔″彿鎻掑叆鍒颁腑闂磋〃
- var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTable>(Query.And(Query.EQ("Bit", mst.CN_S_START_BIT), Query.EQ("taskNo", "")), "SendErpTaskInfoTable");
- if (erpInfo != null)
+ if (mst.CN_S_BUSS_TYPE.Contains("鐢甸挻"))
{
- MongoDBSingleton.Instance.Update<SendErpTaskInfoTable>(Query.And(Query.EQ("Bit", mst.CN_S_START_BIT), Query.EQ("taskNo", "")), Update.Set("taskNo", mst.CN_S_SOURCE_NO), UpdateFlags.None);
+ //灏嗕换鍔″彿鎻掑叆鍒颁腑闂磋〃
+ var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTableDG>(Query.And(Query.EQ("Bit", mst.CN_S_START_BIT), Query.EQ("taskNo", "")), "SendErpTaskInfoTableDG");
+ if (erpInfo != null)
+ {
+ MongoDBSingleton.Instance.Update<SendErpTaskInfoTableDG>(Query.And(Query.EQ("Bit", mst.CN_S_START_BIT), Query.EQ("taskNo", "")), Update.Set("taskNo", mst.CN_S_SOURCE_NO), UpdateFlags.None);
+ }
+ }
+ else
+ {
+ //灏嗕换鍔″彿鎻掑叆鍒颁腑闂磋〃
+ var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTable>(Query.And(Query.EQ("Bit", mst.CN_S_START_BIT), Query.EQ("taskNo", "")), "SendErpTaskInfoTable");
+ if (erpInfo != null)
+ {
+ MongoDBSingleton.Instance.Update<SendErpTaskInfoTable>(Query.And(Query.EQ("Bit", mst.CN_S_START_BIT), Query.EQ("taskNo", "")), Update.Set("taskNo", mst.CN_S_SOURCE_NO), UpdateFlags.None);
+ }
}
}
if (mst.CN_S_BUSS_TYPE == "鑰佺墿鏂欑紦瀛樻灦鍏ョ珛搴�)
@@ -387,7 +399,10 @@
{
//鎵撳寘涓嬬嚎鍙栬揣瀹屾垚锛屽皢鏁版嵁鍐欏叆涓棿琛� }
-
+ if (mst.CN_S_BUSS_TYPE == "鐢甸挻缂撳瓨鏋跺叆绔嬪簱")
+ {
+ MongoDBSingleton.Instance.Remove<DGPackingLineFullModel>(Query.EQ("trayCode", mst.CN_S_BATCH_NO),RemoveFlags.None);
+ }
}
if (action.CN_N_ACTION_CODE == 6)
{
@@ -821,6 +836,33 @@
/// </summary>
//public string END_LOC { get; set; } //鍙樻洿娉ㄩ噴
}
+
+ public class DGConnectingBits
+ {
+ public ObjectId _id { get; set; }
+ /// <summary>
+ /// 璐т綅缂栫爜
+ /// </summary>
+ public string Bit { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�+ /// </summary>
+ public string trayCode { get; set; }
+ /// <summary>
+ /// 璐т綅鐘舵� 0 鏃犺揣 1 鏈夎揣
+ /// </summary>
+ public string state { get; set; }
+ /// <summary>
+ /// 鏃堕棿鎴�+ /// </summary>
+ public string timeCuo { get; set; }
+ /// <summary>
+ /// 浜屾浠诲姟鐨勭粓鐐硅揣浣�+ /// </summary>
+ //public string END_LOC { get; set; } //鍙樻洿娉ㄩ噴
+ }
+
+ #endregion
public class InAndOutQuantity
{
public ObjectId _id { get; set; }
@@ -857,8 +899,6 @@
public string Day { get; set; }
public int Quntity { get; set; }
}
-
- #endregion
internal void writeAGVState(TN_I_TASK_DTL_ACTION action)
--
Gitblit v1.9.1