From 25d5e0519ebde8a72cb5108d191ada41e64c9753 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 30 六月 2025 17:31:06 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs | 89 ++++++++++++++------------------------------
1 files changed, 28 insertions(+), 61 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
index e38c750..4234ec0 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
@@ -164,6 +164,10 @@
//鐗╂枡缂栧彿锛歩temCode
//鐗╂枡鏁伴噺锛歲ty
public string itemCode { get; set; }
+ //鐗╂枡鍚嶇О
+ public string itemName { get; set; }
+ //鐗╂枡瑙勬牸
+ public string itemModel { get; set; }
//public string itemFeature { get; set; }
//public string itemState { get; set; }
//public string ProductionDate { get; set; }
@@ -423,40 +427,35 @@
}
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,
+ itemCode = erpItemTableInfo.item_spec,
+ itemName = erpItemTableInfo.item_name,
+ itemModel = erpItemTableInfo.item_spec,
lotNo = time.lotNo,
- machineNo = time.packingMachineNumber1.ToString(),
- packageCode = time.bagNumber1.ToString(),
- //palletLayers = time.bagNumber1.ToString(),
- foldingbag = time.isFold1.ToString(),
- //totalWeight = time.totalWeight,
+ 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,
+ realWeight = time.realWeight,
+ productWeight = time.needWeight.ToString(),
+ oneTrayWeight = time.realWeight.ToString(),
- Jm_Item_Code = time.materialCode,
- Jm_Item_Name = time.materialName,
- Jm_Item_Model = time.productModel,
- Jm_Item_Unit = time.measurementUnit,
+ 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
{
@@ -472,7 +471,9 @@
string product = !string.IsNullOrEmpty(info.productType) ? info.productType : erpItemTableInfo.item_spec;
model.data.Add(new ItemData()
{
- itemCode = product,
+ itemCode = info.materialCode,
+ itemName = erpItemTableInfo.item_name,
+ itemModel = erpItemTableInfo.item_spec,
lotNo = info.lotNo,
machineNo = info.machineNo,
packageCode = info.packageCode,
@@ -642,41 +643,6 @@
});
}
}
- 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
- });
- }
- }
}
else
@@ -690,10 +656,11 @@
CMMLog.Info($"WMSInTwo-{startBit}:鏌ヨ鏉′欢锛歩tem_code={info.materialCode},璇诲嚭 ERPItemTable 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(erpItemTableInfo)}");
model.locationGear = info.secondNg.ToString();
model.trayCode = info.trayCode;
- string product = !string.IsNullOrEmpty(info.productType) ? info.productType : erpItemTableInfo.item_spec;
model.data.Add(new ItemData()
{
- itemCode = product,
+ itemCode = erpItemTableInfo.item_spec,
+ itemName = erpItemTableInfo.item_name,
+ itemModel = erpItemTableInfo.item_spec,
lotNo = info.lotNo,
machineNo = info.machineNo,
packageCode = info.packageCode,
--
Gitblit v1.9.1