修改HTTP上传

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -629,7 +629,44 @@ namespace UAS_MES_NEW.PublicMethod
         public static void SendPowerCode(string iSN)
         {
             // 同步版本可以直接调用异步方法并等待
-            SendPowerCodeAsync(iSN);
+            DataTable dt = (DataTable)dh.ExecuteSql("select NOTYPE,cm_barcode,pr_detail,ms_code from craftmaterial left join makeserial on ms_sncode=cm_sncode and ms_makecode=cm_makecode left join make on ma_code=cm_makecode left join ZTE_ORDER on ma_custpo=batch_no left join product on cm_fsoncode=pr_code where cm_sncode='" + iSN + "' and cm_status=0", "select");
+            dynamic obj = new ExpandoObject();
+            var expandoDict = obj as IDictionary<string, object>;
+            string part_sn = "";
+            string part_ar = "";
+            string SN = "";
+            string notype = "";
+            for (int i = 0; i < dt.Rows.Count; i++)
+            {
+                if (dt.Rows[i]["pr_detail"].ToString().Contains("电源"))
+                {
+                    part_sn = dt.Rows[i]["cm_barcode"].ToString();
+                }
+                if (dt.Rows[i]["pr_detail"].ToString().Contains("报警器"))
+                {
+                    part_ar = dt.Rows[i]["cm_barcode"].ToString();
+                }
+                SN = dt.Rows[i]["ms_code"].ToString();
+                notype = dt.Rows[i]["notype"].ToString();
+            }
+            obj.request = "bindSN";
+            obj.noType = notype;
+            obj.User = "test";
+            obj.password = "123456";
+            obj.tool_name = "zte";
+            obj.part_sn = part_sn;
+            obj.part_ar = part_ar;
+            obj.SN = SN;
+            string json = JsonConvert.SerializeObject(obj, Formatting.Indented);
+            dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + json + "',sysdate,'SendPowerCode')", "insert");
+
+            string returnstr = ToServerReq(json);
+            if (returnstr.Length > 1000)
+            {
+                returnstr = returnstr.Substring(0, 1000);
+            }
+            dh.ExecuteSql("update craftmaterial set cm_ifupload=-1 where cm_sncode='" + iSN + "'", "update");
+            dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'SendPowerCode')", "insert");
         }
 
         public static async Task SendPowerCodeAsync(string iSN)
@@ -687,8 +724,9 @@ namespace UAS_MES_NEW.PublicMethod
                     dh.ExecuteSql(
                         "insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE) " +
                         "values(EISDATA_seq.nextval,'" + json.Replace("'", "''") + "',sysdate,'SendPowerCode')",
-                        "insert"));
-
+                        "insert")
+                    ) ;
+                dh.ExecuteSql("update craftmaterial set cm_ifupload=-1 where cm_sncode='" + iSN + "'", "update");
                 // 异步发送请求（假设ToServerReq可以被异步化）
                 string returnstr = await ToServerReqAsync(json); // 需要实现异步版本
 
@@ -926,7 +964,7 @@ namespace UAS_MES_NEW.PublicMethod
 
         public static string GetCaiHe_Thailand(string iSN)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=batch_no where ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' and RESERVE9='" + User.UserLineCode + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=batch_no where ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "'  order by ms_id desc", "select");
             string po = "";
             string makecode = "";
             string ms_id = "";
@@ -971,7 +1009,7 @@ namespace UAS_MES_NEW.PublicMethod
         }
         public static string GetMingPai_Thailand(string iSN)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=batch_no where RESERVE9='" + User.UserLineCode + "' and ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=batch_no where  ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' order by ms_id desc", "select");
             string po = "";
             string makecode = "";
             string ms_id = "";
@@ -1027,7 +1065,7 @@ namespace UAS_MES_NEW.PublicMethod
         {
             dynamic obj = new ExpandoObject();
             var expandoDict = obj as IDictionary<string, object>;
-            DataTable dt = (DataTable)dh.ExecuteSql("select nvl(PACKING_NUM,0)PACKING_NUM,nvl(notype,0)notype,ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=ZD_DEV_EN_NO left join make on ma_code=pd_makecode left join zte_order on batch_no=ma_custpo  where RESERVE9='" + User.UserLineCode + "' and pd_outboxcode='" + iBox + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select nvl(PACKING_NUM,0)PACKING_NUM,nvl(notype,0)notype,ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=ZD_DEV_EN_NO left join make on ma_code=pd_makecode left join zte_order on batch_no=ma_custpo  where  pd_outboxcode='" + iBox + "'", "select");
             string makecode = "";
             string po = "";
             int notype = 0;