工步增加行为变量字典

Rodney Chen

2025-01-01 7bf8f292234bea48fd9318eee9267c6ef19e19ed

 Tiger.Business.MES/Common/WorkStep.cs

@@ -11,6 +11,7 @@
using Newtonsoft.Json;
using Tiger.IBusiness;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Business.MES.Transaction;

namespace Tiger.Business
{
@@ -38,6 +39,7 @@
        public MES_WO_ACTION ActSetting { get; set; }
        public IPosition CurPosition { get; set; }
        public IWorkAction CurAction { get; set; }
        public Dictionary<string, string> ActionDic { get; set; } = new();
        public int Sequence { get; set; }
        public List<string> PrepNodeIDs { get; set; } = new();
        public string NodeID => NodeType == IWorkStep.NodeTypes.Action ? NodeAct.ID : Node.ID;
@@ -75,6 +77,10 @@
        {
            CurAction = DI.Resolve(NodeAct.Definition.SERVICE_TYPE) as IWorkAction;
            //CurAction = DI.Resolve("Tiger.IBusiness.IPrintLabel,Tiger.IBusiness") as IWorkAction;

            //设置行为字典
            ActionDic = NodeAct.Variables.ToDictionary(k => k.VAR_CODE, v => v.DEFAULT);

            CurAction.Init(this, CurPosition, NodeAct, ActSetting);
        }

@@ -88,7 +94,8 @@
            //工步行为启用则正常执行
            if (IsActive)
            {
                return CurAction.TryBegin(input);
                UpdateActionDic(input.ActionDic);
                return ResetActionDic(CurAction.TryBegin(input));
            }
            //工步行为不启用，否则工步默认完成
            else
@@ -120,7 +127,8 @@
        /// <returns></returns>
        public ApiAction<SubmitOutput> Submit(SubmitInput input)
        {
            return CurAction.Submit(input);
            UpdateActionDic(input.ActionDic);
            return ResetActionDic(CurAction.Submit(input));
        }

        /// <summary>
@@ -129,9 +137,39 @@
        /// <returns></returns>
        public ApiAction<SubmitOutput> End(SubmitInput input)
        {
            UpdateActionDic(input.ActionDic);
            var result = CurAction.End(input);
            EndAt = DateTime.Now;
            return result;
            return ResetActionDic(result);
        }

        /// <summary>
        /// 获取工步当前耗时
        /// </summary>
        /// <returns></returns>
        public void UpdateActionDic(Dictionary<string, string> newDic)
        {
            foreach (var item in newDic ?? new())
            {
                if (ActionDic.ContainsKey(item.Key))
                {
                    ActionDic[item.Key] = item.Value;
                }
                else
                {
                    ActionDic.Add(item.Key, item.Value);
                }
            }
        }

        /// <summary>
        /// 获取工步当前耗时
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> ResetActionDic(ApiAction<SubmitOutput> output)
        {
            output.Data.ActionDic = ActionDic;
            return output;
        }

        /// <summary>