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

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;
        }

@@ -217,12 +224,12 @@
                {
                    var next = new WorkStep(IWorkStep.Types.Action, this)
                    {
                        NodeID = act.ID,
                        Sequence = parent.Sequence + 1,
                        Node = parent.Node,
                        NodeAct = act,
                        Setting = CurBatch.ActionSets.FirstOrDefault(q => q.ACT_ID == act.ID),
                    };
                    next.Init();
                    next.PrepNodeIDs.Add(parent.NodeID);
                    next.PrepNodeIDs.AddRange(parent.PrepNodeIDs);
                    next.PrepNodeIDs = next.PrepNodeIDs.Distinct().ToList();
@@ -281,7 +288,7 @@
        /// <param name="input"></param>
        public ApiAction<SubmitOutput> BeginNextActionStep(SubmitInput input)
        {
            var result = new ApiAction<SubmitOutput>();
            var result = new ApiAction<SubmitOutput>(new SubmitOutput());
            //设置后续可执行的工步列表
            NextSteps = GetNextSteps(CurStep);
            //尝试有没有可以直接开始的后续工步
@@ -298,24 +305,14 @@
                    NextSteps = GetNextSteps(CurStep);
                    //返回结果到客户端
                    result = canBegin;
                    result.Data.IsFinished = IsFinishAllSteps;
                    result.Data.CurWO = CurBatch.WO.ORDER_NO;
                    result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
                    result.Data.CurNode = CurStep?.NodeAct.ACT_NAME;
                    result.Data.StepActCode = CurStep?.NodeAct.ACT_CODE;
                    result.Data.NextStepID = CurStep?.ID;
                    
                    result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);

                    return result;
                }
            }

            //没有可以直接开始的后续工步，根据后续工步返回ApiAction
            result.Data.IsFinished = IsFinishAllSteps;
            result.Data.CurWO = CurBatch.WO.ORDER_NO;
            result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
            result.Data.CurNode = CurStep?.Node.NODE_NAME;
            result.Data.StepActCode = CurStep?.NodeAct.ACT_CODE;
            result.Data.NextStepID = "";
            result.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);

            //没有可以直接开始的后续工步，根据后续可执行工步列表返回相应的操作提示
            if (NextSteps.Count == 1)
@@ -328,6 +325,43 @@
                                              string.Join("\r\n", NextSteps.Select(q => "    >> " + T(q.GetBeginMsg(), input.Locale))));
            }
            return result;
        }

        /// <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>
@@ -378,11 +412,15 @@
                            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":
                                    return WorkBatch.Batch.ToJson();
                                case "GetVarByWo":
                                    return GetLabelVarWo(lv);
                                default:
                                    return "";
                            }
@@ -397,6 +435,25 @@
            }
            return "";
        }
        /// <summary>
        /// 获取工单维护的模板变量
        /// </summary>
        /// <param name="labelId"></param>
        /// <returns></returns>
        private string GetLabelVarWo(BAS_LABEL_VAR lv)
        {
            string result = "";
            var labelVarwos = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
            if (labelVarwos.Any(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO))
            {
                result = labelVarwos.First(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO).VAR_VALUE;
            }
            else
            {
                result = labelVarwos.Count > 0 ? labelVarwos[0].DEFAULT_VALUE : "";
            }
            return result;
        }

        #endregion Functions