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

修正所有项目对Common.dll的引用，现在均从ThirdParty/dll/引用。 

修正PM跑Process时无法加载Recipe的问题。
修正RIP后Recipe总时间未更新的问题。
修正跑工艺时StepUid会被当作工艺参数执行，从而引发异常的问题。
修正DeviceLocker被Reset后，未清空占用者名单的问题。
This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2022-12-05 18:11:01 +08:00
parent 0d2a9b25db
commit 4b111e734d
15 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
FrameworkLocal/MECF.Framework.Common.dll
View File

Binary file not shown.

5
FrameworkLocal/RTCore/RTCore.csproj
View File

@ -41,8 +41,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\log4net.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />

5
FrameworkLocal/RTEquipmentLibrary/RTEquipmentLibrary.csproj
View File

@ -38,8 +38,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="MECF.Framework.Common">
<HintPath>..\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

7
FrameworkLocal/SimulatorCore/SimulatorCore.csproj
View File

@ -35,8 +35,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\log4net.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -572,7 +573,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties robots_4hiratar4_4iosimulatoritems_1json__JsonSchema="https://jenkins-x.io/schemas/jx-schema.json" vce_4brooksvce_4iosimulatoritems_1json__JsonSchema="http://json.schemastore.org/apibuilder.json" />
<UserProperties vce_4brooksvce_4iosimulatoritems_1json__JsonSchema="http://json.schemastore.org/apibuilder.json" robots_4hiratar4_4iosimulatoritems_1json__JsonSchema="https://jenkins-x.io/schemas/jx-schema.json" />
</VisualStudio>
</ProjectExtensions>
</Project>

5
FrameworkLocal/UIClient/UIClient.csproj
View File

@ -48,8 +48,9 @@
<Reference Include="MaterialDesignThemes.Wpf">
<HintPath>..\..\ThirdParty\dlls\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.DwayneNeed">
<HintPath>..\..\ThirdParty\dlls\Microsoft.DwayneNeed.dll</HintPath>

5
FrameworkLocal/UICore/UICore.csproj
View File

@ -38,8 +38,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\log4net.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

5
Modules/Mainframe/Mainframe.csproj
View File

@ -40,8 +40,9 @@
<Reference Include="InfoHelp">
<HintPath>..\..\ThirdParty\dlls\InfoHelp.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\..\FrameworkLocal\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="SessionLayer">
<HintPath>..\..\ThirdParty\dlls\SessionLayer.dll</HintPath>

1
Modules/SicPM/RecipeExecutions/Process.cs
View File

@ -451,6 +451,7 @@ namespace SicPM.RecipeExecutions
if (RecipeParser.ParseXmlString(PMDevice.RecipeRunningInfo.XmlRecipeToReload, Module, out var recipeHead, out var recipeSteps, out var reason1))
{
PMDevice.RecipeRunningInfo.RecipeStepList = recipeSteps;
PMDevice.RecipeRunningInfo.TotalTime = CalcRecipeTime();
PMDevice.RecipeRunningInfo.NeedReloadRecipe = false;
}
else

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

@ -1952,7 +1952,7 @@ namespace SicPM.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;

5
Modules/SicPM/SicPM.csproj
View File

@ -32,8 +32,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MECF.Framework.Common">
<HintPath>..\..\FrameworkLocal\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

5
SicRT/SicRT.csproj
View File

@ -67,8 +67,9 @@
<Reference Include="log4net">
<HintPath>..\ThirdParty\dlls\log4net.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\FrameworkLocal\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.FA.Core, Version=1.0.7645.40880, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

5
SicSimulator/SicSimulator.csproj
View File

@ -42,8 +42,9 @@
<Reference Include="log4net">
<HintPath>..\ThirdParty\dlls\log4net.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\FrameworkLocal\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework.Aero" />
<Reference Include="System" />

5
SicUI/SicUI.csproj
View File

@ -70,8 +70,9 @@
<Reference Include="MaterialDesignThemes.Wpf">
<HintPath>..\ThirdParty\dlls\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="MECF.Framework.Common">
<HintPath>..\FrameworkLocal\MECF.Framework.Common.dll</HintPath>
<Reference Include="MECF.Framework.Common, Version=1.0.8370.30527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ThirdParty\dlls\MECF.Framework.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.DwayneNeed">
<HintPath>..\ThirdParty\dlls\Microsoft.DwayneNeed.dll</HintPath>

1
Sicentury.Core/DeviceLocker.cs
View File

@ -169,6 +169,7 @@ namespace Sicentury.Core
_cts?.Cancel();
Thread.Sleep(100); // 等待 Semaphore Cancel
_semResource = new SemaphoreSlim(_maxRes, _maxRes);
_occupiersCollection.Clear();
}
}

BIN
ThirdParty/dlls/MECF.Framework.Common.dll vendored
View File

Binary file not shown.