增加公布提示信息和状态

Rodney Chen

2024-09-04 0116b5d2ed16a0825da9e7474fc786ee06b2d60c

 Tiger.Business.MES/WorkAction/IPQC.cs

@@ -6,6 +6,7 @@
using System.Text;
using System.Threading.Tasks;
using Tiger.IBusiness;
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;

@@ -58,7 +59,10 @@
            action.LocaleMsg = new("MES.WorkAction.IPQC.PleaseTest");

            //如果根据输入可以开始执行当前行为则标记为成功，否则失败
            CurStep.Message = Biz.L("等待测试");
            CurStep.Status = StepStatus.Normal;
            action.IsSuccessed = false;
            action.Data.ShortMsg = new("等待测试", ShortMessage.Types.Success);
            return action;
        }
        /// <summary>
@@ -78,12 +82,15 @@
                //行为执行完成
                if (false)
                {
                   action = End();
                   action = End(input);
                }
            }
            //提交数据执行失败
            else
            {
                CurStep.Message = Biz.L("测试失败");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("测试失败", ShortMessage.Types.Failed);
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"执行失败");
                action.LocaleMsg = new("MES.WorkAction.IPQC.Fail");
@@ -100,57 +107,72 @@
        /// 结束执行工序行为
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> End()
        public ApiAction<SubmitOutput> End(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //记录行为操作记录
            var wipAct = new MES_WIP_ACT()
            var wipActs = new List<MES_WIP_ACT>();
            foreach (var wipSn in CurPosition.CurWipSNs)
            {
                AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                HIS_ID = CurPosition.CurWipSNHis.ID,
                SN = CurPosition.CurWipSN.SN,
                STATUS = CurPosition.CurWipSN.STATUS,
                ITEM_CODE = CurPosition.CurWipSN.ITEM_CODE,
                WORK_ORDER = CurPosition.CurWipSN.WORK_ORDER,
                BATCH_NO = CurPosition.CurWipSN.BATCH_NO,
                ROT_CODE = CurPosition.CurWipSN.ROT_CODE,
                NODE_ID = CurPosition.CurWipSN.NODE_ID,
                NODE_NAME = CurPosition.CurWipSN.NODE_NAME,
                ACT_ID = NodeAct.ID,
                ACT_NAME = NodeAct.ACT_NAME,
                FTY_CODE = CurPosition.CurWipSN.FTY_CODE,
                WS_CODE = CurPosition.CurWipSN.WS_CODE,
                LINE_CODE = CurPosition.CurWipSN.LINE_CODE,
                POST_CODE = CurPosition.CurWipSN.POST_CODE,
                OPER_CODE = CurPosition.CurWipSN.OPER_CODE,
                SEGMENT = CurPosition.CurWipSN.SEGMENT,
                TRAY_SN = CurPosition.CurWipSN.TRAY_SN,
                OPERATION_TIME = DateTime.Now,
                SFTS_CODE = CurPosition.CurWipSN.SFTS_CODE,
                SFT_CODE = CurPosition.CurWipSN.SFT_CODE,
                PRD_CODE = CurPosition.CurWipSN.PRD_CODE,
                ACT_TYPE = NodeAct.ACT_TYPE,
                ACT_SN = CurPosition.CurWipSN.SN,
                ACT_VALUE_1 = "",
                ACT_VALUE_2 = "",
                ACT_VALUE_3 = "",
                ACT_VALUE_4 = "",
                ACT_VALUE_5 = "",
                ACT_RESULT = "Y",
                TRACE_INFO = $"执行成功",
            };
                var wipAct = new MES_WIP_ACT()
                {
                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                    WIP_ID = wipSn.ID,
                    HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                    SN = wipSn.SN,
                    STATUS = wipSn.STATUS,
                    ITEM_CODE = wipSn.ITEM_CODE,
                    WORK_ORDER = wipSn.WORK_ORDER,
                    BATCH_NO = wipSn.BATCH_NO,
                    ROT_CODE = wipSn.ROT_CODE,
                    NODE_ID = wipSn.NODE_ID,
                    NODE_NAME = wipSn.NODE_NAME,
                    ACT_ID = NodeAct.ID,
                    ACT_NAME = NodeAct.ACT_NAME,
                    FTY_CODE = wipSn.FTY_CODE,
                    WS_CODE = wipSn.WS_CODE,
                    LINE_CODE = wipSn.LINE_CODE,
                    POST_CODE = wipSn.POST_CODE,
                    OPER_CODE = wipSn.OPER_CODE,
                    SEGMENT = wipSn.SEGMENT,
                    FLOW_SN = wipSn.FLOW_SN,
                    TRAY_SN = wipSn.TRAY_SN,
                    INNER_SN = wipSn.INNER_SN,
                    CARTON_SN = wipSn.CARTON_SN,
                    PALLET_SN = wipSn.PALLET_SN,
                    OPERATION_TIME = DateTime.Now,
                    SFTS_CODE = wipSn.SFTS_CODE,
                    SFT_CODE = wipSn.SFT_CODE,
                    PRD_CODE = wipSn.PRD_CODE,
                    ACT_TYPE = NodeAct.ACT_TYPE,
                    ACT_SN = wipSn.SN,
                    ACT_VALUE_1 = "",
                    ACT_VALUE_2 = "",
                    ACT_VALUE_3 = "",
                    ACT_VALUE_4 = "",
                    ACT_VALUE_5 = "",
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"执行成功",
                };
                wipActs.Add(wipAct);
            }

            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
            var _wipActs = wipActs.Clone();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(wipAct, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;
            action.LocaleMsg = new($"行为结束");
            CurStep.Message = Biz.L("测试完成");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("测试完成", ShortMessage.Types.Success);
            action.LocaleMsg = new($"测试结束");
            //action.LocaleMsg = new("MES.WorkAction.IPQC.Finish");
            return action;
        }