优化

lss

3 天以前 9cba325e0d7c30644606e63e5df01faba0c42038

 HH.WCS.Mobox3 - ´ó³µ¼ä/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs

@@ -74,45 +74,42 @@
                        }
                        WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);

                        //任务回报  5.mes下发
                        if (TN_Task.Z_TYPE == 5)
                        {
                            //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE);
                            string urlstate = Settings.tableUrls.Find(a => a.id == 1).url;
                            TaskProcess.MESReportback(TN_Task, model.state, urlstate);
                        }
                        else
                        {
                            //立库与wms任务回报
                            TableUrl url = null;
                            switch (TN_Task.Z_TYPE)
                            {

                                case 1:
                                    url = Settings.tableUrls.Find(a => a.id == 4);
                                    if (url != null)
                                    {
                                        TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "ML");
                                    }
                                    else
                                    {
                                        LogHelper.Info("原材料任务回报，根据id=1未找到地址配置文件，请检查配置文件");
                                    }
                                    break;
                                case 2:
                                    url = Settings.tableUrls.Find(a => a.id == 5);
                                    if (url != null)
                                    {
                                        TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "YBK");
                                    }
                                    else
                                    {
                                        LogHelper.Info("原材料任务回报，根据id=9未找到地址配置文件，请检查配置文件");
                                    }
                                    break;
                              
                            }
                        //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE);
                        string urlstate = Settings.tableUrls.Find(a => a.id == 1).url;
                        TaskProcess.MESReportback(TN_Task, model.state, urlstate);


                        //立库与wms任务回报
                        TableUrl url = null;
                        switch (TN_Task.Z_TYPE)
                        {

                            case 1:
                                url = Settings.tableUrls.Find(a => a.id == 4);
                                if (url != null)
                                {
                                    TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "ML");
                                }
                                else
                                {
                                    LogHelper.Info("原材料任务回报，根据id=1未找到地址配置文件，请检查配置文件");
                                }
                                break;
                            case 2:
                                url = Settings.tableUrls.Find(a => a.id == 5);
                                if (url != null)
                                {
                                    TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "YBK");
                                }
                                else
                                {
                                    LogHelper.Info("原材料任务回报，根据id=9未找到地址配置文件，请检查配置文件");
                                }
                                break;

                        }

                    }
                    else
                    {
@@ -144,7 +141,7 @@
                        {
                            LogHelper.Info($"安全请求：任务类型错误,当前任务类型{TN_Task.Z_TYPE}");
                        }
                       

                        if (!string.IsNullOrEmpty(url))
                        {
                            TaskProcess.OperateReq(model, url, TN_Task, name);
@@ -180,7 +177,7 @@
                        {
                            var AreaCodes = AreasByGroup.Select(a => a.S_CODE).ToList();
                            LogHelper.Info($"任务{mst.S_CODE},根据终点区域获取库区编码：{JsonConvert.SerializeObject(AreaCodes)}");
                            var updateMst = db.Queryable<WCSTask>().Where(a => AreaCodes.Contains(a.S_END_AREA.Trim()) && a.S_B_STATE == "等待推送").OrderBy(a=>a.T_CREATE).First();
                            var updateMst = db.Queryable<WCSTask>().Where(a => AreaCodes.Contains(a.S_END_AREA.Trim()) && a.S_B_STATE == "等待推送").OrderBy(a => a.T_CREATE).First();
                            updateMst.S_B_STATE = "等待";
                            db.Updateable(updateMst).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
                        }
@@ -222,15 +219,18 @@
            {
                list.ForEach(task =>
                {

                    if (TaskProcess.Intercept(task))
                    {
                        //使用自定义任务推送
                        TaskProcess.SendTask(task);
                    }
                    LogHelper.Info($"任务推送数据：{JsonConvert.SerializeObject(task)}");
                    //if (TaskProcess.Intercept(task))
                    // {
                    //使用自定义任务推送
                    TaskProcess.SendTask(task);
                //    }

                });
            }
            else {
                Console.WriteLine($"无可推送任务");
            }
        }

        /// <summary>