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


@@ -11,6 +11,8 @@


using Tiger.Model;


using Tiger.Model.Entitys.MES.Position;


using Tiger.Business.MES.WorkAction;


using Tiger.Model.MES.Yada;


using System.Data;




namespace Tiger.Business.MES.Transaction


{


@@ -37,6 +39,8 @@


        public PackingAction TempPkgAction { get; set; }


        public bool IsPrintCustomerLabel { get; set; }


        public string ShippingOrder { get; set; }


        public DateTime curtime = DateTime.Now;


        public DateTime prevtime = DateTime.Now;


        #endregion Propertys & Variables




        #region Functions


@@ -47,6 +51,7 @@


        /// <returns></returns>


        public async Task<ApiAction<SubmitOutput>> Submit(SubmitInput input)


        {


            ConsoleExt.WriteLine($"{curtime = prevtime = DateTime.Now:HH:mm:ss} ***** 1 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


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


            try


            {


@@ -64,10 +69,11 @@


                {


                    IsPrintCustomerLabel = input.Options["IsPrintCustomerLabel"].ToBoolean();


                }


                if (input.Options.ContainsKey("ShippingOrder"))


                {


                    ShippingOrder = IsPrintCustomerLabel ? input.Options["ShippingOrder"].ToString() : "";


                }


          


                //if (input.Options.ContainsKey("ShippingOrder"))


                //{


                //    ShippingOrder = IsPrintCustomerLabel ? input.Options["ShippingOrder"].ToString() : "";


                //}


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


                if (NodeCmd == "PkgSubmit")


                {


@@ -88,13 +94,13 @@


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




                        ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 2 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


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


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


                        {


                            //更新CurBatch


                            CurBatch?.Update();




                            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 3 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


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


                            {


@@ -108,6 +114,7 @@


                            {


                                //提交数据


                                action = NodeSubmit(action, input);


                                ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 4 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                                //更新工序信息


                                if (!action.IsSuccessed)


                                {


@@ -228,20 +235,23 @@


                    {


                        //更新CurBatch


                        CurBatch?.Update();




                        ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 5 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                        var submitStep = Steps.Where(q => q.ID == input.CurStepID && !q.IsFinished).FirstOrDefault();


                        //如果客户端返回的当前工步ID找不到未完成的行为工步，则直接开始下一个行为工步


                        if (submitStep.IsNullOrEmpty())


                        {


                            action = BeginNextActionStep(input);


                            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 6 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                        }


                        else


                        {


                            action = submitStep.Submit(input);


                            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 7 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                            //如果当前工步已完成，开始执行下一工步


                            if (action.IsSuccessed && submitStep.IsFinished)


                            {


                                action = BeginNextActionStep(input);


                                ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 8 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                            }


                            //如果当前工步未完成


                            else


@@ -286,6 +296,7 @@


                //action.CatchExceptionWithLog(ex, $"包装工序：提交操作数据异常");


                action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));


            }


            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 9 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


            return action;


        }




@@ -297,6 +308,7 @@


        /// <returns></returns>


        public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)


        {


            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 10 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


            var curNode = CurBatch.GetNode(PostCode);


            try


            {


@@ -380,7 +392,22 @@




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


                    NodeCmd = "NodeSubmit";




                    ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 11 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                    //获取出货状态


                    DbClient db = Biz.DataSource["YadaU9C"].Client;


                    var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc == CurBatch.WO.ORDER_NO && q.Status == 2 && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now)).First();


                    if (ship.IsNullOrEmpty()) { IsPrintCustomerLabel = false; } else


                    {


                        SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { BATCH = CurBatch.Batch.BATCH_NO, NodeIdOrName = curNode.NODE_NAME });


                        var list = Biz.Db.Ado.UseStoredProcedure().GetDataTable("SP_MES_GET_NODE_BATCH_COUNT", pars).AsEnumerable().ToList();


                        if (!list.IsNullOrEmpty())


                        {


                            var batchCount = list.Where(q => q["ProdDate"].ToString() == "Whole").FirstOrDefault();


                            IsPrintCustomerLabel = batchCount.IsNullOrEmpty() ? false : batchCount["WaitShipment"].ToInt32() >= ship.ShipQty ? false : true;


                        }


                    }


                    ShippingOrder = IsPrintCustomerLabel ? ship?.ShipDoc ?? "" : "";


                    ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 12 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                    //绑定条码到工单


                    foreach (var wipSN in wipSNs)


                    {


@@ -424,6 +451,7 @@


                        wipSN.SEGMENT = curNode.SEGMENT;


                        wipSN.OPERATION_TIME = DateTime.Now;


                        wipSN.SHIPPING_ORDER = ShippingOrder;


                        wipSN.UNBIND_FLAG = "N";


                        var curShiftPeriod = GetShiftPeriodForNow();


                        if (!curShiftPeriod.IsNullOrEmpty())


                        {


@@ -523,6 +551,7 @@


                    var _curNodeSetting = curNodeSetting.Clone();


                    var _Batch = CurBatch.Batch.Clone();




                    ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 13 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


                    //初始化工步列表


                    Steps.Clear();


                    var curStep = new WorkStep(IWorkStep.NodeTypes.Node, this)


@@ -646,6 +675,7 @@


                //action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}：工序节点工步提交数据异常，请检查工序节点设置");


                action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmitException", curNode.NODE_NAME));


            }


            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 13.1 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;


            return action;


        }




@@ -659,6 +689,7 @@


            var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;


            var operInfo = SetOperNodeInfo(CurOperInfo(locale));


            Action endAction = null;


            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 14 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;




            //如果当前条码已经走到流程终点则记录条码完工


            if (operInfo.IsReachedEndNode)


@@ -698,7 +729,8 @@


                var _woSns = woSNs.Clone();


                var _wipSns = CurWipSNs.Clone();


                var _wipHiss = wipHiss.Clone();


                var _pkgList = curPkg?.IsFinished == true ? GetPackageList(curPkg.Item) : new();


                var _pkgList = curPkg?.IsFinished == true ? GetPackageList(curPkg.Item).Clone() : new();


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


                //保存数据


                endAction = () =>


                {


@@ -710,14 +742,14 @@


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


                    if (_pkgList.Any())


                    {


                        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 wo = _pkgList.First().WORK_ORDER;


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


                        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)


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


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


                            .ExecuteCommand();


                    }


                };


@@ -725,6 +757,7 @@




            //保存数据库


            SaveStepsCommitActionToDB(endAction);


            ConsoleExt.WriteLine($"{curtime = DateTime.Now:HH:mm:ss} ***** 15 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;




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


            operInfo.InputQty += CurWipSNs.Count;


@@ -834,7 +867,7 @@


                        TempPkgAction.Init(this);




                        int shipQty = input.Data.ToInt32();


                        int curQty = CurPkg.Item.TotalQty;


                        double curQty = CurPkg.Item.TotalQty;


                        int ruleQty = TempPkgAction.PkgRule.GetTotalQty();


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


                        if (shipQty > 0 && curQty != shipQty % ruleQty)