From 660ccfc01c7c25cfab09e8798ca18ee2ac4a8b1d Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 20 九月 2024 23:22:17 +0800
Subject: [PATCH] 优化工步执行逻辑
---
Tiger.Business.MES/Transaction/Position.cs | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index f01aa1f..1eb3e09 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -63,7 +63,7 @@
public List<WorkStep> Steps { get; set; } = new();
public WorkStep CurStep { get; set; }
public List<WorkStep> NextSteps { get; set; } = new();
- public bool IsFinishNodeSteps => !Steps.Any(q => q.Type == IWorkStep.Types.Node && !q.IsFinished);
+ public bool IsFinishNodeSteps => !Steps.Any(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished);
public bool IsFinishAllSteps => !Steps.Any() || !Steps.Any(q => !q.IsFinished);
//public int CurStep => Steps.Where(q => !q.IsFinished).OrderBy(q => q.Sequence).FirstOrDefault()?.Sequence ?? 0;
private DbClient CommitDB;
@@ -73,8 +73,8 @@
public bool NeedTemporaryStoreDBCommitAction { get; set; } = false;
protected Dictionary<string, List<Action>> DBCommitList { get; set; } = new();
protected List<Position> NodeCommitList { get; set; } = new();
- protected Dictionary<string, OperInfo> OperInfoDic { get; set; } = new();
- protected OperInfo CurOperInfo { get; set; }
+ private Dictionary<string, OperInfo> OperInfoDic = new();
+
#endregion Propertys & Variables
#region Functions
@@ -120,6 +120,13 @@
action.IsSuccessed = false;
//action.LocaleMsg = new($"宸ュ崟[{input.OrderNo}]娌℃湁涓嬪彂鍒颁骇绾跨姸鎬乕{CurLine.LINE_CODE}]");
action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.LineException", input.OrderNo, CurLine.LINE_CODE);
+ return action;
+ }
+ if (batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() && batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"宸ュ崟[{input.OrderNo}]鐘舵�乕{wo.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName()}]涓嶈兘鐢熶骇");
+ action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
return action;
}
var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
@@ -189,6 +196,18 @@
CurDefects.Clear();
}
+ //鑾峰彇褰撳墠鐨勫伐搴忎俊鎭�
+ protected OperInfo CurOperInfo(string locale)
+ {
+ OperInfo info = new();
+ if (CurBatch?.Batch?.BATCH_NO != null)
+ {
+ info = OperInfoDic[CurBatch.Batch.BATCH_NO ];
+ info.StepsInfo = Steps.Select(q => q.GetInfo(locale)).ToList();
+ }
+ return info;
+ }
+
/// <summary>
/// 璁剧疆褰撳墠鏉＄爜鐨勫伐搴忎俊鎭�
/// </summary>
@@ -249,12 +268,14 @@
}
else
{
- var next = new WorkStep(IWorkStep.Types.Action, this)
+ var next = new WorkStep(IWorkStep.NodeTypes.Action, this)
{
+ Name = act.ACT_NAME,
Sequence = parent.Sequence + 1,
Node = parent.Node,
+ OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == parent.Node.ID),
NodeAct = act,
- Setting = CurBatch.ActionSets.FirstOrDefault(q => q.ACT_ID == act.ID),
+ ActSetting = CurBatch.ActionSets.FirstOrDefault(q => q.ACT_ID == act.ID),
};
next.Init();
next.PrepNodeIDs.Add(parent.NodeID);
@@ -330,10 +351,17 @@
CurStep = step;
//鏇存柊鍚庣画鍙墽琛岀殑宸ユ鍒楄〃
NextSteps = GetNextSteps(CurStep);
- //杩斿洖缁撴灉鍒板鎴风
- result = canBegin;
- result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
-
+ //濡傛灉褰撳墠鎵ц宸ユ灏濊瘯鎵ц鍚庡氨宸茬粡瀹屾垚锛屼笉闇�瑕佸悗缁氦浜掞紝涓旓紝鍒欑户缁紑濮嬩笅涓�宸ユ
+ if (CurStep.IsFinished && NextSteps.Any())
+ {
+ result = BeginNextActionStep(input);
+ }
+ else
+ {
+ //杩斿洖缁撴灉鍒板鎴风
+ result = canBegin;
+ result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
+ }
return result;
}
}
@@ -413,13 +441,14 @@
}
}
+ #region 鎵撳嵃涓撶敤鏂规硶
/// <summary>
/// 鑾峰彇鎵撳嵃鏍囩妯℃澘杩囩▼鍙橀噺鍊�
/// </summary>
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="label">鏍囩妯℃澘</param>
/// <returns></returns>
- public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label)
+ public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
{
foreach (var item in label.Variables)
{
@@ -429,7 +458,7 @@
item.Value = item.VAR_VALUE;
break;
case BAS_LABEL_VAR.VAR_TYPEs.ProcessVariable:
- item.Value = GetPrintProcessValue(labelPVs, item);
+ item.Value = GetPrintProcessValue(labelPVs, item, action);
break;
case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
item.Value = DateTime.Now.ToString(item.VAR_VALUE);
@@ -452,7 +481,7 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
/// <returns></returns>
- public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv)
+ public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, IWorkAction action)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
@@ -538,6 +567,7 @@
return result;
}
+ #endregion
#endregion Functions
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3