From 84c580cccb118f5ec4a039d0009255935c3c2490 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 17 六月 2025 17:31:40 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs | 121 ++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 65 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
index e38c750..9754fb4 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)
- {
- 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
- });
- }
+ //var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("timeStamp", timeStamp), "TimeCuoInfoCom");
+ //CMMLog.Info($"WMSIn-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細timeStamp={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()
+ // {
+ // itemCode = time.productModel,
+ // lotNo = time.lotNo,
+ // machineNo = time.packingMachineNumber1.ToString(),
+ // packageCode = time.bagNumber1.ToString(),
+ // foldingbag = time.isFold1.ToString(),
+ // timeStamp = int.Parse(time.TimeCuo),
+ // realWeight = time.realWeight1,
+ //
+ // 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
+ // });
+ //}
}
-
}
else
{
@@ -644,38 +635,38 @@
}
else
{
- var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("timeStamp", timeStamp), "TimeCuoInfoCom");
- CMMLog.Info($"WMSInTwo-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細timeStamp={timeStamp},璇诲嚭 TimeCuoInfoComTwo 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(time)}");
- if (ItemCode == "time" && time != null)
- {
- CMMLog.Info($"WMSInTwo-{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
- });
- }
+ //var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("timeStamp", timeStamp), "TimeCuoInfoCom");
+ //CMMLog.Info($"WMSInTwo-{startBit}:{ItemCode}锛氭煡璇㈡潯浠讹細timeStamp={timeStamp},璇诲嚭 TimeCuoInfoComTwo 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(time)}");
+ //if (ItemCode == "time" && time != null)
+ //{
+ // CMMLog.Info($"WMSInTwo-{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
+ // });
+ //}
}
}
--
Gitblit v1.9.1