Merge branch 'csc'

chengsc

2 天以前 969aafa8bd335025da4caf5939a1626bad4f4236

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

@@ -37,6 +37,62 @@
        };
    }

    /// <summary>
    /// 调用WMS接口申请叠托机空托入库接口
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
    public string RequestLiKuPallet(NullPallInRequest model)
    {
        string returnStr = "";

        var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == model.PalletNo);

        if (task == null)
        {
            string url = Urls.WMSAddress + ":" + Urls.WMSPort;
            var result = (url + "/api/DownAPi/RequestPalletIn").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
            Log.Information("调用WMS接口反馈空托入库任务接口" + result.ToJson());
            if (result.Success == 0)
            {

                var taskAdd = new WcsTask()
                {
                    TaskType = TaskTypeEnum.In,
                    Status = TaskStatusEnum.Wait,
                    Type = PLCTypeEnum.AGV,
                    Origin = "WMS",

                    Qty = result.TaskList.Qty,
                    PalletNo = model.PalletNo,
                    TaskNo = result.TaskList.TaskNo,
                    Levels = 999,

                    StartLocate = model.Locate,
                    StartRoadway = result.TaskList.StartRoadway,
                    EndLocate = result.TaskList.EndLocate,
                    EndRoadway = result.TaskList.EndRoadway,
                    TaskId = FourWayCarUtil.GetTaskId()
                };

                _db.Insertable(taskAdd).ExecuteCommand();
                
                returnStr = result.TaskList.EndLocate;

            }
            else
            {
                returnStr = "-1:" + result.Message;
                return returnStr;
            }
        }
        else
        {
            returnStr = task.EndLocate; 
        }

        return returnStr;
    }

    /// <summary>
    /// 调用WMS接口申请巷道接口
@@ -332,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;
@@ -361,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>