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 | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index a0430f9..b725d86 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
@@ -404,10 +404,28 @@
CMMLog.Info($"WMSIn-{startBit}:ItemCode涓嶄负绌猴紝鑾峰彇淇℃伅锛�11!");
CMMLog.Info($"{ItemCode}");
- if (ItemCode == "time" || ItemCode == "鎷嗙洏鍙樻洿" || ItemCode == "鎵撳寘涓嬬嚎")
+ if (ItemCode == "鐢甸挻鎵撳寘涓嬬嚎")
+ {
+ model.trayCode = trayCode;
+ model.endArea = endArea;
+ //灏嗘暟鎹彃鍏ヤ腑闂磋〃
+ 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);
@@ -509,18 +527,6 @@
});
//灏嗘暟鎹彃鍏ヤ腑闂磋〃
ERPService.senderpTask(time, startBit);
- }
- else if (ItemCode == "鍥涢挻鎵撳寘涓嬬嚎")
- {
- var DGinfoList = MongoDBSingleton.Instance.FindAll<DGPackingLineFullModel>("DGPackingLineFullModel");
- if(DGinfoList.Count > 0){
- var DGinfo = DGinfoList.OrderBy(a => a.createTime).First();
- model.trayCode = DGinfo.trayCode;
- //model.endArea = endArea;
- }
-
- //灏嗘暟鎹彃鍏ヤ腑闂磋〃
- //ERPService.senderpTask(time, startBit);
}
}
else
--
Gitblit v1.9.1