从SVN更新龙工修改的Recipe内容。
This commit is contained in:
parent
bbac2c312e
commit
f32e2739f4
Binary file not shown.
|
@ -533,11 +533,18 @@ namespace SicPM
|
|||
OP.Subscribe($"{Module}.RunPMMacro", (string cmd, object[] args) => CheckToPostMessage((int)MSG.RunPMMacro, (string)args[0]));
|
||||
|
||||
OP.Subscribe($"{Module}.CleanRecipe", (string cmd, object[] args) => CheckToPostMessage((int)MSG.CleanProcess, (string)args[0]));
|
||||
|
||||
OP.Subscribe($"{Module}.RealoadRecipe", (string cmd, object[] args) => RealoadRecipe());
|
||||
OP.Subscribe($"{Module}.Recipe.EditorChangePassword", (string cmd, object[] args) => WriteEPassword((string)args[0]));
|
||||
OP.Subscribe($"{Module}.SignalTower.SwitchOffBuzzerEx", (string cmd, object[] args) => SwitchOffBuzzerEx(args));
|
||||
}
|
||||
|
||||
private bool RealoadRecipe()
|
||||
{
|
||||
_recipeRunningInfo.NeedReloadRecipe = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
private bool PutOnline()
|
||||
{
|
||||
IsOnline = true;
|
||||
|
|
|
@ -439,6 +439,16 @@ namespace SicPM.RecipeExecutions
|
|||
_state = RecipeRunningState.StepCompleted;
|
||||
}
|
||||
|
||||
if (PMDevice.RecipeRunningInfo.NeedReloadRecipe)
|
||||
{
|
||||
//重新加载后面的Recipe内容
|
||||
if (RecipeParser.Parse(PMDevice.RecipeRunningInfo.RecipeName, Module, out var recipeHead, out var recipeSteps, out string reason1))
|
||||
{
|
||||
PMDevice.RecipeRunningInfo.RecipeStepList = recipeSteps;
|
||||
PMDevice.RecipeRunningInfo.NeedReloadRecipe = false;
|
||||
}
|
||||
}
|
||||
|
||||
//ToleranceChecker();
|
||||
|
||||
SkipStepForHeat();
|
||||
|
|
|
@ -41,5 +41,7 @@ namespace SicPM.RecipeExecutions
|
|||
public string N2FlowMode { get; set; }
|
||||
|
||||
public bool IsRoutineAbort { get; set; }
|
||||
public bool NeedReloadRecipe { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
<config default="1" name="RecipePasswordReset" description="Recipe编辑的密码重置,设置0重置,其他数忽略" max="100" min="0" paramter="" tag="" unit="" type="Integer" />
|
||||
<config default="true" name="RecipeCascadeLoading" description="启用瀑布流方式加载Recipe" max="" min="" paramter="" tag="" unit="" type="Bool" />
|
||||
<config default="false" name="RecipeHideParamValueAfterLoading" description="加载Recipe后是否自动隐藏参数值" max="" min="" paramter="" tag="" unit="" type="Bool" />
|
||||
<config default="false" name="RecipeSaveToDB" description="Recipe文件保存到数据库" max="" min="" paramter="" tag="" unit="" type="Bool" />
|
||||
|
||||
|
||||
<configs name="Scheduler">
|
||||
<config default="15" name="WaitLoadTimeOut" description="Wait Load TimeOut" max="1000" min="1" paramter="" tag="" unit="s" type="Double" visible="false" />
|
||||
|
|
|
@ -64,7 +64,7 @@ namespace SicRT.Instances
|
|||
|
||||
Singleton<DataManager>.Instance.Initialize();
|
||||
|
||||
RecipeFileManager.Instance.Initialize(new SicRecipeFileContext());
|
||||
|
||||
|
||||
AccountExManager.Instance.Initialize(true);
|
||||
|
||||
|
@ -98,6 +98,8 @@ namespace SicRT.Instances
|
|||
|
||||
RtSystemManager.Instance.AddCustomBackend("SC", new BackendSCConfigView());
|
||||
|
||||
RecipeFileManager.Instance.Initialize(new SicRecipeFileContext(),true,SC.GetValue<bool>("System.RecipeSaveToDB"));
|
||||
|
||||
Singleton<EquipmentManager>.Instance.Initialize();
|
||||
|
||||
// Singleton<RouteManager>.Instance.Initialize();
|
||||
|
|
|
@ -1400,6 +1400,14 @@
|
|||
IsEnabled="{Binding EnableStep}"
|
||||
micro:Message.Attach="DeleteStep()"/>
|
||||
|
||||
<Button
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
Content="Reload"
|
||||
IsEnabled="{Binding EnableStep}"
|
||||
micro:Message.Attach="ReloadRecipeWhileProcess()"/>
|
||||
|
||||
<!--<Button
|
||||
Width="90"
|
||||
Height="30"
|
||||
|
|
|
@ -1867,6 +1867,12 @@ namespace SicUI.Models.RecipeEditors
|
|||
|
||||
}
|
||||
|
||||
public void ReloadRecipeWhileProcess()
|
||||
{
|
||||
InvokeClient.Instance.Service.DoOperation($"PM1.RealoadRecipe");
|
||||
InvokeClient.Instance.Service.DoOperation($"PM2.RealoadRecipe");
|
||||
}
|
||||
|
||||
private void CreateValidationDetailWindow()
|
||||
{
|
||||
_winValidationInfo = new RecipeEditorValidationDetailWindow(_validationResultList, _lastPosOfValidationWin);
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue