添加泰国订单截取和中兴参数添加

UAS_MES_HYSX/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -10,6 +10,8 @@ using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
 using DevExpress.XtraBars;
 using UAS_MES_NEW.PublicForm;
+using DevExpress.XtraPrinting;
+using System.Text.RegularExpressions;
 
 namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
@@ -20,12 +22,29 @@ namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
             InitializeComponent();
         }
 
+        public static string Substring(string text, string start, string end)
+        {
+            //int IndexofA = text.IndexOf(start);
+            //int IndexofB = text.IndexOf(end);
+            //string NameText = text.Substring(IndexofA + start.Length, IndexofB - IndexofA + 2 - end.Length);
+
+            Regex rg = new Regex("(?<=(" + start + "))[.\\s\\S]*?(?=(" + end + "))", RegexOptions.Multiline | RegexOptions.Singleline);
+            string NameText = rg.Match(text).Value;
+            return NameText;
+        }
+
         public override string Text
         {
             get
             {
                 if (SystemInf.UpperCollection && !base.Text.Contains("CHANGEUSER:"))
+                {
                     return base.Text.ToUpper();
+                }
+                else if (Text.Contains("did="))
+                {
+                    return Substring(base.Text, "did=", "wifiCfg=");
+                }
                 else
                     return base.Text;
             }
@@ -78,6 +97,7 @@ namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
                     Clear();
                     return;
                 }
+
             }
         }
     }

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -159,6 +159,19 @@ namespace UAS_MES_NEW.PublicMethod
         public List<string> DevEnNo { get; set; } = new List<string>();
         public List<string> Reserve3 { get; set; } = new List<string>();
         public List<string> Reserve4 { get; set; } = new List<string>();
+        public List<string> Reserve11 { get; set; } = new List<string>();
+        public List<string> Reserve12 { get; set; } = new List<string>();
+        public List<string> Reserve13 { get; set; } = new List<string>();
+        public List<string> Reserve14 { get; set; } = new List<string>();
+        public List<string> Reserve15 { get; set; } = new List<string>();
+        public List<string> Reserve16 { get; set; } = new List<string>();
+        public List<string> Reserve17 { get; set; } = new List<string>();
+        public List<string> Reserve18 { get; set; } = new List<string>();
+        public List<string> Reserve19 { get; set; } = new List<string>();
+        public List<string> Reserve20 { get; set; } = new List<string>();
+        public List<string> Reserve21 { get; set; } = new List<string>();
+        public List<string> Reserve22 { get; set; } = new List<string>();
+
     }
 
     public class Thailand
@@ -312,6 +325,185 @@ namespace UAS_MES_NEW.PublicMethod
                 }
             }
 
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve11_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve11.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve12_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve12.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve13_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve13.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve14_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve14.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve15_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve15.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve16_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve16.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve17_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve17.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve18_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve18.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve19_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve19.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve20_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve20.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve21_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve21.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            index = 0;
+            while (true)
+            {
+                string key = $"reserve22_{index}";
+                if (jsonObject.TryGetValue(key, out JToken value))
+                {
+                    deviceInfo.Reserve22.Add(value.ToString());
+                    index++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
             // 解析 DeviceId 数组
             index = 0;
             while (true)
@@ -411,6 +603,18 @@ namespace UAS_MES_NEW.PublicMethod
             string status = deviceObj["status"].ToString();
             string device_type = deviceObj["device_type"].ToString();
             string en_no = deviceObj["en_no"].ToString();
+            string reserve11 = deviceObj["reserve11"].ToString();
+            string reserve12 = deviceObj["reserve12"].ToString();
+            string reserve13 = deviceObj["reserve13"].ToString();
+            string reserve14 = deviceObj["reserve14"].ToString();
+            string reserve15 = deviceObj["reserve15"].ToString();
+            string reserve16 = deviceObj["reserve16"].ToString();
+            string reserve17 = deviceObj["reserve17"].ToString();
+            string reserve18 = deviceObj["reserve18"].ToString();
+            string reserve19 = deviceObj["reserve19"].ToString();
+            string reserve20 = deviceObj["reserve20"].ToString();
+            string reserve21 = deviceObj["reserve21"].ToString();
+            string reserve22 = deviceObj["reserve22"].ToString();
             if (dh.CheckExist("ZTEDATA", "zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒机身标'"))
             {
                 dh.ExecuteSql("delete from ZTEDATA where zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒机身标'", "delete");
@@ -447,8 +651,8 @@ namespace UAS_MES_NEW.PublicMethod
                 default:
                     break;
             }
-            dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,zd_WholeDeviceCode,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,ZD_MAC_START, ZD_MAC_END,ZD_RESERVE3,zd_enno,zd_devicetype,zd_regcode)" +
-                "values(ZTEDATA_seq.nextval,'" + SN + "','" + WholeDeviceCode + "','" + dev_en_no + "','" + iSN + "','" + makecode + "','彩盒机身标','','" + mac + "','" + mac_start + "','" + mac_end + "','" + reserve3 + "','" + en_no + "','" + device_type + "','" + reg_code + "')", "insert");
+            dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,zd_WholeDeviceCode,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,ZD_MAC_START, ZD_MAC_END,ZD_RESERVE3,zd_enno,zd_devicetype,zd_regcode,ZD_RESERVE11, ZD_RESERVE12, ZD_RESERVE13, ZD_RESERVE14, ZD_RESERVE15, ZD_RESERVE16, ZD_RESERVE17, ZD_RESERVE18, ZD_RESERVE19, ZD_RESERVE20, ZD_RESERVE21,ZD_RESERVE22)" +
+                "values(ZTEDATA_seq.nextval,'" + SN + "','" + WholeDeviceCode + "','" + dev_en_no + "','" + iSN + "','" + makecode + "','彩盒机身标','','" + mac + "','" + mac_start + "','" + mac_end + "','" + reserve3 + "','" + en_no + "','" + device_type + "','" + reg_code + "','"+reserve11+"','"+reserve12+"','"+reserve13+"','"+reserve14+"','"+reserve15+"','"+reserve16+"','"+reserve17+"','"+reserve18+"','"+reserve19+"','"+reserve20+"','"+reserve21+"','"+reserve22+"')", "insert");
             return dev_en_no;
         }
 
@@ -516,10 +720,11 @@ namespace UAS_MES_NEW.PublicMethod
                     dh.ExecuteSql("delete from ZTEDATA where zd_sn='" + deviceInfo.DSN[i] + "' and zd_makecode='" + makecode + "' and zd_type='BOX'", "delete");
                 }
                 dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,ZD_product_mode, ZD_PRODUCTNAME, ZD_MATERIAL_CODE, ZD_BATCH_NO, ZD_SOFT_VERSION, ZD_HD_VERSION, " +
-                    "ZD_VOLTAGE, ZD_POWER, ZD_ORDER_NO, ZD_BIG_BOX_NO, ZD_D_SN, ZD_DEV_EN_NO, ZD_RESERVE3, ZD_DEVICEID, ZD_MAC_START, ZD_MAC_END,zd_production_date, ZD_INDATE)" +
+                    "ZD_VOLTAGE, ZD_POWER, ZD_ORDER_NO, ZD_BIG_BOX_NO, ZD_D_SN, ZD_DEV_EN_NO, ZD_RESERVE3, ZD_DEVICEID, ZD_MAC_START, ZD_MAC_END,zd_production_date, ZD_INDATE,ZD_RESERVE11, ZD_RESERVE12, ZD_RESERVE13, ZD_RESERVE14, ZD_RESERVE15, ZD_RESERVE16, ZD_RESERVE17, ZD_RESERVE18, ZD_RESERVE19, ZD_RESERVE20, ZD_RESERVE21,ZD_RESERVE22)" +
                     "values(ZTEDATA_seq.nextval,'" + deviceInfo.DSN[i] + "','" + makecode + "','BOX','" + deviceInfo.DSN[i] + "','" + deviceInfo.ProductMode + "','" + deviceInfo.ProductName + "','" + deviceInfo.MaterialCode + "','" + deviceInfo.BatchNo + "','" + deviceInfo.SoftVersion + "','" + deviceInfo.HdVersion + "'," +
                     "'" + deviceInfo.Voltage + "','" + deviceInfo.Power + "','" + deviceInfo.OrderNo + "','" + deviceInfo.BigBoxNo + "','" + deviceInfo.DSN[i] + "'," +
-                    "'" + deviceInfo.DevEnNo[i] + "', '" + deviceInfo.Reserve3[i] + "','" + deviceInfo.DeviceId[i] + "','" + deviceInfo.MacStart[i] + "','" + deviceInfo.MacEnd[i] + "','" + deviceInfo.ProductionDate + "',sysdate)", "insert");
+                    "'" + deviceInfo.DevEnNo[i] + "', '" + deviceInfo.Reserve3[i] + "','" + deviceInfo.DeviceId[i] + "','" + deviceInfo.MacStart[i] + "','" + deviceInfo.MacEnd[i] + "','" + deviceInfo.ProductionDate + "',sysdate,'"+ deviceInfo.Reserve11[i] + "','"+ deviceInfo.Reserve12[i] + "','"+ deviceInfo.Reserve13[i] + "'" +
+                    ",'"+ deviceInfo.Reserve14[i] + "','"+ deviceInfo.Reserve15[i] + "','"+ deviceInfo.Reserve16[i] + "','"+ deviceInfo.Reserve17[i] + "','"+ deviceInfo.Reserve18[i] + "','"+ deviceInfo.Reserve19[i] + "','"+ deviceInfo.Reserve20[i] + "','"+ deviceInfo.Reserve21[i] + "','"+ deviceInfo.Reserve22[i] + "')", "insert");
             }
             dh.ExecuteSql("update package set pa_zxcode ='" + deviceInfo.BigBoxNo + "' where pa_outboxcode='" + iBox + "'", "update");
             if (returnstr.Length > 1000)