Sic-Software
/
Sic05
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

修复执行Recipe时报StepUid命令执行错误的问题。 

修正打安装包时未清理SicRT\Logs文件夹的问题。
版本号更新至1.0.5.15
This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2023-02-15 12:30:50 +08:00
parent 15275be672
commit 1fcc1fc1d4
9 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/SicPM1/RecipeExecutions/PreProcess.cs
View File

@ -354,12 +354,12 @@ namespace SicPM1.RecipeExecutions
if (IsCmdSkip(recipeCmd))
continue;
// if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[0].RecipeCommands[recipeCmd]))
// {
// Stop($"Can not execute {recipeCmd}, {reason}");
// return false;
// }
// else
if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[0].RecipeCommands[recipeCmd]))
{
Stop($"Can not execute {recipeCmd}, {reason}");
return false;
}
else
{
int time = delayTime * 1000;
if (recipeCmd.StartsWith("TC1") && _isPSUHeaterJumpMode)

12
Modules/SicPM1/RecipeExecutions/Process.cs
View File

@ -376,12 +376,12 @@ namespace SicPM1.RecipeExecutions
if (IsCmdSkip(recipeCmd)) // 不是注册的方法，需要跳过
continue;
//if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].RecipeCommands[recipeCmd]))
//{
// EV.PostAlarmLog(Module, $"Can not execute {recipeCmd}, {reason}");
// return Result.FAIL;
//}
//else
if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].RecipeCommands[recipeCmd]))
{
EV.PostAlarmLog(Module, $"Can not execute {recipeCmd}, {reason}");
return Result.FAIL;
}
else
{
int time = (int)(PmDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].StepTime * 1000 - _curStepElpasedTimeBeforePaused);// (int)PMDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].StepTime * 1000;

12
Modules/SicPM2/RecipeExecutions/PreProcess.cs
View File

@ -355,12 +355,12 @@ namespace SicPM2.RecipeExecutions
if (IsCmdSkip(recipeCmd))
continue;
// if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[0].RecipeCommands[recipeCmd]))
// {
// Stop($"Can not execute {recipeCmd}, {reason}");
// return false;
// }
// else
if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[0].RecipeCommands[recipeCmd]))
{
Stop($"Can not execute {recipeCmd}, {reason}");
return false;
}
else
{
int time = delayTime * 1000;
if (recipeCmd.StartsWith("TC1") && _isPSUHeaterJumpMode)

12
Modules/SicPM2/RecipeExecutions/Process.cs
View File

@ -372,12 +372,12 @@ namespace SicPM2.RecipeExecutions
if (IsCmdSkip(recipeCmd)) // 不是注册的方法，需要跳过
continue;
// if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].RecipeCommands[recipeCmd]))
// {
// EV.PostAlarmLog(Module, $"Can not execute {recipeCmd}, {reason}");
// return Result.FAIL;
// }
// else
if (!OP.CanDoOperation($"{Module}.{recipeCmd}", out reason, PmDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].RecipeCommands[recipeCmd]))
{
EV.PostAlarmLog(Module, $"Can not execute {recipeCmd}, {reason}");
return Result.FAIL;
}
else
{
int time = (int)(PmDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].StepTime * 1000 - _curStepElpasedTimeBeforePaused);// (int)PMDevice.RecipeRunningInfo.RecipeStepList[_currentStepNumber].StepTime * 1000;

2
Modules/SicPM2/Routines/PMBaseRoutine.cs
View File

@ -1982,7 +1982,7 @@ namespace SicPM2.Routines
protected bool IsCmdSkip(string cmd)
{
if (cmd == "SiSourTotalFlow" || cmd == "CSourTotalFlow" || cmd == "DopeTotalFlow" || cmd == "TotalVentFlow")
if (cmd == "StepUid" || cmd == "SiSourTotalFlow" || cmd == "CSourTotalFlow" || cmd == "DopeTotalFlow" || cmd == "TotalVentFlow")
return true;
return false;

4
SicRT/Properties/AssemblyInfo.cs
View File

@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.0.5.14")]
[assembly: AssemblyFileVersion("1.0.5.14")]
[assembly: AssemblyVersion("1.0.5.15")]
[assembly: AssemblyFileVersion("1.0.5.15")]

11
SicRT/ReleaseNotes.md
View File

@ -1,6 +1,17 @@

# Sic 系统更新历史记录
## Version 1.0.5.15
**2023-02-14**
- Bug修复
- 修复执行Recipe时报StepUid命令执行错误的问题。
- 新特性
- 无
## Version 1.0.5.14
**2023-02-14**

2
SicSetup/Sic_Setup/Sic_Setup.csproj
View File

@ -571,7 +571,7 @@ del "$(ProjectDir)..\Packages\SicRT\*.pdb"
if exist "$(ProjectDir)..\Packages\SicRT\Config\Account\_Account.xml" del "$(ProjectDir)..\Packages\SicRT\Config\Account\_Account.xml"
if exist "$(ProjectDir)..\Packages\SicRT\Objects" del "$(ProjectDir)..\Packages\SicRT\Objects\*.obj"
if exist "$(ProjectDir)..\SicRT\Logs" rd "$(ProjectDir)..\Packages\SicRT\Logs" /s /q
if exist "$(ProjectDir)..\Packages\SicRT\Logs" rd "$(ProjectDir)..\Packages\SicRT\Logs" /s /q
if exist "$(ProjectDir)..\Packages\SicRT\Recipes" rd "$(ProjectDir)..\Packages\SicRT\Recipes" /s /q</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>

4
SicUI/Properties/AssemblyInfo.cs
View File

@ -54,6 +54,6 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.5.14")]
[assembly: AssemblyFileVersion("1.0.5.14")]
[assembly: AssemblyVersion("1.0.5.15")]
[assembly: AssemblyFileVersion("1.0.5.15")]