From c248264e3bc150d145fd38f76f468f938270782a Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 20 六月 2025 17:14:26 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs | 98 +++++++++++++-----------------------------------
1 files changed, 27 insertions(+), 71 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
index a45cbfd..044cfd0 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
@@ -423,40 +423,31 @@
}
else
{
- var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("timeStamp", timeStamp), "TimeCuoInfoCom");
- CMMLog.Info($"WMSIn-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細timeStamp={timeStamp},璇诲嚭 TimeCuoInfoComTwo 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(time)}");
- if (ItemCode == "time" && time != null)
+ var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("TimeCuo", timeStamp), "TimeCuoInfoComTwo");
+ CMMLog.Info($"WMSIn-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細TimeCuo={timeStamp},璇诲嚭 TimeCuoInfoComTwo 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(time)}");
+ var erpItemTableInfo = MongoDBSingleton.Instance.FindOne<ERPItemTable>(Query.EQ("item_code", time.materialCode), "ERPItemTable");
+ CMMLog.Info($"WMSIn-{startBit}:鏌ヨ鏉′欢锛歩tem_code={time.materialCode},璇诲嚭 ERPItemTable 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(erpItemTableInfo)}");
+ if (ItemCode == "time" && time != null && erpItemTableInfo != null)
{
CMMLog.Info($"WMSIn-{startBit}:time鑾峰彇鏃堕棿鎴虫暟鎹负锛歿time.TimeCuo}锛�);
model.data.Add(new ItemData()
{
- //1妤兼媶鐩樻満璋僕MS鑾峰彇鍏ュ簱缁堢偣锛屼紶杈撴椂闂存埑鏁版嵁锛堟殏瀹氾級
- //isFold = time.isFold,
- //packingMachineNumber = time.packingMachineNumber,
- itemCode = time.productModel,
- lotNo = time.lotNo,
- machineNo = time.packingMachineNumber1.ToString(),
- packageCode = time.bagNumber1.ToString(),
- //palletLayers = time.bagNumber1.ToString(),
- foldingbag = time.isFold1.ToString(),
- //totalWeight = time.totalWeight,
+ itemCode = erpItemTableInfo.item_code,
+ lotNo = erpItemTableInfo.item_spec,
+ machineNo = time.packingMachineNumber.ToString(),
+ packageCode = time.bagNumber.ToString(),
+ foldingbag = time.isFold.ToString(),
timeStamp = int.Parse(time.TimeCuo),
- //productType = time.productModel,
- //bagNumber = time.bagNumber,
- //needWeight = time.needWeight,
- realWeight = time.realWeight1,
- //batchNumber = time.batchNumber,
- //totalCount = time.totalCount,
-
- Jm_Item_Code = time.materialCode,
- Jm_Item_Name = time.materialName,
- Jm_Item_Model = time.productModel,
- Jm_Item_Unit = time.measurementUnit,
+ realWeight = time.realWeight,
+
+ Jm_Item_Code = erpItemTableInfo.item_code,
+ Jm_Item_Name = erpItemTableInfo.item_name,
+ Jm_Item_Model = erpItemTableInfo.item_spec,
+ Jm_Item_Unit = erpItemTableInfo.item_uom,
Jm_Item_Staff = employee_id
});
}
}
-
}
else
{
@@ -576,11 +567,11 @@
{
int timeInt = int.Parse(trayCode);
var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStamp", timeInt), "TimeCuoInfoCom");
- CMMLog.Info($"WMSIn-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細timeStamp={timeInt},璇诲嚭 TimeCuoInfoCom 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(time)}");
+ CMMLog.Info($"WMSInTwo-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細timeStamp={timeInt},璇诲嚭 TimeCuoInfoCom 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(time)}");
if (ItemCode == "time" && time != null)
{
int TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp : int.Parse(timeStamp);
- CMMLog.Info($"WMSIn-{startBit}:time鑾峰彇鏃堕棿鎴虫暟鎹负锛歿TimeStamp}锛�);
+ CMMLog.Info($"WMSInTwo-{startBit}:time鑾峰彇鏃堕棿鎴虫暟鎹负锛歿TimeStamp}锛�);
model.data.Add(new ItemData()
{
//1妤兼媶鐩樻満璋僕MS鑾峰彇鍏ュ簱缁堢偣锛屼紶杈撴椂闂存埑鏁版嵁锛堟殏瀹氾級
@@ -612,7 +603,7 @@
// 闈濫RP鍙樻洿娴佺▼鍙互鐩存帴鍒犻櫎 TimeCuoInfoCom 琛� if (ERPService.ERPSwitch01 == "0")
{
- CMMLog.Info($"WMSIn-{startBit}:鏌ヨ鏉′欢锛歵imeStamp={timeInt},闈濫RP鍙樻洿娴佺▼鐩存帴鍒犻櫎 TimeCuoInfoCom 琛紒");
+ CMMLog.Info($"WMSInTwo-{startBit}:鏌ヨ鏉′欢锛歵imeStamp={timeInt},闈濫RP鍙樻洿娴佺▼鐩存帴鍒犻櫎 TimeCuoInfoCom 琛紒");
MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", timeInt), RemoveFlags.Single);
}
}
@@ -639,41 +630,6 @@
realWeight = 1,
//batchNumber = time.batchNumber,
//totalCount = time.totalCount,
- });
- }
- }
- else
- {
- var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("timeStamp", timeStamp), "TimeCuoInfoCom");
- CMMLog.Info($"WMSIn-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細timeStamp={timeStamp},璇诲嚭 TimeCuoInfoComTwo 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(time)}");
- if (ItemCode == "time" && time != null)
- {
- CMMLog.Info($"WMSIn-{startBit}:time鑾峰彇鏃堕棿鎴虫暟鎹负锛歿time.TimeCuo}锛�);
- model.data.Add(new ItemData()
- {
- //1妤兼媶鐩樻満璋僕MS鑾峰彇鍏ュ簱缁堢偣锛屼紶杈撴椂闂存埑鏁版嵁锛堟殏瀹氾級
- //isFold = time.isFold,
- //packingMachineNumber = time.packingMachineNumber,
- itemCode = time.productModel,
- lotNo = time.lotNo,
- machineNo = time.packingMachineNumber1.ToString(),
- packageCode = time.bagNumber1.ToString(),
- //palletLayers = time.bagNumber1.ToString(),
- foldingbag = time.isFold1.ToString(),
- //totalWeight = time.totalWeight,
- timeStamp = int.Parse(time.TimeCuo),
- //productType = time.productModel,
- //bagNumber = time.bagNumber,
- //needWeight = time.needWeight,
- realWeight = time.realWeight1,
- //batchNumber = time.batchNumber,
- //totalCount = time.totalCount,
-
- Jm_Item_Code = time.materialCode,
- Jm_Item_Name = time.materialName,
- Jm_Item_Model = time.productModel,
- Jm_Item_Unit = time.measurementUnit,
- Jm_Item_Staff = employee_id
});
}
}
@@ -724,14 +680,14 @@
string reqStr = "鐗╂枡鍚�" + ItemCode + ";鏁伴噺";
string feedback = "";
- CMMLog.Info($"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆�鍙戦�鏁版嵁锛歿JsonConvert.SerializeObject(msgData)}锛岀墿鏂欐潯浠讹細ItemCode锛歿ItemCode},trayCode锛歿trayCode}");
+ CMMLog.Info($"WMSInTwo-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆�鍙戦�鏁版嵁锛歿JsonConvert.SerializeObject(msgData)}锛岀墿鏂欐潯浠讹細ItemCode锛歿ItemCode},trayCode锛歿trayCode}");
var url = hao.WebUrl + "GlmInSendTask";
try
{
//hao.WebUrl = "http://192.168.1.199:9001/api/";
feedback = helper.WebPost(url, msgData).Replace(@"\", "").Trim();
Console.WriteLine(feedback);
- CMMLog.Info($"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆�鎺ユ敹鏁版嵁锛� + feedback);
+ CMMLog.Info($"WMSInTwo-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆�鎺ユ敹鏁版嵁锛� + feedback);
if (!string.IsNullOrEmpty(feedback))
{
//var wmsResponse = JsonConvert.DeserializeObject<WMSResponseModel>(feedback.Substring(1, feedback.Length - 2));
@@ -739,28 +695,28 @@
//var res = feedback.Replace("{", "").Replace("}", "").Replace(":", "=").Replace(",", ";").Replace('"', ' ');
if (wmsResponse.Success == true)
{
- msg = $"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戞垚鍔燂紒杩斿洖缁撴灉=" + wmsResponse.Success + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
+ msg = $"WMSInTwo-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戞垚鍔燂紒杩斿洖缁撴灉=" + wmsResponse.Success + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
}
else
{
string errMsg = wmsResponse.Code + "-" + wmsResponse.Msg;
- msg = $"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戝け璐ワ紒閿欒鍘熷洜=" + errMsg + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
+ msg = $"WMSInTwo-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戝け璐ワ紒閿欒鍘熷洜=" + errMsg + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
}
result = wmsResponse.Success;
}
else
{
string errMsg = "鍙傛暟鍙嶉绌哄�";
- msg = $"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戝け璐ワ紒閿欒鍘熷洜=" + errMsg + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
+ msg = $"WMSInTwo-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戝け璐ワ紒閿欒鍘熷洜=" + errMsg + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
}
}
catch (Exception e)
{
- CMMLog.Error(string.Format($"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅澶辫触銆戝紓甯竰0}", e.Message), e);
- msg = $"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戝け璐ワ紒瑙ｆ瀽杩斿洖鍊煎嚭閿�" + feedback + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
+ CMMLog.Error(string.Format($"WMSInTwo-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅澶辫触銆戝紓甯竰0}", e.Message), e);
+ msg = $"WMSInTwo-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戝け璐ワ紒瑙ｆ瀽杩斿洖鍊煎嚭閿�" + feedback + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
}
}
- else msg = string.Format($"WMSIn-{startBit}:璋冪敤wms澶辫触锛宎ms宸ヤ綔涓績娌℃湁璁剧疆锛�);
+ else msg = string.Format($"WMSInTwo-{startBit}:璋冪敤wms澶辫触锛宎ms宸ヤ綔涓績娌℃湁璁剧疆锛�);
CMMLog.Info(msg);
Console.WriteLine(msg);
return result;
--
Gitblit v1.9.1