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


@@ -65,32 +65,46 @@


                    //工步列表为空或者工序节点工步有未完成时，优先完成工序节点工步


                    if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)


                    {




                        var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))


                                            .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())


                                            .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();




                        //先判断当前工单不为空且当前岗位在当前工单是不是首站，如果是则不允许变更当前工单，尝试把条码绑定到当前工单


                        if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))


                        {


                            //更新CurBatch


                            CurBatch?.Update();


                            //提交数据


                            action = NodeSubmit(action, input);


                            //更新工序信息


                            if (!action.IsSuccessed)




                            var wosn = wosns.FirstOrDefault(q => q.Batch.ORDER_NO == CurBatch.WO.ORDER_NO && (q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Finished.GetValue() || q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Scrap.GetValue()));


                            if (!wosn.IsNullOrEmpty())


                            {


                                var info = WoContext.GetSnOperInfo(input.SN).Data;


                                info.InputQty = CurOperInfo(input.Locale).InputQty;


                                action.Data.OperInfo = info;


                                action.Data.ShortMsg = new($"产品{wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);


                                action.Data.OperInfo = new();


                                action.IsSuccessed = false;


                                //action.LocaleMsg = new($"进站扫描错误，条码[{0}]{1}", input.SN);


                                action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.SnStatusError", input.SN, wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());


                            }


                            else if (Steps.Any() && !IsFinishAllSteps)


                            else


                            {


                                action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));


                                //提交数据


                                action = NodeSubmit(action, input);


                                //更新工序信息


                                if (!action.IsSuccessed)


                                {


                                    var info = WoContext.GetSnOperInfo(input.SN).Data;


                                    info.InputQty = CurOperInfo(input.Locale).InputQty;


                                    action.Data.OperInfo = info;


                                }


                                else if (Steps.Any() && !IsFinishAllSteps)


                                {


                                    action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));


                                }


                            }


                        }


                        //当前岗位在当前工单不是首站，则查找条码已绑定的工单当作当前工单


                        else


                        {


                            var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))


                                                .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())


                                                .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();




                            //查找到条码已绑定的工单


                            if (wosns.Any(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()))


                            {


@@ -290,7 +304,7 @@


                        return woStatus;


                    }




                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).ToList();


                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();


                    if (wipSNs.IsNullOrEmpty())


                    {


                        var wipSN = new MES_WIP_DATA()


@@ -308,6 +322,7 @@


                            HOLD_FLAG = "N",


                            REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",


                            FINISHED_FLAG = "N",


                            UNBIND_FLAG = "N",


                            INV_FLAG = "N",


                            DFT_FLAG = "N",


                            DFT_COUNT = 0,


@@ -388,6 +403,7 @@


                        wipSN.POST_CODE = CurPosition.POST_CODE;


                        wipSN.OPER_CODE = curNode.OPER_CODE;


                        wipSN.SEGMENT = curNode.SEGMENT;


                        wipSN.UNBIND_FLAG = "N";


                        wipSN.OPERATION_TIME = DateTime.Now;


                        var curShiftPeriod = GetShiftPeriodForNow();


                        if (!curShiftPeriod.IsNullOrEmpty())


@@ -409,7 +425,7 @@


                        {


                            var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);


                            woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();


                            wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();


                            wipSN.STATUS = MES_WIP_DATA.STATUSs.Output.GetValue();


                            wipSN.OUTLINE_DATE = DateTime.Now;


                        }


                        //如果有提交不良


@@ -455,8 +471,16 @@


                                OBA_BATCH = wipSN.OBA_BATCH,


                                LOCK_BATCH = wipSN.LOCK_BATCH,


                            };


                            wipSN.Defects.Add(defect);


                            CurDefects.Add(defect);


                        }


                    }




                    //产品被判断不良后下线，并从工单中移除正在生产的条码


                    if (CurDefects.Any() && curNodeSetting.IF_DFT_OFFLINE == "Y")


                    {


                        woStatus.Data.ShortMsg = new("产品下线", ShortMessage.Types.Error);


                        return OfflineIfDefect(action, wipSNs, input.Locale);


                    }




                    //工单开工


@@ -635,7 +659,7 @@


                //条码完工


                foreach (var wipSN in CurWipSNs)


                {


                    wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();


                    wipSN.FINISHED_FLAG = "Y";


                    wipSN.NODE_ID = curNode.ID;


                    wipSN.NODE_NAME = curNode.NODE_NAME;


                    wipSN.OPER_CODE = curNode.OPER_CODE;


@@ -670,7 +694,7 @@


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


                        var wo = _pkgList.First().WORK_ORDER;


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


                        db.Updateable<MES_WIP_HIS>()


                        db.Updateable<MES_WIP_HIS>(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)


@@ -684,7 +708,7 @@


            SaveStepsCommitActionToDB(endAction);




            //保存成功，返回过站消息


            CurOperInfo(locale).InputQty += CurWipSNs.Count;


            operInfo.InputQty += CurWipSNs.Count;


            action.Data.Data = new PackingActionOutput() { PkgInfo = curPkg };


            action.Data.OperInfo = operInfo;


            action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "不良过站" : "良品过站", ShortMessage.Types.Success);


@@ -704,6 +728,75 @@


        }




        /// <summary>


        /// 产品被判断不良后下线


        /// </summary>


        /// <param name="action"></param>


        /// <returns></returns>


        public ApiAction<SubmitOutput> OfflineIfDefect(ApiAction<SubmitOutput> action, List<MES_WIP_DATA> wipSNs, string locale)


        {


            var operInfo = SetOperNodeInfo(CurOperInfo(locale));


            operInfo.CurNode = wipSNs.FirstOrDefault()?.NODE_NAME;


            operInfo.NextNode = "下线退库";




            //更新工单条码明细信息


            var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList();


            foreach (var woSN in woSNs)


            {


                woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Offline.GetValue();


            }




            //条码下线


            foreach (var wipSN in wipSNs)


            {


                wipSN.STATUS = MES_WIP_DATA.STATUSs.Offline.GetValue();


                wipSN.UNBIND_FLAG = "Y";


            }




            var wipHiss = new List<MES_WIP_HIS>();


            foreach (var wipSN in wipSNs)


            {


                var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]工序[{wipSN.NODE_NAME}]因不良[{wipSN.Defects.FirstOrDefault()?.DFT_NAME}]下线（TransId： {TransID} ）");


                wipSN.History.Add(his);


                wipHiss.Add(his);


            }




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


            var _woSns = woSNs.Clone();


            var _wipSns = wipSNs.Clone();


            var _wipHiss = wipHiss.Clone();


            var _defect = CurDefects.Clone();


            //使用统一的事务DB对象


            var db = GetCommitDB();


            //保存数据库


            var dbTran = db.UseTran(() =>


            {


                //数据保存逻辑


                db.Storageable(_woSns, UserCode).ExecuteCommand();


                db.Storageable(_wipSns, UserCode).ExecuteCommand();


                db.Storageable(_wipHiss, UserCode).ExecuteCommand();


                db.Storageable(_defect, UserCode).ExecuteCommand();


            });


            if (!dbTran.IsSuccess)


            {


                //抛出异常


                throw dbTran.ErrorException;


            }




            //从工单中移除正在生产的条码


            CurBatch.RemoveWipSn(wipSNs, UserCode);




            //保存成功，返回过站消息


            action.Data.OperInfo = operInfo;


            action.Data.ShortMsg = new("下线退库", ShortMessage.Types.Warning);


            //action.LocaleMsg = new($"工单[0]的条码[1]在岗位[2]工序[3]因不良[4]下线，状态[5]");


            action.LocaleMsg = new("MES.Transaction.TestNode.OfflineIfDefect", wipSNs.First().WORK_ORDER, CurSN, wipSNs.First().POST_CODE, wipSNs.First().NODE_NAME, wipSNs.First().Defects.FirstOrDefault()?.DFT_NAME, wipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());




            //重置工序


            ResetNode();


            return action;


        }




        /// <summary>


        /// 包装工序：手动结束包装


        /// </summary>


        /// <returns></returns>