wenjy
/
SlnMesnac.MaterialTraceability
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wenjy:2649703dbdefa9e9c4772267723202d59500af4a
Branches Tags
wenjy:master
..
compare: wenjy:d267f84c1a5b0ebe50e02837e1053a384ef7113f
Branches Tags
wenjy:master

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

3 changed files with 12 additions and 13 deletions
Show Stats

1
MaterialTraceability.Business/PlcBusiness.cs
Unescape Escape View File

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

8
MaterialTraceabilityUI/CoatingProcess.xaml.cs
Unescape Escape View File

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

16
MaterialTraceabilityUI/TBAlarmRecord.xaml.cs
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save