包装投入检查增加判断是否在U9有投产记录

Rodney Chen

2024-09-25 353ae2ebfdb15428e6891a095de13cd2731843b9

 Tiger.Business.MES/WorkAction/PrintLabel.cs

@@ -42,6 +42,9 @@

            Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();

            CurStep.Message = Biz.L("等待标签打印");
            CurStep.Status = StepStatus.Normal;
        }

        /// <summary>
@@ -64,11 +67,14 @@
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //设置打印变量值
            Label = CurPosition.SetLabelVariables(LabelPV, Label);
            Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
            action.Data.Data = Label;

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            CurStep.Message = Biz.L("打印开始");
            CurStep.Status = StepStatus.Normal;
            action.IsSuccessed = true;
            action.Data.ShortMsg = new("打印开始", ShortMessage.Types.Success);
            return action;
        }

@@ -82,11 +88,14 @@
            //提交数据执行成功
            if (input.Data.ToBoolean())
            {
                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($"标签{Label.LABEL_NAME}[{Label.LABEL_CODE}]打印失败", Label.LABEL_NAME);
                action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintFail", Label.LABEL_NAME, Label.LABEL_CODE);
@@ -102,7 +111,7 @@
        /// 结束执行工序行为
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> End()
        public ApiAction<SubmitOutput> End(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

@@ -115,6 +124,7 @@
                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                    HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                    WIP_ID = wipSn.ID,
                    SN = wipSn.SN,
                    STATUS = wipSn.STATUS,
                    ITEM_CODE = wipSn.ITEM_CODE,
@@ -131,7 +141,11 @@
                    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,
@@ -145,16 +159,20 @@
                };
                wipActs.Add(wipAct);
            }
            

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

            IsFinished = true;
            CurStep.Message = Biz.L("打印完成");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("打印完成", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"标签{Label.LABEL_NAME}[{Label.LABEL_CODE}]打印成功", Label.LABEL_NAME);
            action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintSuccess", Label.LABEL_NAME, Label.LABEL_CODE);
            return action;