Browse Source

离线上报功能可以通过配置文件配置。

jianfeng1.wang 2 năm trước cách đây
mục cha
commit
d3bdf4fe0c

+ 0 - 2
FactoryTool_CShare/Business/V2Method.cs

@@ -19,8 +19,6 @@ namespace MOKA_Factory_Tools
 {
     internal class V2Method
     {
-        
-
         private static string url_getDSNFromSmes = "http://smes-app-prod.tclking.com:9006/api/xm/GetXMTVParts?TVSN=";
         public static MidList midList { get; set; }
 

+ 5 - 0
FactoryTool_CShare/Models/StructList.cs

@@ -296,6 +296,11 @@ namespace MOKA_Factory_Tools
         /// 是否启用波兰NTF功能
         /// </summary>
         public bool Poland_NTF { get; set; } = false;
+
+        /// <summary>
+        /// 预绑定下载时是否上报离线数据;
+        /// </summary>
+        public bool ReportOfflineData { get; set; } = true;
     }
 
     public enum KEY_FROM

+ 15 - 0
FactoryTool_CShare/Views/Main.cs

@@ -1035,6 +1035,17 @@ namespace MOKA_Factory_Tools
                 }
                 #endregion
 
+                #region 预绑定抄写是否上报离线数据;
+                if (jObject["ReportOfflineData"] != null)
+                {
+                    functionSetting1.ReportOfflineData = jObject["ReportOfflineData"].Value<bool>();
+                }
+                else
+                {
+                    SaveJsonConfig("ReportOfflineData", functionSetting1.ReportOfflineData);
+                }
+                #endregion
+
                 foreach (var ss in jObject["Channel"])  //遍历Channel
                 {
                     Dictionary<string, string> ChannelValues = JsonConvert.DeserializeObject<Dictionary<string, string>>(ss.ToString());
@@ -1945,6 +1956,10 @@ namespace MOKA_Factory_Tools
                     {
                         if (content.Contains("@"))
                         {
+                            // 不上报离线数据;
+                            if (!functionSetting1.ReportOfflineData)
+                                continue;
+
                             string[] data = content.Split('@');
                             if (V2Method.ReportOfflineData(url, data[1], data[0], LocalDB, ErrorDB, true, id))
                             {

+ 1 - 1
FactoryTool_CShare/Views/OperationPanel.cs

@@ -5129,7 +5129,7 @@ namespace MOKA_Factory_Tools
                     goto end;
                 }
                 //上传抄写状态
-                if (midListNow.host != "LocalPC")
+                if (midListNow.host != "LocalPC" && FunctionSettingNow.ReportOfflineData)
                     V2Method.ReportOfflineData(MidAddressNow.host, copydate, SN, localDBNow, errorDBNow, false, "");
             }
             else if (!CommonMethod.HTTPChecker(midListNow.host))