Merge branch 'wxw'

wxw

7 天以前 234c852835c5f46fc9ee3f426235fc385c990442

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

@@ -17,7 +17,7 @@
    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
    public HttpService()
    {
        var _sysConfigService = App.GetService<SysConfigService>();//todo 这里需要测试下生命周期问题
        var _sysConfigService = App.GetService<SysConfigService>();// todo 这里需要测试下生命周期问题
        Urls = _sysConfigService.GetSystemInfo().Result;
    }

@@ -64,7 +64,8 @@
                    TaskNo = result.TaskList.TaskNo,
                    Levels = 999,
                    EndLocate = result.TaskList.EndLocate,
                    EndRoadway = result.TaskList.EndRoadway
                    EndRoadway = result.TaskList.EndRoadway,
                    OrderNo=result.TaskList.OrderNo
                };

                _db.Insertable(taskAdd).ExecuteCommand();
@@ -359,8 +360,6 @@
    /// <returns></returns>
    public string BindPlnInHouseWcs(string Qty, string palletNo)
    {
        string returnStr = "";

        var model = new BindPalletModel()
        {
            BindType = "1",//申请类型
@@ -368,19 +367,10 @@
            PalletNo = palletNo,//托盘号
        };
        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
        var result = (url + "/api/DownAPi/BindPlnInHouseWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseOutPallet>().Result;
        var result = (url + "/api/DownAPi/BindPlnInHouseWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
        Log.Information("调用WMS接口反馈任务接口" + result.ToJson());

        if (result.Success == 0)
        {
            returnStr = result.TaskList.ToString();
        }
        else
        {
            returnStr = "-1:" + result.Message;
            return returnStr;
        }
        return returnStr;
        return result.Success.ToString();
    }

    /// <summary>
@@ -418,6 +408,8 @@
        Log.Information("调用WMS接口反馈拆膜异常接口" + result.ToJson());
        return result.Success.ToString();
    }

   

    /// <summary>
    /// 调用WMS接口反馈缠膜完成
@@ -483,11 +475,32 @@
        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
        var str = new
        {
            BoxNo = boxNo
            BoxNo = boxNo,
            PalletNo = "",
            TaskNo = ""
        };
        var result = (url + "/api/DownAPi/ResultBoxInfoCheckWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<RequestloadingAddre>().Result;
        var result = (url + "/api/DownAPi/ResultBoxInfoExportWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<RequestloadingAddre>().Result;
        Log.Information("调用WMS接口验证箱码是否可拣货并返回装车口:" + result.ToJson());

        return result;
    }

    /// <summary>
    /// 调用WMS接口反馈AGV可放信号
    /// </summary>
    /// <param name="taskno">任务号</param> 
    /// <param name="port">工位号</param>
    /// <returns></returns>
    public string RequesContinueAgv(string taskno,string port)
    {
        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
        var str = new
        {
            TaskNo = taskno,
            Port = port
        };
        var result = (url + "/api/DownAPi/AgcontinueTask").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
        Log.Information("调用WMS接口反馈AGV可放接口" + result.ToJson());
        return result.Success.ToString();
    }
}