修改接口

liudl

2025-02-16 ddd9612ed7cefe12c8ea33ced0711a0b9a3feb99

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

@@ -35,7 +35,7 @@
    public string RequestRoadWay(string palletNo, string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
    {
        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 == palletNo);

@@ -49,11 +49,11 @@
            };

            string url = Urls.WMSAddress + ":" + Urls.WMSPort;
            var result =  (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
            var result = (url + "/api/DownAPi/RequestRoadWay").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,
@@ -66,12 +66,12 @@
                    EndLocate = result.TaskList.EndLocate,
                    EndRoadway = result.TaskList.EndRoadway
                };
                

                _db.Insertable(taskAdd).ExecuteCommand();
                endLocat = result.TaskList.EndRoadway;
                taskNo = result.TaskList.TaskNo;
                returnStr = result.TaskList.EndLocate;
                

            }
            else
            {
@@ -95,7 +95,7 @@
    /// 调用WMS接口自动码垛绑定信息返回巷道口
    /// </summary>
    /// <returns></returns>
    public string BindRequestRoadWay(string orderNo, string palletNo,decimal qty ,string type,string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
    public string BindRequestRoadWay(string orderNo, string palletNo, decimal qty, string type, string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
        string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
    {
        string returnStr = "";
@@ -105,17 +105,17 @@
        {
            var model = new BoxPalletBindVm()
            {
                OrderCode= "",//暂无上游系统编号
                AsnNo= orderNo,
                AsnDetailNo=0,//暂无入库单明细编号，WMS根据物料批次查找
                PalletNo=palletNo,
                Qty= qty,
                Type=type,
                SkuNo=skuNo,
                LotNo= lotNo,
                LotText= lotText,
                SupplierLot= supplierLot,
                Detail=detail
                OrderCode = "",//暂无上游系统编号
                AsnNo = orderNo,
                AsnDetailNo = 0,//暂无入库单明细编号，WMS根据物料批次查找
                PalletNo = palletNo,
                Qty = qty,
                Type = type,
                SkuNo = skuNo,
                LotNo = lotNo,
                LotText = lotText,
                SupplierLot = supplierLot,
                Detail = detail
            };
            string url = Urls.WMSAddress + ":" + Urls.WMSPort;
            var result = (url + "/api/DownAPi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
@@ -137,6 +137,7 @@
                _db.Insertable(taskAdd).ExecuteCommand();
                endLocat = result.TaskList.EndRoadway;
                returnStr = result.TaskList.EndLocate;
                taskNo = result.TaskList.TaskNo;
            }
            else
            {
@@ -169,8 +170,8 @@
        string returnStr = "";


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

        if (task == null)
@@ -214,7 +215,7 @@
                    HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
                }

               

                returnStr = result.TaskList.EndLocate;
                taskNo = result.TaskList.TaskNo;
            }
@@ -259,9 +260,10 @@
        //string TaskStatus = "";
        //var PalletNo = "";
        //var TaskNo = "";
        var str = new {
        var str = new
        {
            PalletNo = model.PalletNo,
            TaskNo=model.TaskNo,    
            TaskNo = model.TaskNo,
            TaskType = model.TaskType.ToString(),
            TaskStatus = model.TaskStatus.ToString(),
        };
@@ -296,7 +298,7 @@
    /// <param name="Num"></param>
    /// <param name="OutMode"></param>
    /// <returns></returns>
    public string IssuePlnOutHouseWcs(string Num,string OutMode)
    public string IssuePlnOutHouseWcs(string Num, string OutMode)
    {
        string returnStr = "";

@@ -324,7 +326,7 @@
                        //IsSuccess =TaskSuccessEnum.Success,
                        Origin = "WMS",
                        StartLocate = item.StartLocate,
                        StartRoadway=item.StartRoadway,
                        StartRoadway = item.StartRoadway,
                        PalletNo = item.PalletNo,
                        EndLocate = item.EndLocate,
                        EndRoadway = item.EndRoadway
@@ -382,21 +384,22 @@
    }

    /// <summary>
    /// 调用WMS接口反馈缠膜异常接口
    /// 调用WMS接口反馈申请缠膜接口
    /// </summary>
    /// <param name="PalletNo">托盘号</param>
    /// <returns></returns>
    public string RequestPackWcs(string PalletNo)
    {
        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
        //var str = new
        //{
        //    PalletNo = palletno
        //};
        var result = (url + "/api/DownAPi/RequestPackWcs").SetBody(PalletNo, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
        Log.Information("调用WMS接口反馈缠膜异常接口" + result.ToJson());
        
        return result.Success;
        var str = new PackModel()
        {
            PalletNo = PalletNo
        };

        var result = (url + "/api/DownAPi/RequestPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
        Log.Information("调用WMS接口反馈申请缠膜异常接口" + result.ToJson());

        return result.Success.ToString();
    }

    /// <summary>
@@ -411,10 +414,12 @@
        {
            PalletNo = palletno
        };
        var result =  (url + "/api/DownAPi/RequestUnPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
        var result = (url + "/api/DownAPi/RequestUnPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
        Log.Information("调用WMS接口反馈拆膜异常接口" + result.ToJson());
        return result.Success;
        return result.Success.ToString();
    }

   

    /// <summary>
    /// 调用WMS接口反馈缠膜完成
@@ -428,9 +433,82 @@
        {
            PalletNo = palletno
        };
        var result =  (url + "/api/DownAPi/RequestPackedWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
        var result = (url + "/api/DownAPi/RequestPackedWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
        Log.Information("调用WMS接口反馈缠膜完成异常接口" + result.ToJson());
        return result.Success;
        return result.Success.ToString();
    }

    /// <summary>
    /// 调用WMS接口反馈拆垛托盘信息
    /// </summary>
    /// <param name="palletno">托盘号</param>
    /// <param name="taskno">任务号</param>
    /// <returns></returns>
    public RequestBoxInfoCheckAll RequestBoxCheckinfo(string palletno,string taskno)
    {
        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
        var str = new
        {
            PalletNo = palletno,
            TaskNo = taskno
        };
        var result = (url + "/api/DownAPi/ResultBoxInfoCheckWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<RequestBoxInfoCheckAll>().Result;
        Log.Information("调用WMS接口反馈拆托托盘信息异常接口" + result.ToJson());
        return result;
    }

    /// <summary>
    /// 调用WMS接口反馈分拣出库箱信息
    /// </summary>
    /// <param name="palletno">托盘号</param>
    /// <param name="taskno">任务号</param>
    /// <returns></returns>
    public IsBaleModel2 RequestBoxno(string palletno)
    {
        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
        var str = new
        {
            PalletNo = palletno,
        };
        var result = (url + "/api/DownAPi/RequestBoxno").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
        Log.Information("调用WMS接口反馈缠膜完成异常接口" + result.ToJson());
        return result;
    }

    /// <summary>
    /// 调用WMS接口验证箱码是否可拣货并返回装车口
    /// </summary>
    /// <param name="boxNo">箱码</param>
    /// <returns></returns>
    public RequestloadingAddre ResultBoxInfoExportWcs(string boxNo) 
    {
        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
        var str = new
        {
            BoxNo = boxNo
        };
        var result = (url + "/api/DownAPi/ResultBoxInfoCheckWcs").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();
    }
}