工单变量优化

Ben Lin

2024-10-17 6984f73c06b8d5ab5da41e16b4ac68dc87716a16

 Tiger.Business.MES/Transaction/LoadingMaterial.cs

@@ -34,7 +34,7 @@
        public string UserCode { get; set; }
        public long UserId { get; set; }
        public string OrgCode { get; set; }
        public string CurrSmtCode { get; set; }
        public string CurSmtCode { get; set; }
        public string CurrSlotNo { get; set; }
        /// <summary>
        /// 步骤类型
@@ -206,10 +206,10 @@
            {
                if (Biz.Db.Queryable<SMT_WO_TABLE>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == input.Code).Any())
                {
                    CurrSmtCode = input.Code;
                    CurSmtCode = input.Code;
                    action.IsSuccessed = true;
                    action.LocaleMsg = Biz.L($"机器编码验证通过！");
                    loadingReturn.SmtCode = CurrSmtCode;
                    loadingReturn.SmtCode = CurSmtCode;
                    loadingReturn.Step = (int)Step_Types.SmtCode;
                    loadingReturn.Status = (int)Statuss.SmtCodeOK;
                }
@@ -238,16 +238,16 @@
            SmtLoadingReturn loadingReturn = new();
            try
            {
                if (Biz.Db.Queryable<SMT_WO_TABLE>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurrSmtCode && x.SLOT_NO == input.Code).Any())
                if (Biz.Db.Queryable<SMT_WO_TABLE>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurSmtCode && x.SLOT_NO == input.Code).Any())
                {
                    CurrSlotNo = input.Code;
                    action.IsSuccessed = true;
                    action.LocaleMsg = Biz.L($"槽位验证通过！");
                    loadingReturn.SmtCode = CurrSmtCode;
                    loadingReturn.SmtCode = CurSmtCode;
                    loadingReturn.SlotNo = CurrSlotNo;
                    loadingReturn.Step = (int)Step_Types.SlotNo;
                    loadingReturn.Status = (int)Statuss.SlotNoOK;
                    loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x=> x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurrSmtCode && x.SLOT_NO == input.Code).Count();
                    loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x=> x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurSmtCode && x.SLOT_NO == input.Code).Count();
                }
                else
                {
@@ -302,11 +302,11 @@
                    return action;
                }
                action.LocaleMsg = Biz.L($"此Feeder验证通过！");
                loadingReturn.SmtCode = CurrSmtCode;
                loadingReturn.SmtCode = CurSmtCode;
                loadingReturn.SlotNo = CurrSlotNo;
                loadingReturn.Step = (int)Step_Types.Feeder;
                loadingReturn.Status = (int)Statuss.FeederOK;
                loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurrSmtCode && x.FEEDER_CODE == input.Code && x.SLOT_NO == CurrSlotNo).Count();
                loadingReturn.LoadingCount = Biz.Db.Queryable<SMT_LOADING>().Where(x => x.WORK_ORDER == input.moCode && x.LINE_CODE == input.lineCode && x.PROD_CODE == input.prodCode && x.SMT_CODE == CurSmtCode && x.FEEDER_CODE == input.Code && x.SLOT_NO == CurrSlotNo).Count();
            }
            catch (Exception ex)
            {
@@ -332,23 +332,6 @@
                action.CatchExceptionWithLog(ex, $"扫描料盘码异常");
            }
            return action;
        }

        /// <summary>
        /// 添加一个ApiAction的历史记录
        /// </summary>
        /// <param name="action"></param>
        public override void AddHistory<T>(Microsoft.AspNetCore.Http.HttpRequest request, ApiAction<T> action)
        {
            var his = action.History();
            //his.TraceDic.Add("CurReqType", CurReqType);
            //his.TraceDic.Add("CurInv", CurInv);
            //his.TraceDic.Add("req", req);
            //his.TraceDic.Add("toMes", toMes);
            //his.TraceDic.Add("CurPoolList", CurPoolList);
            //his.TraceDic.Add("isComplete", his_isComplete);
            //ActionHistoryList.Add($"{request.HttpContext.TraceIdentifier} at {action.Timestamp:yyyy/MM/dd HH:mm:ss.fff}: {request.Path}", his);
            LastActionTime = DateTime.Now;
        }

        #endregion Functions