遗留修改项

Administrator

2 天以前 e533afd765bac692ed6eb5194b44a3bf6f927f17

遗留修改项

 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs

@@ -497,6 +497,12 @@
                                }
                                var modCarPall = plcPosition.FirstOrDefault(s => s.Text == "托盘检测");
                                var (resultPall, valuePall) = modbusUtil.GetDBValue(modCarPall.PosType, modCarPall.PlcPos);
                                //var modCarju = plcPosition.FirstOrDefault(s => s.Text == "举升位置");
                                //var (resultju, valueju) = modbusUtil.GetDBValue(modCarju.PosType, modCarju.PlcPos);
                                //if (resultPall.IsSucceed && valuePall == 1  && resultPall.IsSucceed && valuePall != 1)  //1顶货 2子通道  3主通道
                                //{
                                //    break; //暂缓分配 
                                //}
                                if (resultPall.IsSucceed && valuePall  == 1)  //1有托盘 2无托盘
                                {
                                    break; //暂缓分配 

 Admin.NET/WCS.Application/Util/HttpService.cs

@@ -417,7 +417,7 @@

        var result = await url.SetHeaders(dic).SetBody(mod, "application/json", Encoding.UTF8).PostAsAsync<ResponseAgvDto>();
        Log.Information("调用AGV小车接口继续执行任务" + result.ToJson());
        return null;
        return result;
    }

    /// <summary>