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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index b725d86..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>
@@ -428,7 +428,7 @@
}
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()
{
@@ -468,7 +468,7 @@
foldingbag = "1",
//totalWeight = time.totalWeight,
- timeStamp = 1,
+ timeStamp = "1",
photoURL = "1",
//productType = time.productModel,
//bagNumber = time.bagNumber,
@@ -480,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++)
@@ -594,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