一些更改

Ben Lin

2024-08-20 37fc700892a509346d5be0a1af2d3de1fe8d3a9e

 Tiger.Business.MES/Transaction/Position.cs

@@ -56,7 +56,7 @@
        public WorkBatch CurBatch { get; set; }
        public IWorkBatch WorkBatch => CurBatch;
        public List<MES_WIP_DATA> CurWipSNs { get; set; } = new();
        public string CurSN => CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "";
        public string CurSN => (CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "");
        public List<MES_WIP_HIS> CurWipSNHiss { get; set; } = new();
        public List<MES_WIP_DFT> CurDefects { get; set; } = new();
        public Dictionary<string, object> Context { get; set; } = new();
@@ -73,7 +73,8 @@
        public bool NeedTemporaryStoreDBCommitAction { get; set; } = false;
        protected 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; }
        #endregion Propertys & Variables

        #region Functions
@@ -125,6 +126,11 @@
                    WoContext.WoBatchDic.Add(wb.Batch.BATCH_NO, wb);
                }
                CurBatch = WoContext.GetBatch(input.OrderNo, CurLine.LINE_CODE);
                if (!OperInfoDic.ContainsKey(CurBatch.Batch.BATCH_NO))
                {
                    OperInfoDic.Add(CurBatch.Batch.BATCH_NO, new());
                }
                
                action.Data = new { WorkOrder = CurBatch.WO, Bacth = CurBatch.Batch };
            }
            catch (Exception ex)
@@ -181,6 +187,24 @@
            CurWipSNHiss.Clear();
            CurStep = null;
            CurDefects.Clear();
        }

        /// <summary>
        /// 设置当前条码的工序信息
        /// </summary>
        public OperInfo SetOperNodeInfo(OperInfo info)
        {
            if (CurWipSNs.Any())
            {
                info.CurNode = CurWipSNs.First().NODE_NAME;
                info.NextNode = string.Join(",", CurBatch.GetNextNodes(CurWipSNs.First()).Select(q => q.NODE_NAME));
            }
            else
            {
                info.CurNode = "   —   ";
                info.NextNode = "   —   ";
            }
            return info;
        }

        /// <summary>
@@ -335,52 +359,35 @@
        /// </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;
            //    }
            //}
            if (NeedTemporaryStoreDBCommitAction)
            //保存工步的数据库提交操作到提交操作列表
            foreach (var step in Steps.OrderBy(q => q.Sequence))
            {
                NodeCommitList.Add(this.Clone());
                DBCommitList.Add(step.DBSubmitAction);
            }
            else
            //如果不需要临时存储数据库提交操作，则把提交操作列表提交到数据库
            if (!NeedTemporaryStoreDBCommitAction)
            {
                //恢复临时存储标记为false
                NeedTemporaryStoreDBCommitAction = false;

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

@@ -492,7 +499,7 @@
                            switch (pv.VAR_METHOD)
                            {
                                case "GetCartonGenerate":
                                    return Biz.CodeRule[lv.BARCODE_RULE].Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString();
                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                                default:
                                    return "";
                            }