TigerClouds-Tech/Server/TigerApi6_2024.git

Rodney Chen

2024-08-05 ff636d822e327602f0c9a609d5f6d01cc22e5e86

增加可以临时存储数据库提交操作，待需要的时候再提交

已修改6个文件

	Tiger.Business.MES/Transaction/CollectNode.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.Business.MES/Transaction/PackingNode.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.Business.MES/Transaction/Position.cs	43 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.Business.MES/Transaction/TestNode.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.Business.MES/WorkAction/PackingAction.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.IBusiness/MES/Transaction/IPosition.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Tiger.Business.MES/Transaction/CollectNode.cs

@@ -216,7 +216,7 @@
                    //条码过站
                    wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
                    wipSN.AUTH_PROD = CurLine.LINE_CODE;
                    wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
                    wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
                    wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
                    wipSN.NODE_ID = curNode.ID;
                    wipSN.NODE_NAME = curNode.NODE_NAME;
@@ -373,18 +373,8 @@
        public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
        {
            //保存数据库
            var dbTran = GetCommitDB().UseTran(() =>
            {
                //在同一个事务中保存所有工步的数据
                foreach (var step in Steps.OrderBy(q => q.Sequence))
                {
                    step.DBSubmitAction.Invoke();
                }
            });
            if (!dbTran.IsSuccess)
            {
                throw dbTran.ErrorException;
            }
            SaveStepsCommitActionToDB();

            //保存成功，返回过站消息
            //action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
            action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME,CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -240,8 +240,8 @@
                    //条码过站
                    wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
                    wipSN.AUTH_PROD = CurLine.LINE_CODE;
                    wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
                    wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
                    wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
                    wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
                    wipSN.NODE_ID = curNode.ID;
                    wipSN.NODE_NAME = curNode.NODE_NAME;
                    wipSN.FTY_CODE = CurFactory.FTY_CODE;
@@ -396,18 +396,8 @@
        public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
        {
            //保存数据库
            var dbTran = GetCommitDB().UseTran(() =>
            {
                //在同一个事务中保存所有工步的数据
                foreach (var step in Steps.OrderBy(q => q.Sequence))
                {
                    step.DBSubmitAction.Invoke();
                }
            });
            if (!dbTran.IsSuccess)
            {
                throw dbTran.ErrorException;
            }
            SaveStepsCommitActionToDB();

            //保存成功，返回过站消息
            //action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
            action.LocaleMsg = new("MES.Transaction.PackingNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());

 Tiger.Business.MES/Transaction/Position.cs

@@ -65,6 +65,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
@@ -321,6 +327,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>

 Tiger.Business.MES/Transaction/TestNode.cs

@@ -217,7 +217,7 @@
                    //条码过站
                    wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
                    wipSN.AUTH_PROD = CurLine.LINE_CODE;
                    wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
                    wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
                    wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
                    wipSN.NODE_ID = curNode.ID;
                    wipSN.NODE_NAME = curNode.NODE_NAME;
@@ -373,18 +373,8 @@
        public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
        {
            //保存数据库
            var dbTran = GetCommitDB().UseTran(() =>
            {
                //在同一个事务中保存所有工步的数据
                foreach (var step in Steps.OrderBy(q => q.Sequence))
                {
                    step.DBSubmitAction.Invoke();
                }
            });
            if (!dbTran.IsSuccess)
            {
                throw dbTran.ErrorException;
            }
            SaveStepsCommitActionToDB();

            //保存成功，返回过站消息
            //action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
            action.LocaleMsg = new("MES.Transaction.TestNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -56,12 +56,6 @@
                PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
            }
            //根据行为设置获取多层包装的标签打印模板字典
            //for (int i = 1; i < 10; i++)
            //{
            //    var code = Setting.GetType().GetProperty($"OPTION_{i}")?.GetValue(Setting)?.ToString() ?? "";
            //    var label = code.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code).IncludesAllFirstLayer().First();
            //    LabelDic.Add(i, label);
            //}
            var codes = (Setting.OPTION_1?? "").JsonToObject<List<WipPkgItem>>();
            foreach (var code in codes)
            {

 Tiger.IBusiness/MES/Transaction/IPosition.cs

@@ -21,6 +21,10 @@
        public MES_WIP_DATA CurWipSN { get; set; }
        public MES_WIP_HIS CurWipSNHis { get; set; }
        public Dictionary<string, object> Context { get; set; }
        /// <summary>
        /// 是否需要临时存储数据库提交操作，待需要的时候再提交
        /// </summary>
        public bool NeedTemporaryStoreDBCommitAction { get; set; }
        #endregion Propertys & Variables

        #region Functions

			@@ -216,7 +216,7 @@
			//条码过站
			wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
			wipSN.AUTH_PROD = CurLine.LINE_CODE;
			wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
			wipSN.NODE_ID = curNode.ID;
			wipSN.NODE_NAME = curNode.NODE_NAME;
			@@ -373,18 +373,8 @@
			public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
			{
			//保存数据库
			var dbTran = GetCommitDB().UseTran(() =>
			{
			//在同一个事务中保存所有工步的数据
			foreach (var step in Steps.OrderBy(q => q.Sequence))
			{
			step.DBSubmitAction.Invoke();
			}
			});
			if (!dbTran.IsSuccess)
			{
			throw dbTran.ErrorException;
			}
			SaveStepsCommitActionToDB();

			//保存成功，返回过站消息
			//action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
			action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME,CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());

			@@ -240,8 +240,8 @@
			//条码过站
			wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
			wipSN.AUTH_PROD = CurLine.LINE_CODE;
			wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
			wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
			wipSN.NODE_ID = curNode.ID;
			wipSN.NODE_NAME = curNode.NODE_NAME;
			wipSN.FTY_CODE = CurFactory.FTY_CODE;
			@@ -396,18 +396,8 @@
			public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
			{
			//保存数据库
			var dbTran = GetCommitDB().UseTran(() =>
			{
			//在同一个事务中保存所有工步的数据
			foreach (var step in Steps.OrderBy(q => q.Sequence))
			{
			step.DBSubmitAction.Invoke();
			}
			});
			if (!dbTran.IsSuccess)
			{
			throw dbTran.ErrorException;
			}
			SaveStepsCommitActionToDB();

			//保存成功，返回过站消息
			//action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
			action.LocaleMsg = new("MES.Transaction.PackingNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());

			@@ -65,6 +65,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
			@@ -321,6 +327,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>

			@@ -217,7 +217,7 @@
			//条码过站
			wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
			wipSN.AUTH_PROD = CurLine.LINE_CODE;
			wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
			wipSN.NODE_ID = curNode.ID;
			wipSN.NODE_NAME = curNode.NODE_NAME;
			@@ -373,18 +373,8 @@
			public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
			{
			//保存数据库
			var dbTran = GetCommitDB().UseTran(() =>
			{
			//在同一个事务中保存所有工步的数据
			foreach (var step in Steps.OrderBy(q => q.Sequence))
			{
			step.DBSubmitAction.Invoke();
			}
			});
			if (!dbTran.IsSuccess)
			{
			throw dbTran.ErrorException;
			}
			SaveStepsCommitActionToDB();

			//保存成功，返回过站消息
			//action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
			action.LocaleMsg = new("MES.Transaction.TestNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());

			@@ -56,12 +56,6 @@
			PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
			}
			//根据行为设置获取多层包装的标签打印模板字典
			//for (int i = 1; i < 10; i++)
			//{
			// var code = Setting.GetType().GetProperty($"OPTION_{i}")?.GetValue(Setting)?.ToString() ?? "";
			// var label = code.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code).IncludesAllFirstLayer().First();
			// LabelDic.Add(i, label);
			//}
			var codes = (Setting.OPTION_1?? "").JsonToObject<List<WipPkgItem>>();
			foreach (var code in codes)
			{

			@@ -21,6 +21,10 @@
			public MES_WIP_DATA CurWipSN { get; set; }
			public MES_WIP_HIS CurWipSNHis { get; set; }
			public Dictionary<string, object> Context { get; set; }
			/// <summary>
			/// 是否需要临时存储数据库提交操作，待需要的时候再提交
			/// </summary>
			public bool NeedTemporaryStoreDBCommitAction { get; set; }
			#endregion Propertys & Variables

			#region Functions