服务端的TigerApi 框架，基于.NET6 2024 版本
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Ben Lin
2024-11-20 a96b665105c57a4ae67d286b2bb6897988ca590e 
 Tiger.Business.MES/WorkAction/PackingAction.cs


@@ -377,6 +377,7 @@


                            //最外层包装已处理完成则直接结束行为


                            if (CurPkg.Item.PKG_LEVEL == FinishLevel)


                            {


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


                                action = End(input);


                            }


                            //最外层包装未打印扫描则继续


@@ -584,7 +585,11 @@


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


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


                    CurPkgItem.Package.ACT_ID = NodeAct.ID;


                    CurPkgItem.Package.ACT_NAME = NodeAct.ACT_NAME;


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




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




                    FinishLevel++;


                    //完成包装的层级小于最外层包装层级


                    if (FinishLevel < PkgRule.Details.Max(q => q.PKG_LEVEL))


@@ -647,6 +652,7 @@


                            OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,


                            SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,


                            ACT_ID = NodeAct.ID,


                            ACT_NAME = NodeAct.ACT_NAME,


                            FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN,


                        };


                        FinishLevel++;


@@ -784,27 +790,6 @@


            return action;


        }




        public List<MES_WIP_PKG> GetMinPackageList(WipPkgItem parent)


        {


            List<MES_WIP_PKG> list = new();


            if (parent.Items.Any())


            {


                foreach (var item in parent.Items)


                {


                    item.Package.PARENT_SN = parent.Package?.SN;


                    list.AddRange(GetMinPackageList(item));


                }


            }


            else


            {


                if (!parent.Package.IsNullOrEmpty())


                {


                    list.Add(parent.Package);


                }


            }


            return list;


        }




        public ApiAction<SubmitOutput> CompletePkg()


        {


            var action = new ApiAction<SubmitOutput>(new SubmitOutput());


@@ -888,6 +873,7 @@


                        ACT_VALUE_1 = CurPkg.IsFinished ? "Y" : "N",


                        ACT_VALUE_2 = CurPkg.ToJson(),


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


                        ACT_VALUE_4 = "Customer",


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


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


                    };


@@ -896,7 +882,8 @@




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


                var _wipActs = wipActs.Clone();


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


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


                {


@@ -908,36 +895,36 @@


                    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;


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


                        db.Updateable<MES_WIP_DATA>()


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


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


                        db.Updateable<MES_WIP_HIS>()


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


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


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


                    }


                };


@@ -947,6 +934,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，统一提交包装内产品的过站记录


@@ -958,43 +946,52 @@


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


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


                            db.Updateable<MES_WIP_DATA>()


                            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";


                            db.Updateable<MES_WIP_HIS>()


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


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


                            db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)


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


                                .SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson())


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


                                .SetColumns(q => q.ACT_VALUE_4 == "Customer")


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


                                .ExecuteCommand();


                            var InStoreLabel = CurPkg.IsFinished ? CurPkg.InStoreLabel?.ToJson() : "";


                            db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)


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


                                .SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson())


                                .SetColumns(q => q.ACT_VALUE_3 == InStoreLabel)


                                .SetColumns(q => q.ACT_VALUE_4 == "InStore")


                                .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == CurPkg.InStoreActID && q.WIP_ID == _lastWipID)


                                .ExecuteCommand();


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


                            db.Updateable<BIZ_MES_WO_SN>()


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


                        }


                    });