11

jinxin

2025-06-23 12e8eef9decf2a15868ed2f693f89db4bbb6172e

11

 C#/HH.WCS.Mobox3.YNJuXing/core/Monitor.cs

@@ -724,7 +724,6 @@

        internal static void ErrorTask()
        {
            LogHelper.Info($"任务自动回报");
            try
            {
                var db = new SqlHelper<object>().GetInstance();

 C#/HH.WCS.Mobox3.YNJuXing/process/TaskProcess.cs

@@ -503,64 +503,65 @@
            var to = task.S_END_LOC;
            //var from = LocationHelper.GetAgvSite(task.S_START_LOC).ToString();
            //var to = LocationHelper.GetAgvSite(task.S_END_LOC).ToString();
            //var db = new SqlHelper<object>().GetInstance();
            //var Url = Settings.ExtendParamSettings.Where(a => a.ExtendNo == "6" && a.Enable == "1").FirstOrDefault();
            //if (Url != null)
            //{
            //    var agvbit = db.Queryable<PeiZhi>().Where(a => a.BITCODE == task.S_START_LOC || a.BITCODE == task.S_END_LOC).ToList();
            //
            //    foreach (var item in agvbit)
            //    {
            //        if (item.BITCODE == task.S_START_LOC)
            //        {
            //            from = item.PLCLOCATION;
            //        }
            //        else
            //        {
            //            to = item.PLCLOCATION;
            //        }
            //    }
            //
            //
            //    var endInfo = Settings.InOutLocations.Where(a => a.Location == task.S_END_LOC).FirstOrDefault();
            //    if (endInfo != null)
            //    {
            //        to = endInfo.Code;
            //    }
            //
            //    var model = new PlcSendTaskreq
            //    {
            //        contNo = task.S_CNTR_CODE,
            //        contType = task.S_SRC_SYS == Settings.JXCODE ? "巨星" : task.S_SRC_SYS == Settings.JWCODE ? "巨沃" : task.S_SRC_SYS == Settings.GLCODE ? "管理" : "",
            //        frmPos = from,
            //        toPos = to,
            //        requestPk = task.S_CODE,
            //        trkPrty = task.N_PRIORITY.ToString(),
            //        trkType = task.S_TYPE == "入库" ? "1" : task.S_TYPE == "出库" ? "2" : "3"
            //    };
            //    var feed = httpHelper.WebPost(Url.ExtendParam + "receive", JsonConvert.SerializeObject(model));
            //    LogHelper.Info($"任务{task.S_CODE} 推送任务参数={JsonConvert.SerializeObject(model)} 下游反馈={feed}");
            //    if (!string.IsNullOrEmpty(feed))
            //    {
            //        var res = JsonConvert.DeserializeObject<PlcSendTaskres>(feed);
            //        if (res.code == "0")
            //        {
            var db = new SqlHelper<object>().GetInstance();
            var Url = Settings.ExtendParamSettings.Where(a => a.ExtendNo == "6" && a.Enable == "1").FirstOrDefault();
            if (Url != null)
            {
                var agvbit = db.Queryable<PeiZhi>().Where(a => a.BITCODE == task.S_START_LOC || a.BITCODE == task.S_END_LOC).ToList();

                foreach (var item in agvbit)
                {
                    if (item.BITCODE == task.S_START_LOC)
                    {
                        from = item.PLCLOCATION;
                    }
                    else
                    {
                        to = item.PLCLOCATION;
                    }
                }


                var endInfo = Settings.InOutLocations.Where(a => a.Location == task.S_END_LOC).FirstOrDefault();
                if (endInfo != null)
                {
                    to = endInfo.Code;
                }

                var model = new PlcSendTaskreq
                {
                    contNo = task.S_CNTR_CODE,
                    contType = task.S_SRC_SYS == Settings.JXCODE ? "巨星" : task.S_SRC_SYS == Settings.JWCODE ? "巨沃" : task.S_SRC_SYS == Settings.GLCODE ? "管理" : "",
                    frmPos = from,
                    toPos = to,
                    requestPk = task.S_CODE,
                    trkPrty = task.N_PRIORITY.ToString(),
                    trkType = task.S_TYPE == "入库" ? "1" : task.S_TYPE == "出库" ? "2" : "3"
                };
                var feed = httpHelper.WebPost(Url.ExtendParam + "receive", JsonConvert.SerializeObject(model));
                LogHelper.Info($"任务{task.S_CODE} 推送任务参数={JsonConvert.SerializeObject(model)} 下游反馈={feed}");
                if (!string.IsNullOrEmpty(feed))
                {
                    var res = JsonConvert.DeserializeObject<PlcSendTaskres>(feed);
                    if (res.code == "0")
                    {
                        task.N_B_STATE = 1;
                        WCSHelper.UpdateStatus(task, "已推送");
            //            TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "8", "", task);
            //            TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "Y", "", task, false);
            //        }
            //        else
            //        {
            //            LogHelper.Info($"任务{task.S_CODE} 推送失败");
            //            //TaskProcess.ThirdReportStatus(task.S_SRC_NO, "", "7", "", task);
            //        }
            //    }
            //
            //}
            //else
            //{
            //    LogHelper.Info($"推送下游PLC任务 获取API地址配置失败 请检查配置文件");
            //}
                        TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "8", "", task);
                        TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "Y", "", task, false);
                    }
                    else
                    {
                        LogHelper.Info($"任务{task.S_CODE} 推送失败");
                        //TaskProcess.ThirdReportStatus(task.S_SRC_NO, "", "7", "", task);
                    }
                }

            }
            else
            {
                LogHelper.Info($"推送下游PLC任务 获取API地址配置失败 请检查配置文件");
            }

        }