|
@@ -28,6 +28,8 @@ namespace MOKA_Factory_Tools
|
|
factorynum = ""
|
|
factorynum = ""
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+ public bool ExportSNACASID { get; set; } = false;
|
|
|
|
+
|
|
string ErrorDBPath = AppDomain.CurrentDomain.BaseDirectory + "\\Error.db";
|
|
string ErrorDBPath = AppDomain.CurrentDomain.BaseDirectory + "\\Error.db";
|
|
SQLiteConnection ErrorDB = null;
|
|
SQLiteConnection ErrorDB = null;
|
|
public login()
|
|
public login()
|
|
@@ -173,7 +175,7 @@ namespace MOKA_Factory_Tools
|
|
}
|
|
}
|
|
|
|
|
|
#region 三华MES登录数据
|
|
#region 三华MES登录数据
|
|
- if ( string.Equals(AccountText.Text,"sanhua", StringComparison.OrdinalIgnoreCase) )
|
|
|
|
|
|
+ if (ExportSNACASID)
|
|
{
|
|
{
|
|
SanhuaMES sanhuaMES = new SanhuaMES();
|
|
SanhuaMES sanhuaMES = new SanhuaMES();
|
|
if ( sanhuaMES.ShowDialog() != DialogResult.OK )
|
|
if ( sanhuaMES.ShowDialog() != DialogResult.OK )
|
|
@@ -256,6 +258,7 @@ namespace MOKA_Factory_Tools
|
|
{
|
|
{
|
|
JObject jObject = (JObject)JToken.ReadFrom(reader);
|
|
JObject jObject = (JObject)JToken.ReadFrom(reader);
|
|
reader.Close();
|
|
reader.Close();
|
|
|
|
+ ExportSNACASID = jObject["ExportSNACASID"] == null ? false : jObject["ExportSNACASID"].Value<bool>();
|
|
AccountText.Text = jObject["FactoryName"] == null ? (!CommonMethod.AddJsonConfig("FactoryName", null) ? "" : "") : jObject["FactoryName"].Value<string>();
|
|
AccountText.Text = jObject["FactoryName"] == null ? (!CommonMethod.AddJsonConfig("FactoryName", null) ? "" : "") : jObject["FactoryName"].Value<string>();
|
|
loginOutput1.factoryname = jObject["FactoryName"] == null ? "" : jObject["FactoryName"].Value<string>();
|
|
loginOutput1.factoryname = jObject["FactoryName"] == null ? "" : jObject["FactoryName"].Value<string>();
|
|
loginOutput1.factorynum=jObject["FactoryNum"] == null ? "" : jObject["FactoryNum"].Value<string>();
|
|
loginOutput1.factorynum=jObject["FactoryNum"] == null ? "" : jObject["FactoryNum"].Value<string>();
|