From 5ccc957c0e4768336e3272346942e1d5e2f14624 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 23 六月 2025 17:31:02 +0800
Subject: [PATCH] 111

---
 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
index 044cfd0..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; }
@@ -432,14 +436,18 @@
                                 CMMLog.Info($"WMSIn-{startBit}:time鑾峰彇鏃堕棿鎴虫暟鎹负锛歿time.TimeCuo}锛�);
                                 model.data.Add(new ItemData()
                                 {
-                                    itemCode = erpItemTableInfo.item_code,
-                                    lotNo = erpItemTableInfo.item_spec,
+                                    itemCode = erpItemTableInfo.item_spec,
+                                    itemName = erpItemTableInfo.item_name,
+                                    itemModel = erpItemTableInfo.item_spec,
+                                    lotNo = time.lotNo,
                                     machineNo = time.packingMachineNumber.ToString(),
                                     packageCode = time.bagNumber.ToString(),
                                     foldingbag = time.isFold.ToString(),
                                     timeStamp = int.Parse(time.TimeCuo),
                                     realWeight = time.realWeight,
-                            
+                                    productWeight = time.needWeight.ToString(),
+                                    oneTrayWeight = time.realWeight.ToString(),
+
                                     Jm_Item_Code = erpItemTableInfo.item_code,
                                     Jm_Item_Name = erpItemTableInfo.item_name,
                                     Jm_Item_Model = erpItemTableInfo.item_spec,
@@ -463,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,
@@ -646,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