From e0471620ed16295a330ce18bcfe1654c91138996 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 18 七月 2025 17:24:42 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index a0430f9..2ac64f5 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
@@ -348,7 +348,7 @@
/// <summary>
/// 鏃堕棿鎴� /// </summary>
- public int timeStamp { get; set; }
+ public string timeStamp { get; set; }
/// <summary>
/// 鐓х墖url
/// </summary>
@@ -404,13 +404,31 @@
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);
+ string TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp.ToString() : timeStamp;
CMMLog.Info($"time鑾峰彇鏃堕棿鎴虫暟鎹紝鑾峰彇淇℃伅锛�);
model.data.Add(new ItemData()
{
@@ -450,7 +468,7 @@
foldingbag = "1",
//totalWeight = time.totalWeight,
- timeStamp = 1,
+ timeStamp = "1",
photoURL = "1",
//productType = time.productModel,
//bagNumber = time.bagNumber,
@@ -462,7 +480,7 @@
}
else if (ItemCode == "鎵撳寘涓嬬嚎")
{
- int TimeStamp = string.IsNullOrEmpty(trayCode) ? time.timeStamp : int.Parse(trayCode);
+ string TimeStamp = string.IsNullOrEmpty(trayCode) ? time.timeStamp.ToString() : trayCode;
//List<string> batchList = time.batchNumber.Split('-').ToList();
//string batch = "";
//for(int i = 0; i < 1; i++)
@@ -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
@@ -588,7 +594,17 @@
var wmsResponse = JsonConvert.DeserializeObject<WMSResponseModel>(feedback);
//var res = feedback.Replace("{", "").Replace("}", "").Replace(":", "=").Replace(",", ";").Replace('"', ' ');
if (wmsResponse.Success == true) {
- if(ItemCode == "鎵撳寘涓嬬嚎") MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), RemoveFlags.Single);
+ if (ItemCode == "鎵撳寘涓嬬嚎")
+ {
+ if (trayCode.Contains("MES"))
+ {
+ MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStampMES", trayCode), RemoveFlags.Single);
+ }
+ else
+ {
+ MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), RemoveFlags.Single);
+ }
+ }
msg = $"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戞垚鍔燂紒杩斿洖缁撴灉=" + wmsResponse.Success + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
}
else {
--
Gitblit v1.9.1