服务端的TigerApi 框架，基于.NET6 2024 版本
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Rodney Chen
2024-10-11 0859eca81c7d64fbc91c49928f78b50d6271760d 
 Tiger.Business.MES/Transaction/PackingNode.cs


@@ -62,7 +62,6 @@


                //NodeSubmit：产品过站，正常产品过站逻辑


                else


                {


                    NodeCmd = "NodeSubmit";


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


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


                    {


@@ -88,7 +87,7 @@


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


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


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




@@ -110,7 +109,7 @@


                                    action.Data.OperInfo = new();


                                    action.IsSuccessed = false;


                                    //action.LocaleMsg = new($"正在包装工单批次[{0}]的产品，请先完成当前包装后再扫描其他批次[{1}]的产品[{2}]");


                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.BatchError", (Context["CurPackage"] as WipPkg).WorkBatch, wosns.First().Batch.BATCH_NO, CurSN);


                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.BatchError", (Context["CurPackage"] as WipPkg).WorkBatch, wosns.First().Batch.BATCH_NO, input.SN);


                                    return action;


                                }


                                if (wosns.First().Batch.ACT_LINE != CurLine.LINE_CODE)


@@ -126,8 +125,8 @@


                                   if (CurBatch?.Batch?.ORDER_NO != wosns.First().Batch.ORDER_NO)


                                   {


                                       //条码已绑定的工单不等于当前工单则重新选择工单


                                       var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO });


                                       if (!result.IsSuccessed)


                                       var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO }, wosns.First().Batch.BATCH_NO);


                                        if (!result.IsSuccessed)


                                       {


                                            action.Data.ShortMsg = new("工单异常", ShortMessage.Types.Error);


                                            action.Data.OperInfo = new();


@@ -253,12 +252,23 @@


            var curNode = CurBatch.GetNode(PostCode);


            try


            {


                //工序节点逻辑增加如果根基当前岗位找不到对应工序的时候要报错


                if (curNode.IsNullOrEmpty())


                {


                    action.Data.ShortMsg = new("未知工序", ShortMessage.Types.Error);


                    action.IsSuccessed = false;


                    //action.LocaleMsg = new($"岗位[{0}]在工单[{1}]工艺路线中找不到对应的工序，请检查工单工艺路线中工序与岗位的绑定关系是否正确");


                    action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);


                    return action;


                }


                var curNodeSetting = CurBatch.GetNodeSetting(curNode);




                //当工步列表为空，则执行当前工序的必要逻辑当作第一个工序节点，完成后按需求创建后续的工步列表


                if (Steps.IsNullOrEmpty())


                {


                    BeginAt = DateTime.Now;


                    //判断工单实时状态判断是否可以生产


                    var woStatus = CurBatch.CheckCanProduce(curNode);


                    var woStatus = CurBatch.CheckCanProduce(curNode, curNodeSetting);


                    if (!woStatus.IsSuccessed)


                    {


                        woStatus.Data.ShortMsg = new("工单异常", ShortMessage.Types.Error);


@@ -319,10 +329,13 @@


                        return canGotoNext;


                    }




                    //设置当前指令为正常产品过站


                    NodeCmd = "NodeSubmit";




                    //绑定条码到工单


                    foreach (var wipSN in wipSNs)


                    {


                        if (!CurBatch.WoSNs.Any(q => q.SN == wipSN.SN))


                        if (!CurBatch.WoSNs.Any(q => q.WIP_ID == wipSN.ID))


                        {


                            CurBatch.WoSNs.Add(new()


                            {


@@ -337,7 +350,7 @@


                    }




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


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


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


                    foreach (var woSN in woSNs)


                    {


                        woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;


@@ -369,17 +382,17 @@


                          wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;


                        }


                        //如果是投入站


                        if (curNode.IS_INPUT == "Y")


                        if (curNodeSetting.IS_INPUT == "Y")


                        {


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


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


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


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


                            wipSN.INLINE_DATE = DateTime.Now;


                        }


                        //如果是产出站


                        if (curNode.IS_OUTPUT == "Y")


                        if (curNodeSetting.IS_OUTPUT == "Y")


                        {


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


                            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.OUTLINE_DATE = DateTime.Now;


@@ -449,7 +462,7 @@


                    var _wipSns = wipSNs.Clone();


                    var _wipHiss = CurWipSNHiss.Clone();


                    var _defect = CurDefects.Clone();


                    var _curNode = curNode.Clone();


                    var _curNodeSetting = curNodeSetting.Clone();


                    var _Batch = CurBatch.Batch.Clone();




                    //初始化工步列表


@@ -474,13 +487,13 @@


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


                            }


                            //如果是投入站


                            if (_curNode.IS_INPUT == "Y")


                            if (_curNodeSetting.IS_INPUT == "Y")


                            {


                                db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();


                                db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();


                            }


                            //如果是产出站


                            if (_curNode.IS_OUTPUT == "Y")


                            if (_curNodeSetting.IS_OUTPUT == "Y")


                            {


                                db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();


                                db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();


@@ -591,7 +604,7 @@


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


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


            action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale));


            action.Data.ShortMsg = new("过站成功", ShortMessage.Types.Success);


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


            //action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");


            action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME,CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());


            


@@ -611,18 +624,15 @@


            try


            {


                //PkgSubmit：手动结束包装，保存暂存的包装数据


                if (NodeCmd.IsNullOrEmpty("PkgSubmit") == "PkgSubmit")


                if (NodeCmd.IsNullOrEmpty("PkgSubmit") == "PkgSubmit" || CurWipSNs.IsNullOrEmpty())


                {


                    if (Context.ContainsKey("CurPackage"))


                    {


                        var CurPkg = Context["CurPackage"] as WipPkg;


                        int shipQty = input.Data.ToInt32();


    


                        NodeCmd = "PkgSubmit";




                        TempPkgAction = new PackingAction();


                        TempPkgAction.Init(this);




                        var CurPkg = Context["CurPackage"] as WipPkg;


                        int shipQty = input.Data.ToInt32();


                        int curQty = CurPkg.Item.TotalQty;


                        int ruleQty = TempPkgAction.PkgRule.GetTotalQty();


                        //有填出货数量则验证当前包装数量必须等于（出货数量/包装规则数量）的余数


@@ -633,6 +643,8 @@


                            action.LocaleMsg = new("MES.Transaction.PackingNode.NotMatchShipQty", shipQty, curQty, shipQty % ruleQty); 


                            return action;


                        }




                        NodeCmd = "PkgSubmit";


                        action = TempPkgAction.Submit(null);


                    }


                    else


@@ -660,6 +672,7 @@


            catch (Exception ex)


            {


                action.CatchExceptionWithLog(ex, $"包装工序：手动结束包装异常");


                NodeCmd = null;


            }


            return action;


        }