111

lss

6 天以前 79db8fda0f71b65dfe1e1c72f307b29efc565126

 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs

@@ -1,4 +1,5 @@
using HH.WCS.JiaTong.dispatch;
using HH.WCS.JiaTong.device;
using HH.WCS.JiaTong.dispatch;
using HH.WCS.JiaTong.process;
using HH.WCS.JiaTong.util;
using HH.WCS.JiaTong.wms;
@@ -9,7 +10,9 @@
using System.Linq;
using System.Net.NetworkInformation;
using System.Security.Policy;
using System.Threading;
using System.Threading.Tasks;
using System.Web.Services.Description;
using static HH.WCS.JiaTong.api.ApiModel;
using static HH.WCS.JiaTong.util.Settings;

@@ -74,23 +77,10 @@
                        }
                        WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);

                        //物料到位通知
                        if ((TN_Task.S_TYPE == "出平库" || TN_Task.S_TYPE == "余料返回") && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
                        }
                        if ((TN_Task.S_NOTE == "出库" || TN_Task.S_NOTE == "异常库区入库") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
                        }
                        //任务回报 任务来源 1.钢丝立库  2.胶片库  3.预备库 5.mes下发

                        //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE);
                        string urlstate = Settings.tableUrls.Find(a => a.id == 4).url;
                        TaskProcess.MESReportback(TN_Task, model.state, urlstate);

                        //立库与wms任务回报
                        TableUrl url = null;
                        switch (TN_Task.Z_TYPE)
@@ -166,9 +156,22 @@
                                break;
                        }

                        //物料到位通知
                        if ((TN_Task.S_TYPE == "出平库" || TN_Task.S_TYPE == "余料返回") && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
                        }
                        if ((TN_Task.S_NOTE == "出库" || TN_Task.S_NOTE == "异常库区入库") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
                        }

                    }
                    else
                    {

                        var db = new SqlHelper<TaskAction>().GetInstance();
                        var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == model.task_no && a.N_ACTION_CODE == model.state).First();
                        if (taskAction == null)
@@ -206,6 +209,8 @@
                        {
                            LogHelper.Info($"安全请求：未找到回报地址，请检查配置文件==>{JsonConvert.SerializeObject(Settings.tableUrls)}");
                        }


                    }
                }
            }