调整接口参数

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -10,6 +10,7 @@ using DevExpress.XtraSpellChecker;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
 
 namespace UAS_MES_NEW.PublicMethod
 {
@@ -110,18 +111,70 @@ namespace UAS_MES_NEW.PublicMethod
             }
         }
 
+        //获取SN的EN号，彩盒标机身标一个工站一起打印，需要SN单个获取
+        public static void GetEN(string iSN)
+        {
+            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();
+
+            obj.tool_name = "zte";
+            obj.request = "Storage2";
+            obj.User = "mes";
+            obj.password = "258456";
+            obj.po_sn = iSN;
+            obj.wholeDeviceCode = "";
+            obj.reg_code = regcode;
+            obj.prefix_en_no = prefix;
+            obj.prefix_big_box = "";
+            obj.packing_num = "";
+            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);
+        }
+
+        //发送外箱号数据，打印前获取
         public static void SendBoxData(string iBox)
         {
             string sn = dh.getFieldDataByCondition("packagedetail", "replace(wm_concat(pd_barcode),',','-')", "pd_outboxcode='" + iBox + "'").ToString();
+            DataTable dt = (DataTable)dh.ExecuteSql("select pr_custmachinetype from makeserial left join product on ms_prodcode=pr_code where ms_outboxcode ='" + iBox + "' order by ms_id desc", "select");
+            string pr_custmachinetype = "";
+            if (dt.Rows.Count > 0)
+            {
+                pr_custmachinetype = dt.Rows[0]["pr_custmachinetype"].ToString();
+            }
             var root = new RootObject
             {
                 ProductModuleType = "整机",
                 ProductMainClass = "固网_CPE",
                 ProductMediumClass = "CPE",
-                ProductSubClass = "ZXSLC SC50L",
+                ProductSubClass = pr_custmachinetype,
                 Task = "2025070006",
                 ProcessType = "生产过程",
-                UserId = "邓帝森",
+                UserId = User.UserName,
                 BindList = new List<BindItem>()
             };
             root.BindList.Add(new BindItem
@@ -133,7 +186,7 @@ namespace UAS_MES_NEW.PublicMethod
                 HashType = "SHA256",
                 HashKey = ComputeSha256Hash(sn)
             });
-            DataTable dt = (DataTable)dh.ExecuteSql("select pd_barcode from packagedetail pd_outboxcode='" + iBox + "'", "select");
+            dt = (DataTable)dh.ExecuteSql("select pd_barcode from packagedetail pd_outboxcode='" + iBox + "'", "select");
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 root.BindList.Add(new BindItem
@@ -169,51 +222,6 @@ namespace UAS_MES_NEW.PublicMethod
             Console.WriteLine(json);
         }
 
-        //获取SN的EN号，彩盒标机身标一个工站一起打印，需要SN单个获取
-        public static void GetEN(string iSN)
-        {
-            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();
-
-            obj.tool_name = "zte";
-            obj.request = "Storage2";
-            obj.User = "mes";
-            obj.password = "258456";
-            obj.po_sn = iSN;
-            obj.wholeDeviceCode = "";
-            obj.reg_code = regcode;
-            obj.prefix_en_no = prefix;
-            obj.prefix_big_box = "";
-            obj.packing_num = "";
-            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);
-        }
-
         //获取外箱号信息
         public static void GetOutBoxInfo(string iBox)
         {
@@ -273,6 +281,7 @@ namespace UAS_MES_NEW.PublicMethod
             string returnstr = SendData(json);
             Console.WriteLine(json);
         }
+
         //发送数据
         public static string SendData(string json)
         {