浏览代码

将墨西哥NTF和IDM的配置分开,不合并;同时,只根据墨西哥账号启动该机制。

JeffWang 2 年之前
父节点
当前提交
39de73dcce

+ 6 - 2
FactoryTool_CShare/Models/StructList.cs

@@ -249,9 +249,13 @@ namespace MOKA_Factory_Tools
         // 当SN连接2次抄写时提示,主要防止一个SN被扫描在2台机器上;
         // 当SN连接2次抄写时提示,主要防止一个SN被扫描在2台机器上;
         public bool SNDoubleTips { get; set; } = false;
         public bool SNDoubleTips { get; set; } = false;
         /// <summary>
         /// <summary>
-        /// 是否使用墨西哥;
+        /// 是否使用墨西哥NTF功能;
         /// </summary>
         /// </summary>
-        public bool Mexican { get; set; }  = false;
+        public bool Mexican_NTF { get; set; } = false;
+        /// <summary>
+        /// 是否启用墨西哥IDM局域网接口;
+        /// </summary>
+        public bool Mexican_IDM { get; set; } = false;
     }
     }
 
 
     public enum KEY_FROM
     public enum KEY_FROM

+ 16 - 6
FactoryTool_CShare/Views/Main.cs

@@ -714,12 +714,22 @@ namespace MOKA_Factory_Tools
                 functionSetting1.SNDoubleTips = jObject["SNDoubleTips"] == null ? false : jObject["SNDoubleTips"].Value<bool>();
                 functionSetting1.SNDoubleTips = jObject["SNDoubleTips"] == null ? false : jObject["SNDoubleTips"].Value<bool>();
 
 
                 #region 是否启用墨西哥抄写
                 #region 是否启用墨西哥抄写
-                if (jObject["Mexican"] == null)
-                    SaveJsonConfig("Mexican", functionSetting1.Mexican);
-                else
-                    functionSetting1.Mexican = jObject["Mexican"].Value<bool>();
-                GMethod.SetMexicanConfig(functionSetting1.Mexican);
-                V2Method.SetMexicanConfig(functionSetting1.Mexican);
+                if (CommonMethod.GetLoginAccout().Equals("Mexico", StringComparison.OrdinalIgnoreCase) )
+                {
+                    // NTF;
+                    if (jObject["Mexican_NTF"] == null)
+                        SaveJsonConfig("Mexican_NTF", functionSetting1.Mexican_NTF);
+                    else
+                        functionSetting1.Mexican_NTF = jObject["Mexican_NTF"].Value<bool>();
+                    GMethod.SetMexicanConfig(functionSetting1.Mexican_NTF);
+
+                    // IDM;
+                    if (jObject["Mexican_IDM"] == null)
+                        SaveJsonConfig("Mexican_IDM", functionSetting1.Mexican_IDM);
+                    else
+                        functionSetting1.Mexican_IDM = jObject["Mexican_IDM"].Value<bool>();
+                    V2Method.SetMexicanConfig(functionSetting1.Mexican_IDM);
+                }
                 #endregion
                 #endregion
 
 
                 // 导出日规acas与sn;
                 // 导出日规acas与sn;

+ 1 - 1
FactoryTool_CShare/Views/OperationPanel.cs

@@ -106,7 +106,7 @@ namespace MOKA_Factory_Tools
             if (midListNow.rokuCustomer != null)
             if (midListNow.rokuCustomer != null)
                 ProductMsg_Text.Text = "Roku:";
                 ProductMsg_Text.Text = "Roku:";
             if (functionSetting.NTF)
             if (functionSetting.NTF)
-                ntfBLL = new NTFBLL(functionSetting.Mexican);
+                ntfBLL = new NTFBLL(functionSetting.Mexican_NTF);
         }
         }
 
 
         /// <summary>
         /// <summary>