服务端的TigerApi 框架，基于.NET6 2024 版本
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Ben Lin
88 分钟以前 dc1e5cd2c50bdcd712b5f95b2170bf7d421db4f0 
 Tiger.Business.MES/WorkAction/PackingAction.cs


@@ -18,6 +18,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; }


@@ -31,7 +32,7 @@


        public PackingActionOutput CurCmd { get; set; }


        public int PrintTimes = 0;


        public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();


        public List<BAS_LABEL_PV> LabelPV { get; set; } = new();


        public List<BAS_PROCESS_VAR> LabelPV { get; set; } = new();


        public int FinishLevel = 0;


        private bool IsManually => CurStep.IsNullOrEmpty();


        #endregion Propertys & Variables


@@ -48,19 +49,20 @@


            CurPosition = position;


            NodeAct = nodeAct;


            Setting = setting;


            MainDB = position.MainDB;


            #endregion




            //正常条码过站执行包装行为


            PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();


            PkgRule = MainDB.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();




            //根据行为设置获取多层包装的标签打印模板字典


            var codes = (Setting.OPTION_1 ?? "").JsonToObject<List<WipPkgItem>>() ?? new List<WipPkgItem>();


            foreach (var code in codes)


            {


                var label = code.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();


                var label = code.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();


                LabelDic.Add(code.PKG_LEVEL, label);


            }


            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();


            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();




            //如果工序上下文中没有包装记录则新建一个，有且未包装完成则获取当前的包装记录


            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)


@@ -76,7 +78,7 @@


                    RULE_CODE = PkgRule.RULE_CODE,


                    RULE_NAME = PkgRule.RULE_NAME,


                    PROD_CODE = CurPosition.WorkBatch.WO.ITEM_CODE,


                    CustSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurPosition.CurWipSNs.First().FLOW_SN).First(),


                    CustSN = MainDB.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurPosition.CurWipSNs.First().FLOW_SN).First(),


                    Item = new WipPkgItem()


                    {


                        PKG_CODE = max.PKG_CODE,


@@ -84,7 +86,7 @@


                        IS_MIN_PKG = max.PkgType.IS_MIN_PKG,


                        PKG_LEVEL = max.PKG_LEVEL,


                        PKG_QTY = max.PKG_QTY,


                        LABEL_CODE = LabelDic.Count > max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,


                        LABEL_CODE = LabelDic?.GetValueOrDefault(max.PKG_LEVEL, null)?.LABEL_CODE,//LabelDic.Count >= max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,


                        SN = CurPosition.GenerateSN(max.SN_RULE, this),


                    }


                };


@@ -100,7 +102,7 @@


                            IS_MIN_PKG = dtl.PkgType.IS_MIN_PKG,


                            PKG_LEVEL = dtl.PKG_LEVEL,


                            PKG_QTY = dtl.PKG_QTY,


                            LABEL_CODE = LabelDic.Count > dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,


                            LABEL_CODE = LabelDic.Count >= dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,


                            SN = CurPosition.GenerateSN(dtl.SN_RULE, this),


                        };


                        if (!child.IsNullOrEmpty())


@@ -125,7 +127,7 @@


            //获取是否包装完后需要称重


            CurPkg.NeedWeighing = Setting.OPTION_2 == "Y";


            //获取包装规则的称重范围


            PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();


            PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();




            CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("记录包装数据"));


        }


@@ -141,6 +143,7 @@


            CurPosition = position;


            NodeAct = null;


            Setting = null;


            MainDB = position.MainDB;


            #endregion


            //获取当前的包装记录


            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())


@@ -152,13 +155,13 @@


                throw new Exception("找不到包装数据，请重新扫描需要包装的产品");


            }


            //手动结束包装专用，临时执行行为


            PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == CurPkg.RULE_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();


            PkgRule = MainDB.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == CurPkg.RULE_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();




            //根据行为设置获取多层包装的标签打印模板字典


            LabelDic = CurPosition.Context["CurLabelDic"] as Dictionary<int, BAS_LABEL_TEMP>;


            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();


            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();


            //获取包装规则的称重范围


            PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();


            PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();


            //把




            CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("记录包装数据"));


@@ -196,6 +199,10 @@


            action.LocaleMsg = GetBeginMsg();




            var min = PkgRule.Details.OrderBy(q => q.PKG_LEVEL).First();


            if (min.PKG_LEVEL == CurPkg.Item.PKG_LEVEL)


            {


                CurPkg.Item.WipSNs = CurPosition.CurWipSNs.ToDictionary(k => k.ID, v => v.SN);


            }


            if (min.PKG_LEVEL == CurPkg.Item.PKG_LEVEL && CurPkg.NeedWeighing)


            {


                var data = new PackingActionOutput() { PkgInfo = CurPkg };


@@ -562,7 +569,7 @@


                        IsFinished = true,


                    };




                    CurPkgItem.Package = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPkgItem.SN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()


                    CurPkgItem.Package = MainDB.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPkgItem.SN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()


                    {


                        AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,


                        AUTH_PROD = CurPosition.CurLine.LINE_CODE,


@@ -571,7 +578,7 @@


                    CurPkgItem.Package.WIP_ID = CurPosition.CurWipSNs.Count == 1 ? CurPosition.CurWipSNs.First().ID : null;


                    CurPkgItem.Package.PKG_TYPE = dtl.PkgType.PKG_NAME;


                    CurPkgItem.Package.ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE;


                    CurPkgItem.Package.QTY = CurPosition.CurWipSNs.First().QTY;


                    CurPkgItem.Package.QTY = CurPosition.CurWipSNs.Sum(q => q.QTY);


                    CurPkgItem.Package.UNIT = dtl.PkgType.PKG_NAME;


                    CurPkgItem.Package.WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER;


                    CurPkgItem.Package.BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO;


@@ -631,6 +638,8 @@


                            POST_CODE = CurPkgItem.Items.First().Package.POST_CODE,


                            OPER_CODE = CurPkgItem.Items.First().Package.OPER_CODE,


                            SEGMENT = CurPkgItem.Items.First().Package.SEGMENT,


                            ACT_ID = CurPkgItem.Items.First().Package.ACT_ID,


                            ACT_NAME = CurPkgItem.Items.First().Package.ACT_NAME,


                        } : new()


                        {


                            AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,


@@ -833,6 +842,7 @@


            {


                //记录行为操作记录


                var wipActs = new List<MES_WIP_ACT>();


                var wipVars = new List<MES_WIP_ACT_VAR>();


                foreach (var wipSn in CurPosition.CurWipSNs)


                {




@@ -874,15 +884,61 @@


                        ACT_VALUE_2 = CurPkg.ToJson(),


                        ACT_VALUE_3 = CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : "",


                        ACT_VALUE_4 = "Customer",


                        ACT_VAR_DIC = CurStep.ActionDic.ToJson(),


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


                        TRACE_INFO = $"产品条码[{string.Join("，", CurPosition.CurSN)}]包装完成",


                    };


                    wipActs.Add(wipAct);


                    foreach (var item in NodeAct.Variables)


                    {


                        var wipVar = new MES_WIP_ACT_VAR()


                        {


                            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,


                            ITEM_CODE = wipSn.ITEM_CODE,


                            WORK_ORDER = wipSn.WORK_ORDER,


                            BATCH_NO = wipSn.BATCH_NO,


                            CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE,


                            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,


                            VAR_CODE = item.VAR_CODE,


                            VAR_NAME = item.VAR_NAME,


                            VAR_CONTROL = item.VAR_CONTROL,


                            VALUE_TYPE = item.VALUE_TYPE,


                            PROCESS_VAR = item.PROCESS_VAR,


                            INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),


                            TRACE_INFO = CurStep.ActionDic.ToJson(),


                        };


                        wipVars.Add(wipVar);


                    }


                }




                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值


                var _wipActs = wipActs.Clone();


                var _pkgList = CurPkg.IsFinished ? CurPosition.GetPackageList(CurPkg.Item) : new();


                var _wipVars = wipVars.Clone();


                var _pkgList = CurPkg.IsFinished ? CurPosition.GetPackageList(CurPkg.Item).Clone() : new();


                var _wipIDs = CurPkg.IsFinished ? CurPkg.Item.GetWipSnList().Select(q => q.Key).ToList().Clone() : new();


                //保存数据


                CurStep.DBSubmitAction = () =>


                {


@@ -890,11 +946,12 @@


                    if (_wipActs.Any())


                    {


                        db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();


                        db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();


                    }


                    if (_pkgList.Any())


                    {


                        db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();


                        var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();


                        //var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();


                        var nodeID = _pkgList.First().NODE_ID;


                        var actID = _pkgList.First().ACT_ID;


                        var wo = _pkgList.First().WORK_ORDER;


@@ -903,27 +960,27 @@


                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                            .SetColumns(q => q.INNER_SN == q.CARTON_SN)


                            .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)


                            .Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.ID))


                            .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.ID))


                            .ExecuteCommand();


                        //包装信息保存到生产过程记录


                        db.Updateable<MES_WIP_HIS>(CurPosition.UserCode)


                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                            .SetColumns(q => q.INNER_SN == q.CARTON_SN)


                            .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)


                            .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && wipIDs.Contains(q.WIP_ID))


                            .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && _wipIDs.Contains(q.WIP_ID))


                            .ExecuteCommand();


                        //包装信息保存到生产行为记录


                        db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)


                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                            .SetColumns(q => q.INNER_SN == q.CARTON_SN)


                            .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)


                            .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && wipIDs.Contains(q.WIP_ID))


                            .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && _wipIDs.Contains(q.WIP_ID))


                            .ExecuteCommand();


                        //包装信息保存到工单条码明细表


                        db.Updateable<BIZ_MES_WO_SN>(CurPosition.UserCode)


                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                            .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)


                            .Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.WIP_ID))


                            .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.WIP_ID))


                            .ExecuteCommand();


                    }


                };


@@ -933,6 +990,7 @@


                if (CurPkg.IsFinished)


                {


                    var _pkgList = CurPosition.GetPackageList(CurPkg.Item).Clone();


                    var _wipIDs = CurPkg.Item.GetWipSnList().Select(q => q.Key).ToList().Clone();


                    var _lastWipID = CurPosition.LastWipSNs?.FirstOrDefault()?.ID;




                    //最外层包装已经完成包装，则把工序中暂存标记设为false，统一提交包装内产品的过站记录


@@ -944,16 +1002,16 @@


                        if (_pkgList.Any())


                        {


                            db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();


                            var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();


                            var nodeID = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).NODE_ID;


                            var actID = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).ACT_ID;


                            var wo = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).WORK_ORDER;


                            //var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();


                            var nodeID = _pkgList.First(q => !q.NODE_ID.IsNullOrEmpty()).NODE_ID;


                            var actID = _pkgList.First(q => !q.ACT_ID.IsNullOrEmpty()).ACT_ID;


                            var wo = _pkgList.First(q => !q.WORK_ORDER.IsNullOrEmpty()).WORK_ORDER;


                            //包装信息保存到在制品信息表


                            db.Updateable<MES_WIP_DATA>(CurPosition.UserCode)


                                .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                                .SetColumns(q => q.INNER_SN == q.CARTON_SN)


                                .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)


                                .Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.ID))


                                .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.ID))


                                .ExecuteCommand();


                            //包装信息保存到生产过程记录


                            var endOperCode = CurPkg.IsReachedEndNode ? "EndNode" : "NotReachedEndNode";


@@ -961,14 +1019,14 @@


                                .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                                .SetColumns(q => q.INNER_SN == q.CARTON_SN)


                                .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)


                                .Where(q => q.WORK_ORDER == wo && (q.NODE_ID == nodeID || q.OPER_CODE == endOperCode) && wipIDs.Contains(q.WIP_ID))


                                .Where(q => q.WORK_ORDER == wo && (q.NODE_ID == nodeID || q.OPER_CODE == endOperCode) && _wipIDs.Contains(q.WIP_ID))


                                .ExecuteCommand();


                            //包装信息保存到生产行为记录


                            db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)


                                .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                                .SetColumns(q => q.INNER_SN == q.CARTON_SN)


                                .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)


                                .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && wipIDs.Contains(q.WIP_ID))


                                .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && _wipIDs.Contains(q.WIP_ID))


                                .ExecuteCommand();


                            db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)


                                .SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N"))


@@ -989,7 +1047,7 @@


                            db.Updateable<BIZ_MES_WO_SN>(CurPosition.UserCode)


                                .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)


                                .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)


                                .Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.WIP_ID))


                                .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.WIP_ID))


                                .ExecuteCommand();


                        }


                    });