lss
4 天以前 553f7744bedee0685635ed070a4a0e18b796238f
HH.WCS.Mobox3 - ´ó³µ¼ä/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -1,7 +1,7 @@
using HH.WCS.JiaTong.dispatch;
using HH.WCS.JiaTong.process;
using HH.WCS.JiaTong.util;
using HH.WCS.JiaTong.wms;
using HH.WCS.JiaTong_DCJ.dispatch;
using HH.WCS.JiaTong_DCJ.process;
using HH.WCS.JiaTong_DCJ.util;
using HH.WCS.JiaTong_DCJ.wms;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -10,10 +10,10 @@
using System.Net.NetworkInformation;
using System.Security.Policy;
using System.Threading.Tasks;
using static HH.WCS.JiaTong.api.ApiModel;
using static HH.WCS.JiaTong.util.Settings;
using static HH.WCS.JiaTong_DCJ.api.ApiModel;
using static HH.WCS.JiaTong_DCJ.util.Settings;
namespace HH.WCS.JiaTong.core
namespace HH.WCS.JiaTong_DCJ.core
{
    internal class WCSCore
    {
@@ -81,6 +81,38 @@
                            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;
                            }
                        }
                    }
                    else
                    {
@@ -90,10 +122,29 @@
                        {
                            WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
                        }
                        //安全请求等
                        string url = Settings.tableUrls.Find(a => a.id == 2).url;
                        string name = "Mes";
                        string url = "";
                        string name = "";
                        if (TN_Task.Z_TYPE == 1)
                        {
                            url = Settings.tableUrls.Find(a => a.id == 6).url;
                            name = "ML";
                        }
                        else if (TN_Task.Z_TYPE == 2)
                        {
                            url = Settings.tableUrls.Find(a => a.id == 7).url;
                            name = "YBK";
                        }
                        else if (TN_Task.Z_TYPE == 5)
                        {
                            url = Settings.tableUrls.Find(a => a.id == 2).url;
                            name = "Mes";
                        }
                        else
                        {
                            LogHelper.Info($"安全请求:任务类型错误,当前任务类型{TN_Task.Z_TYPE}");
                        }
                        if (!string.IsNullOrEmpty(url))
                        {
                            TaskProcess.OperateReq(model, url, TN_Task, name);