Merge branch 'csc'

chengsc

2 天以前 969aafa8bd335025da4caf5939a1626bad4f4236

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

@@ -60,9 +60,10 @@
                {
                    TaskType = TaskTypeEnum.In,
                    Status = TaskStatusEnum.Wait,
                    Type = PLCTypeEnum.ConveyorLine,
                    Type = PLCTypeEnum.AGV,
                    Origin = "WMS",
                    

                    Qty = result.TaskList.Qty,
                    PalletNo = model.PalletNo,
                    TaskNo = result.TaskList.TaskNo,
                    Levels = 999,
@@ -387,7 +388,7 @@
            {"X-lr-request-id",requestId },
            {"X-lr-version","4.2" },
        };

        Log.Information("调用AGV小车接口下发任务记录" + mod.ToJson());
        var result = await url.SetHeaders(dic).SetBody(mod, "application/json", Encoding.UTF8).PostAsAsync<ResponseAgvDto>();
        Log.Information("调用AGV小车接口下发任务" + result.ToJson());
        return result;
@@ -416,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>