Przeglądaj źródła

修复预绑定抄写roku失败bug;修复上报错误日志的问题。

JeffWang 2 lat temu
rodzic
commit
8043f971c8

+ 3 - 3
FactoryTool_CShare/Business/V2Method.cs

@@ -56,7 +56,7 @@ namespace MOKA_Factory_Tools
 
                 if (jObject["data"] != null)
                 {
-                    rokuCustomer.rokuData = new List<RokuData>();
+                    rokuCustomer.data = new List<RokuData>();
                     foreach (var item in jObject["data"])
                     {
                         RokuData rokuData = new RokuData();
@@ -64,7 +64,7 @@ namespace MOKA_Factory_Tools
                         rokuData.supporturl = item["supporturl"].Value<string>();
                         rokuData.supportphone = item["supportphone"].Value<string>();
 
-                        rokuCustomer.rokuData.Add(rokuData);
+                        rokuCustomer.data.Add(rokuData);
                     }
                 }
 
@@ -662,7 +662,7 @@ namespace MOKA_Factory_Tools
                 if (!repeatupload)
                 {
                     if (CommonMethod.HTTPChecker(item.URL))
-                        SQLiteHelper.InsertDelayCopyReport(sqliteConn, new object[] { order, item.URL, item.Postdata });
+                        SQLiteHelper.InsertDelayCopyReport(sqliteConn, new object[] { order, url, item.Postdata });
                 }
                 CommonMethod.ReportErrormsg("Fail to ReportOnlineData", result.StatusDescription + result.Html + "\r\nAddress:" + url + "\r\nPostdata:" + item.Postdata, sqliteConn);
             }            

+ 1 - 1
FactoryTool_CShare/Models/StructList.cs

@@ -50,7 +50,7 @@ namespace MOKA_Factory_Tools
         public string updatetime { get; set; }
         public string createtime { get; set; }
         public string isdelete { get; set; }
-        public List<RokuData> rokuData { get; set; }
+        public List<RokuData> data { get; set; }
     }
 
     public class WhiteBalanceInput

+ 16 - 1
FactoryTool_CShare/Views/OperationPanel.cs

@@ -869,6 +869,21 @@ namespace MOKA_Factory_Tools
                 }
                 #endregion
 
+#if !SIMULATION
+                if (CommonMethod.GetLoginAccout().Equals("Sanhua", StringComparison.OrdinalIgnoreCase))
+                {
+                    string message = string.Empty;
+                    if ( !SanhuaMethod.ProductRouteCheck(SN, out message) )
+                    {
+                        Verify dlg = new Verify(string.Format("{0} ProductRouteCheck faild: {1} ", SN, message));
+                        dlg.ShowDialog();
+                        SNText.Enabled = true;
+                        SNText.Text = "";
+                        return;
+                    }
+                }
+#endif
+
                 if (preloadNow)
                 {
                     bool copydone = false;
@@ -6345,7 +6360,7 @@ namespace MOKA_Factory_Tools
                     midListNow.rokuCustomer.brand + "\r\nOEM Model:" +
                     midListNow.rokuCustomer.oemmodel + "\r\nDate:" + 
                     midListNow.rokuCustomer.productiondate + "\r\nRegion:" +
-                    JsonConvert.SerializeObject(midListNow.rokuCustomer.rokuData).ToString() + "\r\nData:" +
+                    JsonConvert.SerializeObject(midListNow.rokuCustomer.data).ToString() + "\r\nData:" +
                     midListNow.rokuCustomer.remotetype, LResource.ProductMsg);
             else
                 MessageBox.Show("null");