From ff48949f706e899725c1ef7d0426c12c2b3e674f Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 17 七月 2025 17:18:16 +0800
Subject: [PATCH] 1

---
 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index 44e376a..b725d86 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
@@ -409,12 +409,23 @@
                         model.trayCode = trayCode;
                         model.endArea = endArea;
                         //灏嗘暟鎹彃鍏ヤ腑闂磋〃
-                        ERPService.senderpTaskDG(startBit, trayCode);
+                        if(!ERPService.senderpTaskDG(startBit, trayCode))
+                        {
+                            return false;
+                        }
                     }
                     else if (ItemCode == "time" || ItemCode == "鎷嗙洏鍙樻洿" || ItemCode == "鎵撳寘涓嬬嚎")
                     {
                         CMMLog.Info($"{trayCode}");
-                        var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), "TimeCuoInfoCom");
+                        TimeCuoInfoCom time = new TimeCuoInfoCom { };
+                        if (trayCode.Contains("MES"))
+                        {
+                            time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStampMES", trayCode), "TimeCuoInfoCom");
+                        }
+                        else
+                        {
+                            time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), "TimeCuoInfoCom");
+                        }
                         if (ItemCode == "time" && time != null)
                         {
                             int TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp : int.Parse(timeStamp);

--
Gitblit v1.9.1