条码增加托盘批量过站逻辑和包装外箱过站逻辑

Rodney Chen

2024-08-06 c598e4bf57de2b4703d6c0e4d0905c9159273d26

 Tiger.Business.MES/Transaction/Position.cs

@@ -55,8 +55,9 @@
        public MES_SHIFT_SYS CurShiftSys { get; set; }
        public WorkBatch CurBatch { get; set; }
        public IWorkBatch WorkBatch => CurBatch;
        public MES_WIP_DATA CurWipSN { get; set; }
        public MES_WIP_HIS CurWipSNHis { get; set; }
        public List<MES_WIP_DATA> CurWipSNs { get; set; }
        public string CurSN => CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN;
        public List<MES_WIP_HIS> CurWipSNHiss { get; set; }
        public Dictionary<string, object> Context { get; set; } = new();
        public List<WorkStep> Steps { get; set; } = new();
        public WorkStep CurStep { get; set; }
@@ -65,6 +66,12 @@
        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;
        /// <summary>
        /// 是否需要临时存储数据库提交操作，待需要的时候再提交
        /// </summary>
        public bool NeedTemporaryStoreDBCommitAction { get; set; } = false;
        protected List<Action> DBCommitList { get; set; } = new();

        #endregion Propertys & Variables

        #region Functions
@@ -168,8 +175,8 @@
        public virtual void ResetNode()
        {
            Steps.Clear();
            CurWipSN = null;
            CurWipSNHis = null;
            CurWipSNs = null;
            CurWipSNHiss = null;
            CurStep = null;
        }

@@ -321,6 +328,43 @@
        }

        /// <summary>
        /// 保存工步的数据库提交操作到数据库
        /// </summary>
        protected void SaveStepsCommitActionToDB()
        {
            //保存工步的数据库提交操作到提交操作列表
            foreach (var step in Steps.OrderBy(q => q.Sequence))
            {
                DBCommitList.Add(step.DBSubmitAction);
            }
            //如果不需要临时存储数据库提交操作，则把提交操作列表提交到数据库
            if (!NeedTemporaryStoreDBCommitAction)
            {
                //恢复临时存储标记为false
                NeedTemporaryStoreDBCommitAction = false;

                var dbTran = GetCommitDB().UseTran(() =>
               {
                   //在同一个事务中保存所有工步的数据
                   foreach (var action in DBCommitList)
                   {
                        action.Invoke();
                   }
               });
               if (dbTran.IsSuccess)
               {
                    //保存成功则清空提交操作列表
                    DBCommitList.Clear();
                }
                else
                {
                    //抛出异常
                    throw dbTran.ErrorException;
                }
            }
        }

        /// <summary>
        /// 获取打印标签模板过程变量值
        /// </summary>
        /// <param name="labelPVs">过程变量列表</param>
@@ -368,7 +412,9 @@
                            switch (pv.VAR_METHOD)
                            {
                                case "GetSN":
                                    return CurWipSN.SN;
                                    return string.Join(",", CurWipSNs.Select(q => q.SN));
                                case "GetTraySN":
                                    return CurSN;
                                case "GetBAS_ITEM":
                                    return WorkBatch.Product.ToJson();
                                case "GetCustomer":
@@ -389,7 +435,6 @@
            }
            return "";
        }

        /// <summary>
        /// 获取工单维护的模板变量
        /// </summary>