Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

Rodney Chen

2024-09-11 ba0b68c347de4c9214d128d0b51d3af75688d6b3

 Tiger.Business.MES/WorkAction/WipExtInfo.cs

@@ -22,9 +22,8 @@
        public MES_WO_NODE_ACT NodeAct { get; set; }
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public List<BAS_PROD_BOM> Boms { get; set; } = new();
        public Dictionary<string, List<BAS_ITEM>> SubItemDic { get; set; } = new();
        public AssemblyInfo CurAssembly { get; set; } = new();
        public BAS_WIP_EXT ExtInfo { get; set; } 
        public List<MES_WIP_EXT> CurWipExt { get; set; }
        #endregion Propertys & Variables

        #region Functions
@@ -41,49 +40,27 @@
            Setting = setting;
            #endregion

            //获取产品BOM
            Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            //获取上料物料
            var assyList = new List<AssemblySetting>();
            try
            //获取扩展字段定义
            var seq = Setting.ITEM_CODE.ToInt32();
            ExtInfo = Biz.Db.Queryable<BAS_WIP_EXT>().Where(q => q.SEQ == seq).First();
            //获取当前SN的扩展信息
            CurWipExt = Biz.Db.Queryable<MES_WIP_EXT>().Where(q => CurPosition.CurWipSNs.Any(w => w.SN == q.SN)).ToList();
            foreach (var wipSN in CurPosition.CurWipSNs)
            {
                assyList = setting.ITEM_CODE.JsonToObject<List<AssemblySetting>>();
            }
            catch (System.Exception ex)
            {
                var codeList = setting.ITEM_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                foreach (var code in codeList)
                if (!CurWipExt.Any(q => q.SN == wipSN.SN))
                {
                    assyList.Add(new() { ItemCode = code });
                    CurWipExt.Add(new()
                    {
                        AUTH_ORG = wipSN.AUTH_ORG,
                        AUTH_PROD = wipSN.AUTH_PROD,
                        SN = wipSN.SN,
                        WIP_ID = wipSN.ID,
                    });
                }
            }
            var codes = assyList.Select(q => q.ItemCode).ToList();
            var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            //获取上料物料的替代料
            foreach (var assy in assyList)
            {
                var info = items.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
                if (!info.IsNullOrEmpty())
                {
                    var item = new AssemblyItem
                    {
                        ItemInfo = info,
                        RuleCode = assy.RuleCode,
                        LoadQty = assy.Qty,
                    };
                    var bom = Boms.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
                    if (!bom.IsNullOrEmpty())
                    {
                        var subs = bom.SUB_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                        var surItems = Biz.Db.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
                        if (!SubItemDic.ContainsKey(assy.ItemCode))
                        {
                            SubItemDic.Add(assy.ItemCode, surItems);
                        }
                    }
                    CurAssembly.Items.Add(item);
                }
            }

            CurStep.Message = Biz.L("扫描要绑定的标签");
            CurStep.Status = StepStatus.Normal;
        }

        /// <summary>
@@ -92,8 +69,8 @@
        /// <returns></returns>
        public Locale GetBeginMsg()
        {
            var msg = new Locale("MES.WorkAction.WipExtInfo.BeginMsg", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            //var msg = new Locale($"请扫描以下需要上料的物料条码：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            var msg = new Locale("MES.WorkAction.WipExtInfo.BeginMsg", ExtInfo.FIELD_NAME);
            //var msg = new Locale($"请扫描产品[{CurPosition.CurWipSN.SN}]需要绑定的[{ExtInfo.FIELD_NAME}]标签条码");
            return msg;
        }

@@ -105,14 +82,13 @@
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            if (input.SN != CurPosition.CurWipSN.SN)
            {
                action = SaveAssembly(input, action);
                return action;
            }
            action.LocaleMsg = GetBeginMsg();

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

@@ -124,7 +100,7 @@
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            action = SaveAssembly(input, action);
            action = SaveExtInfo(input, action);
            //上料数据保存失败
            if (!action.IsSuccessed)
            {
@@ -137,91 +113,49 @@
            return action;
        }

        public ApiAction<SubmitOutput> SaveAssembly(SubmitInput input, ApiAction<SubmitOutput> action)
        public ApiAction<SubmitOutput> SaveExtInfo(SubmitInput input, ApiAction<SubmitOutput> action)
        {
            try
            {
                foreach (var item in CurAssembly.Items.Where(q => !q.IsFinished))
                var isOK = true;
                //验证扫描的条码是否SN的扩展信息的标签
                if (input.SN.IsNullOrEmpty())
                {
                    var isOK = true;
                    //根据条码规则验证上料是否正确
                    if (!item.RuleCode.IsNullOrEmpty())
                    {
                        if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
                        {
                            var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
                            if (!result.IsSuccessed)
                            {
                                isOK = false;
                            }
                        }
                        //不存在条码规则，则判断是否有自定义规则，没有则返回失败
                        else
                        {
                            switch (item.RuleCode)
                            {
                                case "自行验证":
                                    break;
                                default:
                                    isOK = false;
                                    break;
                            }
                        }
                    }
                    //验证通过则保存上料信息
                    if (isOK)
                    {
                        var record = new MES_WIP_ASSY()
                        {
                            AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                            AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                            SN = input.SN,
                            PROD_SN = CurPosition.CurWipSN.SN,
                            ITEM_CODE = item.ItemInfo.ITEM_CODE,
                            QTY = 1,
                            UNIT = item.ItemInfo.UNIT,
                            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,
                            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,
                        };
                        item.Records.Add(record);
                        if (item.Records.Sum(q => q.QTY) >= item.LoadQty)
                        {
                            item.IsFinished = true;
                        }

                        action.IsSuccessed = true;
                        action.Data.Data = CurAssembly;
                        action.LocaleMsg = new Locale($"扫描物料[{item.ItemInfo.ITEM_NAME}({item.ItemInfo.ITEM_CODE})的条码[{input.SN}]成功，请继续上料");
                        action.LocaleMsg = new Locale("MES.WorkAction.WipExtInfo.LoadSuccess", item.ItemInfo.ITEM_NAME, item.ItemInfo.ITEM_CODE);

                        //上料完成
                        if (CurAssembly.IsFinished)
                        {
                            action = End();
                        }
                        return action;
                    }
                    CurStep.Message = Biz.L("绑定失败");
                    CurStep.Status = StepStatus.Error;
                    action.Data.ShortMsg = new("绑定失败", ShortMessage.Types.Failed);
                    action.IsSuccessed = isOK = false;
                    //action.LocaleMsg = new Locale($"错误：[{ExtInfo.FIELD_NAME}]标签条码不能为空，请重新扫描");
                    action.LocaleMsg = new Locale("MES.WorkAction.WipExtInfo.SnEmptyError", ExtInfo.FIELD_NAME);
                }
                if (CurPosition.CurWipSNs.Any(w => w.SN == input.SN))
                {
                    CurStep.Message = Biz.L("绑定失败");
                    CurStep.Status = StepStatus.Error;
                    action.Data.ShortMsg = new("绑定失败", ShortMessage.Types.Failed);
                    action.IsSuccessed = isOK = false;
                    //action.LocaleMsg = new Locale($"错误：扫描到产品条码[{input.SN}]，请重新扫描[{ExtInfo.FIELD_NAME}]标签条码");
                    action.LocaleMsg = new Locale("MES.WorkAction.WipExtInfo.ScanProdSnError", input.SN, ExtInfo.FIELD_NAME);
                }

                //验证通过则保存上料信息
                if (isOK)
                {
                    CurWipExt.GetType().GetProperty($"FIELD_{ExtInfo.SEQ.ToString("00")}")?.SetValue(CurWipExt, input.SN);
                    action = End(input);
                }

                //都没有物料验证通过，则返回错误信息
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"条码[{input.SN}]验证失败，不是以下物料的条码：{string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
                action.LocaleMsg = new("MES.WorkAction.WipExtInfo.LoadFail", input.SN, string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            }
            catch (System.Exception ex)
            {
                action.CatchExceptionWithLog(ex, $"上料行为：验证条码[{input.SN}]并保存数据失败");
                CurStep.Message = Biz.L("绑定异常");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("绑定异常", ShortMessage.Types.Exception);
                action.CatchExceptionWithLog(ex, $"扩展信息绑定行为：产品[{CurPosition.CurSN}]绑定[{ExtInfo.FIELD_NAME}]标签条码[{input.SN}]保存异常");
                action.IsSuccessed = false;
                action.LocaleMsg = new($"验证条码[{input.SN}]并保存数据失败，工序已重置，请重新扫描进站产品条码");
                action.LocaleMsg = new("MES.WorkAction.WipExtInfo.SaveAssemblyException", input.SN);
                //action.LocaleMsg = new($"产品[{CurPosition.CurWipSN.SN}]绑定[{ExtInfo.FIELD_NAME}]标签条码[{input.SN}]保存异常，工序已重置，请重新扫描进站产品条码");
                action.LocaleMsg = new("MES.WorkAction.WipExtInfo.SaveExtInfoException", CurPosition.CurSN, ExtInfo.FIELD_NAME, input.SN);
                CurPosition.ResetNode();
            }
            return action;
@@ -231,60 +165,71 @@
        /// 结束执行工序行为
        /// </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 = CurAssembly.ToJson(),
                ACT_RESULT = "Y",
                TRACE_INFO = $"以下物料上料完成：{string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
            };
            var records = new List<MES_WIP_ASSY>();
            foreach (var item in CurAssembly.Items)
            {
                records.AddRange(item.Records);
                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 = CurWipExt.ToJson(),
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"产品[{CurPosition.CurSN}]绑定[{ExtInfo.FIELD_NAME}]标签条码[{CurWipExt.GetType().GetProperty($"FIELD_{ExtInfo.SEQ.ToString("00")}")?.GetValue(CurWipExt)?.ToString()}]保存成功",
                };
                wipActs.Add(wipAct);
            }

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

            IsFinished = true;
            //action.LocaleMsg = new($"以下物料上料完成：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            action.LocaleMsg = new("MES.WorkAction.WipExtInfo.LoadFinish", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            CurStep.Message = Biz.L("绑定完成");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("绑定完成", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"产品[{CurPosition.CurWipSN.SN}]绑定[{ExtInfo.FIELD_NAME}]标签条码[{CurWipExt.GetType().GetProperty($"FIELD_{ExtInfo.SEQ.ToString("00")}")?.GetValue(CurWipExt)?.ToString()}]保存成功");
            action.LocaleMsg = new("MES.WorkAction.WipExtInfo.SaveSuccess", CurPosition.CurSN, ExtInfo.FIELD_NAME, CurWipExt.GetType().GetProperty($"FIELD_{ExtInfo.SEQ.ToString("00")}")?.GetValue(CurWipExt)?.ToString());
            return action;
        }