Compare commits

..

No commits in common. '2649703dbdefa9e9c4772267723202d59500af4a' and 'd267f84c1a5b0ebe50e02837e1053a384ef7113f' have entirely different histories.

@ -249,7 +249,6 @@ namespace MaterialTraceability.Business
lock (string.Empty)
{
//写入心跳
plcInstance.writeInt32ByAddress("D9828", 1);
plcInstance.writeInt32ByAddress(appConfig.TbAddress., 1);
LogHelper.PlcLog("RFID系统写入心跳D9628");
Thread.Sleep(200);

@ -692,8 +692,8 @@ namespace MaterialTraceabilityUI
operationRevision = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "operationRevision"),
resource = appConfig.resource,
user = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "user"),
activity = "",
modeProcessSfc = "MODE_START_SFC",
activity = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "activity"),
modeProcessSfc = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "modeProcessSfc"),
};
DateTime beginTime = DateTime.Now;
try
@ -922,8 +922,8 @@ namespace MaterialTraceabilityUI
operationRevision = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "operationRevision"),
resource = appConfig.resource,
user = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "user"),
activity = "",
modeProcessSfc = "MODE_START_SFC",
activity = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "activity"),
modeProcessSfc = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "modeProcessSfc"),
};
DateTime beginTime = DateTime.Now;
try

@ -527,8 +527,8 @@ namespace MaterialTraceabilityUI
operationRevision = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "operationRevision"),
resource = appConfig.resource,
user = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "user"),
activity = "",
modeProcessSfc = "MODE_START_SFC",
activity = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "activity"),
modeProcessSfc = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "modeProcessSfc"),
};
try
{
@ -576,8 +576,8 @@ namespace MaterialTraceabilityUI
operationRevision = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "operationRevision"),
resource = appConfig.resource,
user = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "user"),
activity = "",
modeProcessSfc = "MODE_START_SFC",
activity = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "activity"),
modeProcessSfc = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "modeProcessSfc"),
};
try
{
@ -777,8 +777,8 @@ namespace MaterialTraceabilityUI
operationRevision = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "operationRevision"),
resource = appConfig.resource,
user = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "user"),
activity = "",
modeProcessSfc = "MODE_START_SFC",
activity = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "activity"),
modeProcessSfc = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "modeProcessSfc"),
};
DateTime beginTime = DateTime.Now;
try
@ -825,8 +825,8 @@ namespace MaterialTraceabilityUI
operationRevision = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "operationRevision"),
resource = appConfig.resource,
user = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "user"),
activity = "",
modeProcessSfc = "MODE_START_SFC",
activity = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "activity"),
modeProcessSfc = inifile.IniReadValue("MiFirstOperationForsfcServiceServiceParam", "modeProcessSfc"),
};
DateTime beginTime = DateTime.Now;
try

Loading…
Cancel
Save