From 7a3f33acdb9057a61699fa2043ed47b7cb0e35cb Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 29 七月 2025 17:31:10 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs | 6 +++---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs | 6 ++----
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
index 61f4a59..fc28598 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
@@ -455,7 +455,7 @@
{
if (req.isSuccess)
{
- var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("packingMachineNumber", models.machineNo), "TimeCuoInfoCom");
+ var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStampMES", req.data.mesCode), "TimeCuoInfoCom");
if (timeCuo == null)
{
MongoDBSingleton.Instance.Insert<TimeCuoInfoCom>(new TimeCuoInfoCom
@@ -492,7 +492,7 @@
}
else
{
- var query = Query.EQ("packingMachineNumber", models.machineNo);
+ var query = Query.EQ("timeStampMES", req.data.mesCode);
//鍙樻洿娉ㄩ噴
UpdateBuilder update = Update.Set("isFold", 1).Set("packingMachineNumber", models.machineNo).Set("needWeight", (int)req.data.FMustQty)
.Set("realWeight", (int)req.data.FMustQty).Set("totalWeight", (int)req.data.FMustQty).Set("batchNumber", req.data.Flot)
@@ -565,7 +565,6 @@
data = 4
});
}
-
}
}
else CMMLog.Debug("鎵撳寘涓嬬嚎鍙ｆ帴椹充綅鐐逛綅鏈厤缃�);
@@ -581,7 +580,6 @@
{
result.errMsg = req.msg;
}
-
}
else
{
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
index dbecd46..7c05267 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
@@ -1995,12 +1995,12 @@
return paddedData1;
}
- internal static void senderpTask(TimeCuoInfoCom time, string startBit)
+ internal static void senderpTask(TimeCuoInfoCom time, string startBit, string trayCode)
{
try
{
CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�寮�:" + JsonConvert.SerializeObject(time));
- var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTable>(Query.EQ("timeStamp", time.timeStamp.ToString()), "SendErpTaskInfoTable");
+ var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTable>(Query.EQ("timeStamp", trayCode.ToString()), "SendErpTaskInfoTable");
if (erpInfo == null)
{
//string fEntryId = time.FEntryID_1.ToString() + (time.FEntryID_2 == 0 ? "" : ";" + time.FEntryID_2.ToString()) + (time.FEntryID_3 == 0 ? "" : ";" + time.FEntryID_3.ToString()) + (time.FEntryID_4 == 0 ? "" : ";" + time.FEntryID_4.ToString());
@@ -2019,7 +2019,7 @@
materialSpec = time.productModel,
lotCode = time.batchNumber,
totalWeight = time.totalWeight,
- timeStamp = time.timeStamp.ToString(),
+ timeStamp = trayCode.ToString(),
productTime = Convert.ToDateTime(time.ProductionDate).AddHours(8),
invalidationTime = Convert.ToDateTime(time.ProductionDate).AddHours(8).AddDays(365),
dateTime = DateTime.Now.AddHours(8),
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index 2ac64f5..a5b315e 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
@@ -526,7 +526,7 @@
JournalId = time.FEntryID_1.ToString(),
});
//灏嗘暟鎹彃鍏ヤ腑闂磋〃
- ERPService.senderpTask(time, startBit);
+ ERPService.senderpTask(time, startBit, trayCode);
}
}
else
--
Gitblit v1.9.1