数据上传接口修改

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -8,6 +8,7 @@ using System.Security.Cryptography;
 using System.Text;
 using DevExpress.XtraSpellChecker;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using UAS_MES_NEW.DataOperate;
 
 namespace UAS_MES_NEW.PublicMethod
@@ -168,14 +169,18 @@ namespace UAS_MES_NEW.PublicMethod
             Console.WriteLine(json);
         }
 
-        //获取SN的EN号，需要SN单个获取
+        //获取SN的EN号，彩盒标机身标一个工站一起打印，需要SN单个获取
         public static void GetEN(string iSN)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select pr_prefix from makeserial left join product on ms_prodcode=pr_code where ms_sncode ='"+iSN+"' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,pr_prefix,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code where ms_sncode ='" + iSN + "' order by ms_id desc", "select");
             string prefix = "";
+            string regcode = "";
+            string makecode = "";
             if (dt.Rows.Count > 0)
             {
                 prefix = dt.Rows[0]["pr_prefix"].ToString();
+                regcode = dt.Rows[0]["pr_regcode"].ToString();
+                makecode = dt.Rows[0]["ms_makecode"].ToString();
             }
             dynamic obj = new ExpandoObject();
 
@@ -183,16 +188,29 @@ namespace UAS_MES_NEW.PublicMethod
             obj.request = "Storage2";
             obj.User = "mes";
             obj.password = "258456";
-            obj.po_sn = "";
+            obj.po_sn = iSN;
             obj.wholeDeviceCode = "";
-            obj.reg_code = "6400-6134-3346-8166";
-            obj.prefix_en_no = "4N6FH4T";
+            obj.reg_code = regcode;
+            obj.prefix_en_no = prefix;
             obj.prefix_big_box = "";
             obj.packing_num = "";
-            obj.isn = iSN;
+            obj.isn = prefix;
 
             string json = JsonConvert.SerializeObject(obj, Formatting.Indented);
             string returnstr = SendData(json);
+            JObject deviceObj = JObject.Parse(returnstr);
+            string WholeDeviceCode = deviceObj["WholeDeviceCode"].ToString();
+            string SN = deviceObj["SN"].ToString();
+            string dev_en_no = deviceObj["dev_en_no"].ToString();
+            string mac = deviceObj["mac"].ToString();
+            string mac_start = deviceObj["mac_start"].ToString();
+            string mac_end = deviceObj["mac_end"].ToString();
+            string reg_code = deviceObj["reg_code"].ToString();
+            string reserve3 = deviceObj["reserve3"].ToString();
+            string device_type = deviceObj["device_type"].ToString();
+            string en_no = deviceObj["en_no"].ToString();
+            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");
             Console.WriteLine(json);
         }