添加电源适配器条码上传

UAS_MES_HYSX/FunctionCode/Make/Make_FeedingCollection.cs

@@ -206,7 +206,7 @@ namespace UAS_MES_NEW.Make
                     {
                         if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
                         {
-                           
+
                             sql.Clear();
                             sql.Append("select ms_firstsn,cm_makecode,cm_craftcode,nvl(cm_status,0)cm_status,cm_id,cm_stepcode,");
                             sql.Append("ms_makecode,cm_mccode,cm_materialtype from craftmaterial left join makeserial on cm_makecode");
@@ -264,7 +264,7 @@ namespace UAS_MES_NEW.Make
             //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
             //    return;
             //}
-            dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + code.Text + "' or ms_sncode='"+code.Text+"' order by ms_id desc", "select");
+            dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + code.Text + "' or ms_sncode='" + code.Text + "' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 code.Text = dt.Rows[0]["ms_sncode"].ToString();
@@ -509,6 +509,7 @@ namespace UAS_MES_NEW.Make
                 if (LogicHandler.SetStepResult(ma_code, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                 {
                     //提示正确返回时传递的信息
+                    HttpServer.SendPowerCode(sn_code.Text);
                     if (ErrorMessage.Contains("AFTERSUCCESS"))
                         OperateResult.AppendText(">>" + ErrorMessage + "\n");
                     sn_code.Text = "";

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -398,7 +398,7 @@ namespace UAS_MES_NEW.PublicMethod
                 expandoDict[enNoKey] = enNoValue;
                 makecode = dt.Rows[i]["pd_makecode"].ToString();
                 po = dt.Rows[i]["po_sn"].ToString();
-                notype= dt.Rows[i]["NOTYPE"].ToString();
+                notype = dt.Rows[i]["NOTYPE"].ToString();
             }
             obj.request = "Q_wai_xiang";
             obj.packing_num = dt.Rows.Count;
@@ -446,7 +446,7 @@ namespace UAS_MES_NEW.PublicMethod
         //获取栈板信息
         public static void GetPalletInfo(string iBox)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select po_sn,sc_linecode,ma_custpo,pa_zxcode,pa_outboxcode,pa_makecode from package left join source on pa_sccode=sc_code left join make on pa_makecode=ma_code left join ZTE_ORDER on ma_custpo=BATCH_NO  where  pa_mothercode='" + iBox + "' and RESERVE9='"+User.UserLineCode+"'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select po_sn,sc_linecode,ma_custpo,pa_zxcode,pa_outboxcode,pa_makecode from package left join source on pa_sccode=sc_code left join make on pa_makecode=ma_code left join ZTE_ORDER on ma_custpo=BATCH_NO  where  pa_mothercode='" + iBox + "' and RESERVE9='" + User.UserLineCode + "'", "select");
             dynamic obj = new ExpandoObject();
             var expandoDict = obj as IDictionary<string, object>;
             string po = "";
@@ -484,10 +484,54 @@ namespace UAS_MES_NEW.PublicMethod
             JObject deviceObj = JObject.Parse(returnstr);
             string pallet_no = deviceObj["pallet_no"].ToString();
             string palltecode = deviceObj["pallet_no"].ToString();
-            dh.ExecuteSql("update package set pa_zxcode ='" + palltecode + "',pa_detno='"+ pallet_no + "' where pa_outboxcode='" + iBox + "'", "update");
+            dh.ExecuteSql("update package set pa_zxcode ='" + palltecode + "',pa_detno='" + pallet_no + "' where pa_outboxcode='" + iBox + "'", "update");
             dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GetPalletInfo')", "insert");
         }
 
+        public static void SendPowerCode(string iSN)
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select cm_barcode,pr_detail from craftmaterial 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 = "";
+            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();
+                }
+                if (dt.Rows[i]["pr_detail"].ToString().Contains("摄像头"))
+                {
+                    SN = dt.Rows[i]["cm_barcode"].ToString();
+                }
+            }
+            obj.request = "bindSN";
+            obj.noType = dt.Rows.Count;
+            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,'GetPalletInfo')", "insert");
+
+            string returnstr = ToServerReq(json);
+            if (returnstr.Length > 1000)
+            {
+                returnstr = returnstr.Substring(0, 1000);
+            }
+        }
+
+
+
+
         //发送外箱号数据，打印前获取
         public static async void SendBoxData(string iBox)
         {