产品、工单绑定工艺路线更新

Ben Lin

2024-08-13 4a3788499301329d245b07bf2ba0213cf9fba540

 Tiger.Business.MES/Transaction/Position.cs

@@ -335,52 +335,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 +475,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 "";
                            }