From 5a8af645c7e36595e218d8ffc36d4f74eab63a32 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 04 七月 2025 17:27:06 +0800
Subject: [PATCH] 111

---
 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs |  222 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 187 insertions(+), 35 deletions(-)

diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
index 7d3bc4d..0555a24 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -24,6 +24,7 @@
 using System.Net.Configuration;
 using static System.Runtime.CompilerServices.RuntimeHelpers;
 using System.Reflection.Emit;
+using System.Text.RegularExpressions;
 
 namespace Hanhe.iWCS.TaizhouGEMTwoProtocol
 {
@@ -1068,7 +1069,6 @@
 
                     WriteCacheStackingData(plc, task, machine);
 
-
                     var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                     {
                         addr = plc.writeAddr + 1,
@@ -1094,11 +1094,12 @@
                 //璇诲彇閫氶亾1閲岄潰鍙傛暟鏄惁涓�锛屽垽鏂彔鐩樻満鏄惁闇�涓婃枡
                 var result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                 {
-                    dataNum = 1,
+                    dataNum = 2,
                     addr = pmInfo.readAddr + 1,
                     host = pmInfo.ip,
                     port = pmInfo.port
                 });
+                CMMLog.Info($"鑾峰彇纰熺洏鍏ュ彛淇℃伅锛歿JsonConvert.SerializeObject(result)}");
                 if (result != null && result.errCode == 0)
                 {
                     //鍙傛暟1琛ㄧず鍙犳墭鐐圭敵璇峰叆鏂�@@ -1114,6 +1115,66 @@
                             else CMMLog.Debug($"璋冪敤WMS鑾峰彇纰熺洏鍑哄簱鐢熸垚浠诲姟澶辫触锛�);
                         }
                         else CMMLog.Debug($"妫�煡褰撳墠鍙犳墭鐐规槸鍚︽湁浠诲姟鍗犵敤锛屾垨鑰匨ST涓昏〃涓湁缂撳瓨鏋跺叆鍙犵洏鏈虹殑浠诲姟锛�);
+                    }
+                    if (pmInfo.deviceType == "23" && result.result[1] == 1)
+                    {
+                        //鍥涢挻杞﹂棿锛屼汉宸ヤ笂鏂欐ā寮�+                        result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
+                        {
+                            dataNum = 21,
+                            addr = pmInfo.readAddr + 120,
+                            host = pmInfo.ip,
+                            port = pmInfo.port
+                        });
+                        CMMLog.Info($"鑾峰彇纰熺洏浜哄伐涓婃枡鍐欏叆淇℃伅锛歿JsonConvert.SerializeObject(result)}");
+                        if (result != null && result.errCode == 0)
+                        {
+                            string lotNo = RemoveNull(GetTrayCode(result.result.Skip(0).Take(20).ToArray()).Trim().ToString()); //鎵规鍙�+                            string bagNumber = Convert.ToInt32(Completion(result.result[20]), 2).ToString();
+                            var machinInfo = MongoDBSingleton.Instance.FindOne<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", lotNo), Query.EQ("packageCode", bagNumber)), "MachineInfoTwoTetracobalt");
+                            if(machinInfo != null)
+                            {
+                                TN_I_TASK_MST task = new TN_I_TASK_MST
+                                {
+                                    CN_S_BATCH_NO = machinInfo.trayCode
+                                };
+                                WMSInfo machine = new WMSInfo
+                                {
+                                    location = machinInfo.location,
+                                    productWeight = machinInfo.productWeight,
+                                    oneTrayWeight = machinInfo.oneTrayWeight,
+                                    addState = machinInfo.addState,
+                                    packageCode = machinInfo.packageCode,
+                                    itemCode = machinInfo.materialCode
+                                };
+                                PLCControl.WriteCacheStackingData(pmInfo, task,machine);
+                                machinInfo = MongoDBSingleton.Instance.FindOne<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", lotNo), Query.EQ("packageCode", bagNumber)), "MachineInfoTwoTetracobalt");
+                                if(machinInfo == null)
+                                {
+                                    //淇℃伅鍐欏叆鎴愬姛
+                                    var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+                                    {
+                                        addr = pmInfo.writeAddr + 2,
+                                        host = pmInfo.ip,
+                                        port = pmInfo.port,
+                                        data = 1
+                                    });
+                                    CMMLog.Info("浜哄伐鍙犲寘淇℃伅鏌ヨ鎴愬姛锛屽啓鍏�");
+
+                                }
+                            }
+                            else
+                            {
+                                var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+                                {
+                                    addr = pmInfo.writeAddr + 2,
+                                    host = pmInfo.ip,
+                                    port = pmInfo.port,
+                                    data = 2
+                                });
+                                CMMLog.Info("浜哄伐鍙犲寘淇℃伅鏌ヨ澶辫触锛屽啓鍏�");
+                            }
+                        }
                     }
                 }
                 else CMMLog.Debug($"缂撳瓨鍏ュ彔鐩樻満锛屽垱寤轰换鍔★紝result={result.errMsg}");
@@ -1249,17 +1310,17 @@
             num[8] = int.Parse(AsciiToTen(machine.location));//鍖呰鏈哄彿
             for (int b = 9; b <= 10; b++)
             {
-                int k = b % 2 == 0 ? 0 : 16;
+                int k = b % 2 == 0 ? 16 : 0;
                 num[b] = Convert.ToInt32(Convert.ToString(int.Parse(machine.productWeight), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
             }
             for (int b = 11; b <= 12; b++)
             {
-                int k = b % 2 == 0 ? 0 : 16;
+                int k = b % 2 == 0 ? 16 : 0;
                 num[b] = Convert.ToInt32(Convert.ToString(int.Parse(machineInfoTwo.trayCodeWeight), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
             }
             for (int b = 13; b <= 14; b++)
             {
-                int k = b % 2 == 0 ? 0 : 16;
+                int k = b % 2 == 0 ? 16 : 0;
                 num[b] = Convert.ToInt32(Convert.ToString(int.Parse(machine.oneTrayWeight), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
             }
             for (int b = 15; b <= 16; b++)
@@ -1284,7 +1345,9 @@
             #endregion
 
             string pcHead = "";
+            string pcTail = "";
             string cpHead = "";
+            string cpTail = "";
             string mtHead = "";// 璁惧鐨勭湡瀹炵墿鏂欑紪鐮� 
             #region  35~54 => 41~60 浜у搧鎵规鍙�@@ -1293,12 +1356,17 @@
             CMMLog.Info($"41~60data1_1:{data}");
             if (data.Length % 2 != 0)
             {
-                data = "0" + machineInfoTwo.lotNo;
-                pcHead = "" + machineInfoTwo.lotNo.Substring(0, 1);
+                //data = "0" + machineInfoTwo.lotNo;
+                //pcHead = "" + machineInfoTwo.lotNo.Substring(0, 1);
+
+                pcTail = machineInfoTwo.lotNo.Substring(data.Length - 1, 1) + "";
+                CMMLog.Info($"pcTail:{pcTail}");
+                data = machineInfoTwo.lotNo + " ";
             }
             CMMLog.Info($"41~60data1_2:{data}");
             //瀛楃涓查暱搴�/ 2 = 鍐欏叆閫氶亾鏁伴噺(涓や綅涓�浆) 鍒楋細 3L0050 鍐欏叆涓変釜閫氶亾
             int maxLength = 34 + (data.Length / 2);// data.Length / 2 鑷冲皯涓�1
+            int maxLength2 = maxLength;
             int aa = 0;
             for (int i = 35; i <= maxLength; i++)
             {
@@ -1306,11 +1374,45 @@
                 aa = aa + 2;
             }
             for (int x = maxLength + 1; x <= 54; x++) num[x] = 0;//灏嗕骇鍝佹壒娆″彿鏃犳暟鎹殑閫氶亾鍏ㄩ儴缃负 0
+            CMMLog.Info($"num:{JsonConvert.SerializeObject(num)}");
             #endregion
 
-            #region   55~64 => 61~70 浜у搧鍨嬪彿
+            #region   55~64 => 61~70 浜у搧鍨嬪彿(鍥涢挻浜у搧鍨嬪彿鏈変腑鏂囧拰鑻辨枃)
 
-            ERPService.HandleItemInfoChina(machine.itemCode, 55, 64, num);// 涓枃澶勭悊 55~64 61~70
+            int maxLength3 = 0;
+            if (Regex.IsMatch(ErpItemInfo.item_spec, @"[\u4e00-\u9fff]"))
+            {
+                ERPService.HandleItemInfoChina(ErpItemInfo.item_spec, 55, 64, num);// 涓枃澶勭悊 55~64 61~70
+            }
+            else
+            {
+                data = ErpItemInfo.item_spec;
+                CMMLog.Info($"61~70data1_1:{data}");
+                if (data.Length % 2 != 0)
+                {
+                    //data = "0" + machineInfoTwo.lotNo;
+                    //pcHead = "" + machineInfoTwo.lotNo.Substring(0, 1);
+
+                    cpTail = ErpItemInfo.item_spec.Substring(data.Length - 1, 1) + "";
+                    CMMLog.Info($"cpTail:{cpTail}");
+                    data = ErpItemInfo.item_spec + " ";
+                }
+                CMMLog.Info($"61~70data1_2:{data}");
+                //瀛楃涓查暱搴�/ 2 = 鍐欏叆閫氶亾鏁伴噺(涓や綅涓�浆) 鍒楋細 3L0050 鍐欏叆涓変釜閫氶亾
+                maxLength = 54 + (data.Length / 2);// data.Length / 2 鑷冲皯涓�1
+                maxLength3 = maxLength;
+                aa = 0;
+                for (int i = 55; i <= maxLength; i++)
+                {
+                    num[i] = int.Parse(AsciiToTen(data.Substring(aa, 2)));
+                    aa = aa + 2;
+                }
+                for (int x = maxLength3 + 1; x <= 64; x++) num[x] = 0;//灏嗕骇鍝佹壒娆″彿鏃犳暟鎹殑閫氶亾鍏ㄩ儴缃负 0
+                CMMLog.Info($"num:{JsonConvert.SerializeObject(num)}");
+
+                //ERPService.HandleItemInfo(ErpItemInfo.item_spec, 55, 64, num);
+            }
+            
 
             //string data2 = machine.itemCode;
             //CMMLog.Info($"51~50data2_1:{data2}");
@@ -1354,14 +1456,28 @@
             ERPService.HandleItemInfo(ErpItemInfo.item_uom, 100, 104, num);// 100~104 106~110
 
             // 濡傛灉 浜у搧鎵规鍙�鎴栬� 浜у搧鍨嬪彿 浣嶆暟 涓�濂囨暟锛屽垯灏嗘彁鍓嶅彇鍑虹殑 棣栧瓧绗�閲嶆柊杞爜 鍐欏叆 鍏舵墍瀵瑰簲閫氶亾鍖哄煙鐨�棣栭�閬�-            if (pcHead != "") num[35] = int.Parse(AsciiToTen(pcHead));
-            if (cpHead != "") num[55] = int.Parse(AsciiToTen(cpHead));
+            //if (pcHead != "") num[35] = int.Parse(AsciiToTen(pcHead));
+            if (pcTail != "") num[maxLength2] = tailToTen(pcTail);
+            //if (cpHead != "") num[55] = int.Parse(AsciiToTen(cpHead));
+            if (cpHead != "") num[maxLength3] = int.Parse(AsciiToTen(cpTail));
             if (mtHead != "") num[65] = int.Parse(AsciiToTen(mtHead));
             if (pcHead != "" || cpHead != "") CMMLog.Info($"浜у搧鍨嬪彿鎴栨壒娆″彿鏁伴噺涓哄鏁帮紝鐗瑰皢棣栦綅鍙栧嚭鍗曠嫭澶勭悊锛屼互涓嬩负鎵规鍙峰拰浜у搧鍨嬪彿鐨勫崄杩涘埗鏁板�{num[35]},{num[55]}");
 
             CMMLog.Info($"鍙犵洏鏈烘暟鎹鐞嗗畬姣曪細{JsonConvert.SerializeObject(num)}");
 
             return num;
+        }
+
+        private static int tailToTen(string Tail)
+        {
+            char inputChar = Tail[0]; // 鑾峰彇瀛楃涓茬殑绗竴涓瓧绗�+            int asciiValue = (int)inputChar; // 杞崲涓篈SCII鐮�+            string hexValue = asciiValue.ToString("X2"); // 杞崲涓�6杩涘埗
+            string binaryValue = Convert.ToString(asciiValue, 2).PadLeft(8, '0'); // 杞崲涓�浣嶄簩杩涘埗
+            string finalBinaryValue = binaryValue + "00000000"; // 琛�涓簩杩涘埗0
+            int finalDecimalValue = Convert.ToInt32(finalBinaryValue, 2); // 杞崲涓�0杩涘埗
+
+            return finalDecimalValue;
         }
 
         /// <summary>
@@ -1760,7 +1876,7 @@
                     if (result.result[0] == 1)
                     {
                         //鍒ゆ柇3妤煎彔鐩樿捣鐐规槸鍚︽湁浠诲姟鍗犵敤锛屾病鏈夊垯鐢熸垚浠诲姟
-                        if (ProcessHelper.CheckStartFree(plc.location))
+                        if (ProcessHelper.CheckStartFree(plc.location)) 
                         {
                             string wmstaskno = "";
                             string traycode = "";
@@ -2806,11 +2922,11 @@
                         //info.productType = RemoveNull(GetTrayCode(result.Skip(50).Take(10).ToArray()).Trim().ToString());
                         //info.materialCode = RemoveNull(GetTrayCode(result.Skip(60).Take(20).ToArray()).Trim().ToString());
 
-                        info.lotNo = RemoveNull(GetTrayCode(result.Skip(35).Take(20).ToArray()).Trim().ToString());
-                        info.productType = RemoveNull(GetTrayCode(result.Skip(55).Take(10).ToArray()).Trim().ToString());
-                        info.materialCode = RemoveNull(GetTrayCode(result.Skip(65).Take(15).ToArray()).Trim().ToString());
-                        info.materialName = RemoveNull(GetTrayCode(result.Skip(80).Take(20).ToArray()).Trim().ToString());
-                        info.measurementUnit = RemoveNull(GetTrayCode(result.Skip(100).Take(5).ToArray()).Trim().ToString());
+                        info.lotNo =RemoveNull(GetTrayCode(result.Skip(35).Take(20).ToArray()).Trim().ToString()).TrimStart();
+                        info.productType = RemoveNull(GetTrayCode(result.Skip(55).Take(10).ToArray()).Trim().ToString()).TrimStart();
+                        info.materialCode = RemoveNull(GetTrayCode(result.Skip(65).Take(15).ToArray()).Trim().ToString()).TrimStart();
+                        info.materialName = RemoveNull(GetTrayCode(result.Skip(80).Take(20).ToArray()).Trim().ToString()).TrimStart();
+                        info.measurementUnit = RemoveNull(GetTrayCode(result.Skip(100).Take(5).ToArray()).Trim().ToString()).TrimStart();
 
                         CMMLog.Info($"鏁版嵁澶勭悊娴佺▼锛氬寘瑁呮満鏃燤ES鎯呭喌涓嬶紝鑾峰彇浠ュ線MES浼犺緭鐨勬暟鎹紝鏂拌幏寰楁暟鎹紝lotNo:{info.lotNo},productType:{info.productType},materialCode:{info.materialCode},materialName:{info.materialName},measurementUnit:{info.measurementUnit}");
                         
@@ -3655,7 +3771,7 @@
                             if (result != null && result.errCode == 0 && result.result.Count() > 0)
                             {
                                 //1锛氬彇鏂�-                                if (result.result[0] == 1)
+                                if (result.result[0] == 1 || result.result[0] == 5)
                                 {
                                     string PlcBit02 = Settings.GetPlcInfo().Where(a => a.deviceType == "22").FirstOrDefault().location;
                                     //鍖呰涓嬬嚎浠诲姟锛岀粓鐐逛负澶嶇О浣嶇疆锛堣繖閲屽垽鏂寘瑁呮満璧风偣锛屽绉拌捣鐐圭粓鐐瑰潎鏃犱换鍔★紝鍒欐帹閫佷换鍔★級
@@ -3712,7 +3828,7 @@
                                                                 port = pmInfo.port,
                                                                 data = 4
                                                             });
-
+                                                            CMMLog.Debug($"锛堝洓閽磋溅闂达級鍖呰涓嬬嚎娴佺▼-{pmInfo.location}锛歩p:{pmInfo.ip},port:{pmInfo.port},addr:{pmInfo.writeAddr},鍐欏叆4");
                                                             //string timeStamp = ProcessHelper.GetTimeStamp(31, 1, 1);
                                                             //tray.trayCode = "VW" + timeStamp;
                                                             //MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(Query.EQ("_id", tray._id), Update.Set("trayCode", tray.trayCode), UpdateFlags.None);
@@ -3726,22 +3842,57 @@
                                                             }
                                                             else if (tray.trayCode != "0" && !string.IsNullOrEmpty(tray.trayCode))
                                                             {
-                                                                HHAmsExecuteResult req = AMSHelper.CreateTask(DateTime.Now.Ticks.ToString(), pmInfo.location, PlcBit02, "3妤煎寘瑁呭彇鏂�鍥涢挻)", 0, tray.trayCode, timeStamp);
-                                                                if (req.success)
+                                                                if (result.result[0] == 1)
                                                                 {
-                                                                    string weight = (double.Parse(tray.oneTrayWeight) / 100).ToString();
-                                                                    ERPService.packageInfo(tray.machineNo, tray.trayCode, tray.lotNo, weight);
-
-                                                                    //璁板綍鎵樼洏绫诲瀷
-                                                                    var trayTypeInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", pmInfo.location), "trayTypeTable");
-                                                                    if(trayTypeInfo == null)
+                                                                    HHAmsExecuteResult req = AMSHelper.CreateTask(DateTime.Now.Ticks.ToString(), pmInfo.location, PlcBit02, "3妤煎寘瑁呭彇鏂�鍥涢挻)", 0, tray.trayCode, timeStamp);
+                                                                    if (req.success)
                                                                     {
-                                                                        MongoDBSingleton.Instance.Insert<trayTypeTable>(new trayTypeTable
+                                                                        string weight = (double.Parse(tray.oneTrayWeight) / 100).ToString();
+                                                                        ERPService.packageInfo(tray.machineNo, tray.trayCode, tray.lotNo, weight);
+
+                                                                        //璁板綍鎵樼洏绫诲瀷
+                                                                        var trayTypeInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", pmInfo.location), "trayTypeTable");
+                                                                        if (trayTypeInfo == null)
                                                                         {
-                                                                            locCode = pmInfo.location,
-                                                                            trayType = tray.trayType
-                                                                        });
+                                                                            MongoDBSingleton.Instance.Insert<trayTypeTable>(new trayTypeTable
+                                                                            {
+                                                                                locCode = pmInfo.location,
+                                                                                trayType = tray.trayType
+                                                                            });
+                                                                        }
                                                                     }
+                                                                }
+                                                                else
+                                                                {
+                                                                    //var writeRes0 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+                                                                    //{
+                                                                    //    host = pmInfo.ip,
+                                                                    //    addr = pmInfo.writeAddr,
+                                                                    //    data = 5,//鍘熷厛鏄�,鍗曚釜鍐欏叆
+                                                                    //    port = pmInfo.port
+                                                                    //});
+
+                                                                    //浜哄伐妯″紡锛屾棤闇�敓鎴愪换鍔�+                                                                    //鍒犻櫎MachineInfoTetracobalt琛ㄤ腑鐨勬暟鎹�+                                                                    MongoDBSingleton.Instance.Remove<MachineInfoTetracobalt>(Query.And(Query.EQ("machineNo", pmInfo.location), Query.EQ("trayCode", tray.trayCode)), "MachineInfoTetracobalt", RemoveFlags.None);
+
+                                                                    //鍒犻櫎 MachineInfoTwoTetracobalt 閲嶅鐨勬暟鎹�+                                                                    var twoInfo = MongoDBSingleton.Instance.Find<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", tray.lotNo), Query.EQ("packageCode",tray.packageCode)), "MachineInfoTwoTetracobalt");
+                                                                    if(twoInfo.Count > 1)
+                                                                    {
+                                                                        foreach(var a in twoInfo)
+                                                                        {
+                                                                            MongoDBSingleton.Instance.Remove<MachineInfoTwoTetracobalt>(Query.EQ("_id", a._id),RemoveFlags.None);
+                                                                            if (MongoDBSingleton.Instance.Find<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", tray.lotNo), Query.EQ("packageCode", tray.packageCode)), "MachineInfoTwoTetracobalt").Count == 1)
+                                                                            {
+                                                                                break;
+                                                                            }
+                                                                        }
+                                                                    }
+
+                                                                    //璁板綍鍖呰闂翠笅鏂欎俊鎭�+                                                                    string Weight = (decimal.Parse(tray.oneTrayWeight) / 100).ToString("F2");
+                                                                    MongoDBSingleton.Instance.Insert<packageInfoModel>(new packageInfoModel { machineNo = tray.machineNo, trayCode = tray.trayCode, batchNo = tray.lotNo, time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), weight = Weight });
                                                                 }
                                                             }
                                                         }
@@ -4182,14 +4333,14 @@
 
                         result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                         {
-                            dataNum = 15,
-                            addr = plc.readAddr + 140,
+                            dataNum = 70,
+                            addr = plc.readAddr + 110,
                             host = plc.ip,
                             port = plc.port
                         });
                         CMMLog.Info($"涓嬬嚎鍙o紝ip锛歿plc.ip}锛宲ort:{plc.port},addr:{plc.readAddr + 140},result:{JsonConvert.SerializeObject(result)}");
-                        string materialCode = RemoveNull(GetTrayCode(result.result.Skip(0).Take(15).ToArray()).Trim().ToString());
-
+                        string lotNo = RemoveNull(GetTrayCode(result.result.Skip(0).Take(20).ToArray()).Trim().ToString());
+                        string materialCode = RemoveNull(GetTrayCode(result.result.Skip(30).Take(15).ToArray()).Trim().ToString());
                         CMMLog.Info($"涓嬬嚎鍙o細timeCuoData:{timeCuoData},empCode:{empCode},machineCode:{machineCode},needWeight:{needWeight},oneWeight:{oneWeight},readWeight:{readWeight}" +
                             $",fcWeight:{fcWeight},trayType:{trayType},addState:{addState},bagNumber:{bagNumber},productTime:{productTime},TimeCuo:{timeCuoData}");
                         var timeTwo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("TimeCuo", timeCuoData), "TimeCuoInfoComTwo");
@@ -4209,6 +4360,7 @@
                                 bagNumber = bagNumber,
                                 productData = productTime.ToString(),
                                 TimeCuo = timeCuoData,
+                                lotNo = lotNo,
                                 materialCode = materialCode
                             }, "TimeCuoInfoComTwo");
                         }

--
Gitblit v1.9.1