增加设备管理实体

Rodney Chen

2024-07-15 4efd39343a8f6268cb665c2ab920e44865038dc1

 Tiger.Business.MES/WorkAction/PrintLabel.cs

@@ -16,7 +16,7 @@
    {
        #region Propertys & Variables
        public bool IsFinished { get; set; } = false;
        public string StepID { get; set; }
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
        public MES_WO_NODE_ACT NodeAct { get; set; }
        public MES_WO_ACTION Setting { get; set; }
@@ -29,9 +29,9 @@
        /// 开始执行工序行为
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> Begin(string stepID, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        public ApiAction<SubmitOutput> Begin(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            StepID = stepID;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
@@ -78,8 +78,8 @@
                //重置当前工序
                CurPosition.ResetSteps();
                action.IsSuccessed = false;
                action.LocaleMsg = new($"标签[{Label.LABEL_NAME}]打印失败，请重新扫描产品条码", Label.LABEL_NAME);
                //action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintFail", Label.LABEL_NAME);
                //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);
            }
            return action;
        }
@@ -90,9 +90,49 @@
        public ApiAction<SubmitOutput> End()
        {
            var action = new ApiAction<SubmitOutput>();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();

                var wipAct = new MES_WIP_ACT()
                {
                    HIS_ID = CurPosition.CurWipSN.HIS_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 = Label.LABEL_CODE,
                    ACT_VALUE_2 = Label.Variables.ToJson(),
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"标签{Label.LABEL_NAME}[{Label.LABEL_CODE}]打印成功",
                };

                db.Storageable(wipAct, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;
            action.LocaleMsg = new($"标签[{Label.LABEL_NAME}]打印成功", Label.LABEL_NAME);
            //action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintSuccess", Label.LABEL_NAME);
            //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;
        }

@@ -109,6 +149,10 @@
                            {
                                case "GetSN":
                                    return CurPosition.CurWipSN.SN;
                                case "GetBAS_ITEM":
                                    return Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == CurPosition.CurWipSN.ITEM_CODE).First()?.ToJson();
                                case "GetCustomer":
                                    return CurPosition.WorkBatch.Batch.ToJson();
                                default:
                                    return "";
                            }