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

1重命名解决方案名称 

2修改自动流程中先关问题
This commit is contained in:
hanqiangqiang 2024-07-10 14:25:53 +08:00
parent 74b1244f68
commit 3daf894b80
7 changed files with 89 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.985",
"PreReleaseTagWithDash": "-alpha.985",
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 985,
"WeightedPreReleaseNumber": 985,
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.985",
"LegacySemVer": "0.1.0-alpha985",
"LegacySemVerPadded": "0.1.0-alpha0985",
"AssemblySemVer": "0.1.0.985",
"AssemblySemFileVer": "0.1.0.985",
"FullSemVer": "0.1.0-alpha.985",
"InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "51047663040d0c6479a57f5cf0215ba967a88dba",
"ShortSha": "5104766",
"NuGetVersionV2": "0.1.0-alpha0985",
"NuGetVersion": "0.1.0-alpha0985",
"NuGetPreReleaseTagV2": "alpha0985",
"NuGetPreReleaseTag": "alpha0985",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 985,
"CommitsSinceVersionSourcePadded": "0985",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitDate": "2024-07-08"
"CommitDate": "2024-07-10"
}

0
SicAutoGE.sln → SicMultiplateGE.sln
View File

1
SicRT/Config/System.sccfg
View File

@ -34,6 +34,7 @@
<config default="15" name="WaitLoadTimeOut" description="Wait Load TimeOut" max="1000" min="1" paramter="" tag="" unit="s" type="Double" visible="false" />
<config default="2" name="WaferCountBelowWhichStartNewProcessJob" description="Wafer Count Below Which Start New Process Job" max="25" min="1" paramter="" tag="" unit="" type="Integer" visible="false" />
<config default="false" name="CassetteFromAToB" description="CassetteA取片做完工艺后回到另外一个Cassette" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="false" name="GroupWaferBySequence" description="按顺序分组晶片" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="true" name="IsRunInParallelMode" visible="false" description="并行模式,从CST取片时考虑两腔体效率" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
</configs>
<configs name="SetUp">

8
SicRT/Equipments/ManualAutoTransfer.cs
View File

@ -792,25 +792,25 @@ namespace SicRT.Modules
public void Abort()
{
var wafer = WaferManager.Instance.GetWafer(ModuleName.PM1, 0);
if (wafer != null)
if (wafer?.WaferID != null)
{
AutoJobRecorder.UpdatePosition(wafer.WaferID.ToString(), ModuleName.PM1.ToString(), "Abort");
}
var wafer1 = WaferManager.Instance.GetWafer(ModuleName.TMRobot, 0);
if (wafer1 != null)
if (wafer1?.WaferID != null)
{
AutoJobRecorder.UpdatePosition(wafer1.WaferID.ToString(), ModuleName.TM.ToString(), "Abort");
}
var wafer2 = WaferManager.Instance.GetWafer(ModuleName.Buffer, 0);
if (wafer2 != null)
if (wafer2?.WaferID != null)
{
AutoJobRecorder.UpdatePosition(wafer2.WaferID.ToString(), ModuleName.Buffer.ToString(), "Abort");
}
var wafer3 = WaferManager.Instance.GetWafer(ModuleName.LoadLock, 0);
if (wafer3 != null)
if (wafer3?.WaferID != null)
{
AutoJobRecorder.UpdatePosition(wafer3.WaferID.ToString(), ModuleName.LoadLock.ToString(), "Abort");
}

42
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.985",
"PreReleaseTagWithDash": "-alpha.985",
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 985,
"WeightedPreReleaseNumber": 985,
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.985",
"LegacySemVer": "0.1.0-alpha985",
"LegacySemVerPadded": "0.1.0-alpha0985",
"AssemblySemVer": "0.1.0.985",
"AssemblySemFileVer": "0.1.0.985",
"FullSemVer": "0.1.0-alpha.985",
"InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "51047663040d0c6479a57f5cf0215ba967a88dba",
"ShortSha": "5104766",
"NuGetVersionV2": "0.1.0-alpha0985",
"NuGetVersion": "0.1.0-alpha0985",
"NuGetPreReleaseTagV2": "alpha0985",
"NuGetPreReleaseTag": "alpha0985",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 985,
"CommitsSinceVersionSourcePadded": "0985",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitDate": "2024-07-08"
"CommitDate": "2024-07-10"
}

42
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.985",
"PreReleaseTagWithDash": "-alpha.985",
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 985,
"WeightedPreReleaseNumber": 985,
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.985",
"LegacySemVer": "0.1.0-alpha985",
"LegacySemVerPadded": "0.1.0-alpha0985",
"AssemblySemVer": "0.1.0.985",
"AssemblySemFileVer": "0.1.0.985",
"FullSemVer": "0.1.0-alpha.985",
"InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "51047663040d0c6479a57f5cf0215ba967a88dba",
"ShortSha": "5104766",
"NuGetVersionV2": "0.1.0-alpha0985",
"NuGetVersion": "0.1.0-alpha0985",
"NuGetPreReleaseTagV2": "alpha0985",
"NuGetPreReleaseTag": "alpha0985",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 985,
"CommitsSinceVersionSourcePadded": "0985",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitDate": "2024-07-08"
"CommitDate": "2024-07-10"
}

42
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.985",
"PreReleaseTagWithDash": "-alpha.985",
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 985,
"WeightedPreReleaseNumber": 985,
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.985",
"LegacySemVer": "0.1.0-alpha985",
"LegacySemVerPadded": "0.1.0-alpha0985",
"AssemblySemVer": "0.1.0.985",
"AssemblySemFileVer": "0.1.0.985",
"FullSemVer": "0.1.0-alpha.985",
"InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "51047663040d0c6479a57f5cf0215ba967a88dba",
"ShortSha": "5104766",
"NuGetVersionV2": "0.1.0-alpha0985",
"NuGetVersion": "0.1.0-alpha0985",
"NuGetPreReleaseTagV2": "alpha0985",
"NuGetPreReleaseTag": "alpha0985",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 985,
"CommitsSinceVersionSourcePadded": "0985",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitDate": "2024-07-08"
"CommitDate": "2024-07-10"
}