上传星云，标签核对修改

UAS_MES_HYSX/FunctionCode/Make/Make_ImeiCheck_ThreeLabel.cs

@@ -90,6 +90,11 @@ namespace UAS_MES_NEW.Make
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     BaseUtil.SetFormValue(Controls, dt);
                 }
+                //else
+                //{
+                //    OperateResult.AppendText("<<" + oErrorMessage + "\n", Color.Red, sncode);
+                //    return;
+                //}
                 //输入的是SN
                 if (!isImei1 && !isImei2)
                 {

UAS_MES_HYSX/FunctionCode/Make/Make_TestCollection.cs

@@ -51,8 +51,6 @@ namespace UAS_MES_NEW.Make
 
         LabelFormatDocument format;
 
-        Engine engine;
-
         bool EnablePrint;
 
         public Make_TestCollection()
@@ -89,9 +87,6 @@ namespace UAS_MES_NEW.Make
                 OperateResult.AppendText("已安装BarTender\n");
                 try
                 {
-                    engine = new Engine();
-                    engine.Start();
-                    format = engine.Documents.Open(Application.StartupPath + "/BadCode.btw");
                     EnablePrint = true;
                 }
                 catch (Exception)

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -490,12 +490,13 @@ namespace UAS_MES_NEW.PublicMethod
 
         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");
+            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("电源"))
@@ -506,13 +507,11 @@ namespace UAS_MES_NEW.PublicMethod
                 {
                     part_ar = dt.Rows[i]["cm_barcode"].ToString();
                 }
-                if (dt.Rows[i]["pr_detail"].ToString().Contains("摄像头"))
-                {
-                    SN = dt.Rows[i]["cm_barcode"].ToString();
-                }
+                SN = dt.Rows[i]["ms_code"].ToString();
+                notype = dt.Rows[i]["notype"].ToString();
             }
             obj.request = "bindSN";
-            obj.noType = dt.Rows.Count;
+            obj.noType = notype;
             obj.User = "test";
             obj.password = "123456";
             obj.tool_name = "zte";
@@ -520,7 +519,7 @@ namespace UAS_MES_NEW.PublicMethod
             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");
+            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)
@@ -529,30 +528,30 @@ namespace UAS_MES_NEW.PublicMethod
             }
         }
 
-
-
-
         //发送外箱号数据，打印前获取
         public static async 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_code,pr_custmachinetype,ms_makecode from makeserial left join product on ms_prodcode=pr_code where ms_outboxcode ='" + iBox + "' order by ms_id desc", "select");
-            string pr_custmachinetype = "";
-            string makecode = "";
+            string sn = dh.getFieldDataByCondition("packagedetail left join ztedata on pd_barcode=ZD_DEV_EN_NO and pd_makecode=zd_makecode ", "replace(wm_concat(replace(ZD_MAC_START,'-','')),',','-')", "pd_outboxcode='" + iBox + "' and zd_type='BOX'").ToString();
+            DataTable dt = (DataTable)dh.ExecuteSql("select ZD_BIG_BOX_NO,pr_code,PRODUCT_MODE,ms_makecode,po_sn 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 left join ztedata on ZD_DEV_EN_NO=ms_sncode and zd_makecode=ms_makecode where ms_outboxcode ='" + iBox + "' and zd_type='BOX' order by ms_id desc", "select");
+            string PRODUCT_MODE = "";
+            string po_sn = "";
             string pr_code = "";
+            string ZD_BIG_BOX_NO = "";
             if (dt.Rows.Count > 0)
             {
-                pr_custmachinetype = dt.Rows[0]["pr_custmachinetype"].ToString();
-                makecode = dt.Rows[0]["ms_makecode"].ToString();
+                PRODUCT_MODE = dt.Rows[0]["PRODUCT_MODE"].ToString();
+                po_sn = dt.Rows[0]["po_sn"].ToString();
                 pr_code = dt.Rows[0]["pr_code"].ToString();
+                ZD_BIG_BOX_NO = dt.Rows[0]["ZD_BIG_BOX_NO"].ToString();
+
             }
             var root = new RootObject
             {
                 ProductModuleType = "整机",
                 ProductMainClass = "固网_CPE",
                 ProductMediumClass = "CPE",
-                ProductSubClass = pr_custmachinetype,
-                Task = makecode,
+                ProductSubClass = PRODUCT_MODE,
+                Task = po_sn,
                 ProcessType = "生产过程",
                 UserId = User.UserName,
                 BindList = new List<BindItem>()
@@ -560,13 +559,13 @@ namespace UAS_MES_NEW.PublicMethod
             root.BindList.Add(new BindItem
             {
                 BindKey = "cartonSn",
-                BindValue = iBox,
+                BindValue = ZD_BIG_BOX_NO,
                 KeyType = "macbox",
                 KeyValue = sn,
                 HashType = "SHA256",
                 HashKey = ComputeSha256Hash(sn)
             });
-            dt = (DataTable)dh.ExecuteSql("select pd_barcode from packagedetail where pd_outboxcode='" + iBox + "'", "select");
+            dt = (DataTable)dh.ExecuteSql("select pd_barcode,replace(ZD_MAC_START,'-','')ZD_MAC_START from packagedetail left join ztedata on pd_barcode=ZD_DEV_EN_NO and pd_makecode=zd_makecode where pd_outboxcode='" + iBox + "' and zd_type='BOX'", "select");
             DataTable dt1 = (DataTable)dh.ExecuteSql("select pid_sql,pid_item,pid_value,pid_valuetype from productitem left join productitemdetail on pid_piid=pi_id where pi_prodcode='" + pr_code + "'", "select");
             for (int i = 0; i < dt.Rows.Count; i++)
             {
@@ -577,7 +576,7 @@ namespace UAS_MES_NEW.PublicMethod
                         root.BindList.Add(new BindItem
                         {
                             BindKey = "mac",
-                            BindValue = dt.Rows[i]["pd_barcode"].ToString(),
+                            BindValue = dt.Rows[i]["ZD_MAC_START"].ToString(),
                             KeyType = dt1.Rows[j]["pid_item"].ToString(),
                             KeyValue = dt1.Rows[j]["pid_item"].ToString(),
                             HashType = "SHA256",
@@ -609,11 +608,11 @@ namespace UAS_MES_NEW.PublicMethod
                         root.BindList.Add(new BindItem
                         {
                             BindKey = "mac",
-                            BindValue = dt.Rows[i]["pd_barcode"].ToString(),
+                            BindValue = dt.Rows[i]["ZD_MAC_START"].ToString(),
                             KeyType = dt1.Rows[j]["pid_item"].ToString(),
                             KeyValue = value,
                             HashType = "NON-HASH",
-                            HashKey = dt1.Rows[j]["pid_item"].ToString(),
+                            HashKey = value,
                         });
                     }
                 }
@@ -631,11 +630,12 @@ namespace UAS_MES_NEW.PublicMethod
                 StringBuilder sbText = new StringBuilder();
                 string json = JsonConvert.SerializeObject(root, Formatting.Indented);
                 var content = new StringContent(json, Encoding.UTF8, "application/json");
+                await Console.Out.WriteLineAsync(json);
 
                 var response = await client.PostAsync("https://172.30.30.10:29001/api/mds-web-outservice/v1/api/rest/mds/saveFmKeyHashcodeInfoBatch", content);
                 if (response.IsSuccessStatusCode)
                 {
-
+                    dh.ExecuteSql("update packagedetail set pd_issuccess=-1 where pd_outboxcode='" + iBox + "'", "update");
                 }
                 else
                 {

UAS_MES_HYSX/PublicMethod/Print.cs

@@ -583,7 +583,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 for (int k = 0; k < doc2.NamedSubStrings.Count; k++)
                 {
-                    doc2.SetNamedSubStringValue(doc2.NamedSubStrings.Item(k+1).Name, "");
+                    doc2.SetNamedSubStringValue(doc2.NamedSubStrings.Item(k + 1).Name, "");
                 }
             }
             catch (Exception ex)