服务端的TigerApi 框架，基于.NET6 2024 版本
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Rodney Chen
2024-12-19 eb0ad83719de660e5c4f7676aea4710625b6bd51 
 Tiger.Business.MES/WorkAction/YadaAssembly.cs


@@ -9,6 +9,7 @@


using Tiger.IBusiness.MES.WorkAction;


using Tiger.Model;


using Tiger.Model.Entitys.MES.Position;


using Tiger.Model.MES.Yada;




namespace Tiger.Business.MES.WorkAction


{


@@ -16,6 +17,7 @@


    {


        #region Propertys & Variables


        #region 固定写法，工序中的必要信息


        public DbClient MainDB { get; set; }


        public bool IsFinished { get; set; } = false;


        public IWorkStep CurStep { get; set; }


        public IPosition CurPosition { get; set; }


@@ -24,6 +26,7 @@


        #endregion


        public List<BAS_PROD_BOM> Boms { get; set; } = new();


        public AssemblyInfo CurAssembly { get; set; } = new();


        public List<mes_MOPickList> MoPickList { get; set; }


        #endregion Propertys & Variables




        #region Functions


@@ -34,6 +37,7 @@


        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)


        {


            #region 固定写法，给默认变量赋值


            MainDB = position.MainDB;


            CurStep = curStep;


            CurPosition = position;


            NodeAct = nodeAct;


@@ -41,7 +45,7 @@


            #endregion




            //获取产品BOM


            Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();


            Boms = MainDB.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();


            //获取上料物料


            var assyList = new List<AssemblySetting>();


            try


@@ -57,7 +61,7 @@


                }


            }


            var codes = assyList.Select(q => q.ITEM_CODE).ToList();


            var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();


            var items = MainDB.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();


            //获取上料物料的替代料


            foreach (var assy in assyList)


            {


@@ -74,7 +78,7 @@


                   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();


                      var surItems = MainDB.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();


                        foreach (var sub in surItems)


                        {


                            if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))


@@ -86,6 +90,11 @@


                   CurAssembly.Items.Add(item);


                }


            }


            //获取工单备料信息


            MoPickList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == CurPosition.WorkBatch.WO.ORDER_NO).ToList();




            CurStep.Message = Biz.L("扫描上料物料");


            CurStep.Status = StepStatus.Normal;


        }




        /// <summary>


@@ -153,9 +162,9 @@


                    //根据条码规则验证上料是否正确


                    if (!item.RuleCode.IsNullOrEmpty())


                    {


                        if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())


                        if (!Cache.CodeRule[item.RuleCode].IsNullOrEmpty())


                        {


                            var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);


                            var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);


                            if (!result.IsSuccessed)


                            {


                                isOK = false;


@@ -181,9 +190,9 @@


                        {


                            if (!subItem.RULE_CODE.IsNullOrEmpty())


                            {


                                if (!Biz.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())


                                if (!Cache.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())


                                {


                                    var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);


                                    var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);


                                    //只要有一个替代料通过验证则可以上料


                                    if (result.IsSuccessed)


                                    {


@@ -195,6 +204,17 @@


                            }


                        }


                    }


                    //如果当前物料存在备料表中存在推荐批次，则上料物料必须属于其推荐批次的物料


                    //var suggest = MoPickList.Where(q => q.Code == item.ItemInfo.ITEM_CODE && !q.SuggestedBatch.IsNullOrEmpty()).Select(q => q.SuggestedBatch).ToList();


                    //if (isOK && suggest.Any())


                    //{


                    //    isOK = false;


                    //    //在推荐批次所属工单的条码中存在


                    //    if (MainDB.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))


                    //    {


                    //        isOK = true;


                    //    }


                    //}


                    //验证通过则保存上料信息


                    if (isOK)


                    {


@@ -349,6 +369,7 @@


                    ACT_SN = wipSn.SN,


                    ACT_VALUE_1 = CurAssembly.ToJson(),


                    ACT_RESULT = "Y",


                    ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),


                    TRACE_INFO = $"以下物料上料完成：{string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",


                };


                wipActs.Add(wipAct);