diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs index d53d7b11a..1e3fe9760 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/test/TestAppService.cs @@ -1,482 +1,543 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; -using Castle.Core.Logging; -using DocumentFormat.OpenXml.Office2010.Drawing; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Repositories; -using Win_in.Sfs.Basedata.Application.Contracts; -using Win_in.Sfs.Basedata.Domain; -using Win_in.Sfs.Basedata.Domain.Caches; -using Win_in.Sfs.Basedata.Domain.Shared; -using Win_in.Sfs.Basedata.tests; - -namespace Win_in.Sfs.Basedata.Application; - - -/// -/// 接口模拟测试 -/// -[AllowAnonymous] -[Route($"{BasedataConsts.RootPath}test")] -public class TestService:ApplicationService -{ - private readonly IServiceProvider _serviceProvider; - private readonly IOptions _options; - private readonly ILogger _logger; - public TestService(IServiceProvider serviceProvider, IOptions options, ILogger logger) - { - _serviceProvider = serviceProvider; - _options = options; - _logger = logger; - } - /* - /// - /// 生命周期操作 - /// - [HttpPost("GetMacStatic")] - public async Task GetMacStatic() - { +//using System; +//using System.Collections.Generic; +//using System.ComponentModel.DataAnnotations; +//using System.Linq; +//using System.Threading.Tasks; +//using Castle.Core.Logging; +//using DocumentFormat.OpenXml.Office2010.Drawing; +//using Microsoft.AspNetCore.Authorization; +//using Microsoft.AspNetCore.Mvc; +//using Microsoft.Extensions.DependencyInjection; +//using Microsoft.Extensions.Logging; +//using Microsoft.Extensions.Options; +//using Volo.Abp.Application.Dtos; +//using Volo.Abp.Application.Services; +//using Volo.Abp.Caching; +//using Volo.Abp.DependencyInjection; +//using Volo.Abp.Domain.Repositories; +//using Win_in.Sfs.Basedata.Application.Contracts; +//using Win_in.Sfs.Basedata.Domain; +//using Win_in.Sfs.Basedata.Domain.Caches; +//using Win_in.Sfs.Basedata.Domain.Shared; +//using Win_in.Sfs.Basedata.tests; + +//namespace Win_in.Sfs.Basedata.Application; + + +///// +///// 接口模拟测试 +///// +//[AllowAnonymous] +//[Route($"{BasedataConsts.RootPath}test")] +//public class TestService:ApplicationService +//{ +// private readonly IServiceProvider _serviceProvider; +// private readonly IOptions _options; +// private readonly ILogger _logger; +// public TestService(IServiceProvider serviceProvider, IOptions options, ILogger logger) +// { +// _serviceProvider = serviceProvider; +// _options = options; +// _logger = logger; +// } +// /* +// /// +// /// 生命周期操作 +// /// +// [HttpPost("GetMacStatic")] +// public async Task GetMacStatic() +// { - return new ResultJson() { Code = 200, Msg = "SUCESS", Value = 1 , Valuestr = "", Result = ""}; - } +// return new ResultJson() { Code = 200, Msg = "SUCESS", Value = 1 , Valuestr = "", Result = ""}; +// } - [HttpGet("GetCargoStatic")] - /// - /// 异步开始生命周期操作不能堵塞 - /// - public async Task GetCargoStatic(string AreaID) - { +// [HttpGet("GetCargoStatic")] +// /// +// /// 异步开始生命周期操作不能堵塞 +// /// +// public async Task GetCargoStatic(string AreaID) +// { - List result = new List(); +// List result = new List(); - result.Add(new ResponCargoItem() { AreaID = "1", CargoID = "PTXB1", PartCode = "TMDLYA0A071AB", Flag = 0 }); - result.Add(new ResponCargoItem() { AreaID = "1", CargoID = "PTXB2", PartCode = "TMDLYA0A061AB", Flag = 0 }); - result.Add(new ResponCargoItem() { AreaID = "2", CargoID = "ZSXB2", PartCode = "TMDLYD0ABM5A", Flag = 0 }); +// result.Add(new ResponCargoItem() { AreaID = "1", CargoID = "PTXB1", PartCode = "TMDLYA0A071AB", Flag = 0 }); +// result.Add(new ResponCargoItem() { AreaID = "1", CargoID = "PTXB2", PartCode = "TMDLYA0A061AB", Flag = 0 }); +// result.Add(new ResponCargoItem() { AreaID = "2", CargoID = "ZSXB2", PartCode = "TMDLYD0ABM5A", Flag = 0 }); - result = result.Where(p => p.AreaID == AreaID).ToList(); +// result = result.Where(p => p.AreaID == AreaID).ToList(); - var t = new ResponCargos(); - t.Code = 200; - t.Msg = "Success"; - t.Datalist = result; +// var t = new ResponCargos(); +// t.Code = 200; +// t.Msg = "Success"; +// t.Datalist = result; - return t; - - } - */ - //[HttpPost("SyncIssueJobStereo")] - - //public virtual async Task SyncIssueJobStereoAsync(IssueJobToRestoDTO input) - //{ - - // ReusltObject reuslt=new ReusltObject(); - // reuslt.Code = "1"; - // reuslt.Message = "操作成功"; - // reuslt.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - // return reuslt; - - - - - //} - //[HttpPost("GetCargoStatic1")] - ///// - ///// 异步开始生命周期操作不能堵塞 - ///// - //public async Task GetCargoStatic1(ResponCargos p_cas) - //{ - - - - // return p_cas; - - //} - - [HttpPost("pushOutTask4FW")] - public async Task pushOutTask4FW(AgvRequest1 request) - { - var json=System.Text.Json.JsonSerializer.Serialize(request); - _logger.LogInformation(json); - AgvResultObject1 reusltObject = new AgvResultObject1(); - reusltObject.Code = "0"; - reusltObject.Message = "OK"; - reusltObject.ReqCode = "T6000001970"; - return reusltObject; - - } - [HttpPost("pushOutTaskUnplanned")] - public async Task pushOutTaskUnplanned(AgvRequestUnplanned1 request) - { - var json = System.Text.Json.JsonSerializer.Serialize(request); - _logger.LogInformation(json); - AgvResultObject1 reusltObject = new AgvResultObject1(); - reusltObject.Code = "0"; - reusltObject.Message = "OK"; - reusltObject.ReqCode = "T6000001970"; - return reusltObject; - } - - [HttpPost("notifyOutTaskBack4FW")] - public async Task NotifyOutTaskBack4FW(AgvRequestBack1 request) - { - var json = System.Text.Json.JsonSerializer.Serialize(request); - _logger.LogInformation(json); - AgvResultObject1 reusltObject = new AgvResultObject1(); - reusltObject.Code = "0"; - reusltObject.Message = "OK"; - reusltObject.ReqCode = "T6000001970"; - return reusltObject; - } - - - - - - -} -/// -/// 发给立体库主表 -/// -public class IssueJobToRestoDetailDTO1 -{ - public string WorkNo { set; get; } - public string TaskNo { set; get; } - public string NeedSite { set; get; } - public string ProductNo { set; get; } - public decimal Count { set; get; } -} -/// -/// 发给立体库子表 -/// -public class IssueJobToRestoDTO1 -{ - public Guid UUID { set; get; } - public string OperatorName { set; get; } - public List Details { set; get; } -} -/// -/// 返回结果 -/// -public class ReusltObject1 -{ - public string Code { set; get; } - public string Message { set; get; } - public string OperateTime { set; get; } -} -public class AgvResultObject1 -{ - public string Code { set; get; } - public string Message { set; get; } - public string ReqCode { set; get; } -} -#region AGV - - -/// -/// 海康调闻荫入参数 -/// -public class AgvRequestDto1 -{ - //[Display(Name = "请求编号")] - //public string ReqCode { set; get; } - [Display(Name = "明细")] - public List Data { set; get; } - -} -/// -/// 海康调闻荫入参数 -/// -//public class AgvRequestOnlyJobHK +// return t; + +// } +// */ +// //[HttpPost("SyncIssueJobStereo")] + +// //public virtual async Task SyncIssueJobStereoAsync(IssueJobToRestoDTO input) +// //{ + +// // ReusltObject reuslt=new ReusltObject(); +// // reuslt.Code = "1"; +// // reuslt.Message = "操作成功"; +// // reuslt.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + +// // return reuslt; + + + + +// //} +// //[HttpPost("GetCargoStatic1")] +// ///// +// ///// 异步开始生命周期操作不能堵塞 +// ///// +// //public async Task GetCargoStatic1(ResponCargos p_cas) +// //{ + + + +// // return p_cas; + +// //} +// [HttpPost("pushOutTaskAssemble")] +// public async Task PushOutTaskAssemble(AgvRequest request) +// { +// var json = System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; + +// } +// [HttpPost("pushOutTaskInjection")] +// public async Task PushOutTaskInjection(AgvRequest request) +// { +// var json = System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; + +// } +// [HttpPost("pushOutTaskSparePart")] +// public async Task PushOutTaskSparePart(AgvRequest request) +// { +// var json = System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; + +// } + + + +// [HttpPost("pushOutTaskCoating")] +// public async Task PushOutTaskCoating(AgvRequest request) +// { +// var json=System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; + +// } +// [HttpPost("pushOutTaskKitting")] +// public async Task PushOutTaskKitting(AgvRequest request) +// { +// var json = System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; + +// } +// [HttpPost("pushOutTaskUnplanned")] +// public async Task PushOutTaskUnplanned(AgvRequestUnplanned request) +// { +// var json = System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; +// } +// [HttpPost("pushOutTaskUnplannedReceipt")] +// public async Task PushOutTaskUnplannedReceipt(AgvRequestUnplanned request) +// { +// var json = System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; +// } + +// [HttpPost("notifyOutTaskBack4FW")] +// public async Task NotifyOutTaskBack4FW(AgvRequestBack request) +// { +// var json = System.Text.Json.JsonSerializer.Serialize(request); +// _logger.LogInformation(json); +// AgvResultObject reusltObject = new AgvResultObject(); +// reusltObject.Code = "0"; +// reusltObject.Message = "OK"; +// reusltObject.ReqCode = "T600000970"; +// return reusltObject; +// } + + + + + + +//} +///// +///// 发给立体库主表 +///// +//public class IssueJobToRestoDetailDTO +//{ +// public string WorkNo { set; get; } +// public string TaskNo { set; get; } +// public string NeedSite { set; get; } +// public string ProductNo { set; get; } +// public decimal Count { set; get; } +//} +///// +///// 发给立体库子表 +///// +//public class IssueJobToRestoDTO +//{ +// public Guid UUID { set; get; } +// public string OperatorName { set; get; } +// public List Details { set; get; } +//} +///// +///// 返回结果 +///// +//public class ReusltObject +//{ +// public string Code { set; get; } +// public string Message { set; get; } +// public string OperateTime { set; get; } +//} +//public class AgvResultObject +//{ +// public string Code { set; get; } +// public string Message { set; get; } +// public string ReqCode { set; get; } +//} +//#region AGV + + +///// +///// 海康调闻荫入参数 +///// +//public class AgvRequestDto //{ // //[Display(Name = "请求编号")] // //public string ReqCode { set; get; } // [Display(Name = "明细")] // public List Data { set; get; } +//} +///// +///// 海康调闻荫入参数 +///// +////public class AgvRequestOnlyJobHK +////{ +//// //[Display(Name = "请求编号")] +//// //public string ReqCode { set; get; } +//// [Display(Name = "明细")] +//// public List Data { set; get; } + +////} + + + +///// +///// 海康调闻荫入参明细 +///// +//public class AgvRequestDetailDto +//{ +// [Display(Name = "任务类型")] +// public string OrderType { set; get; } +// [Display(Name = "任务编号")] +// public string OrderNum { set; get; } +// [Display(Name = "物料编号")] +// public string MatCode { set; get; } +// [Display(Name = "物料数量")] +// public decimal MatQty { set; get; } +// [Display(Name = "起始点")] +// public string BeginPosition { set; get; } +// [Display(Name = "终点")] +// public string EndPosition { set; get; } + +// [Display(Name = "箱码")] +// public string PakingCode { set; get; } + + +// [Display(Name = "库存状态")] +// public string State { set; get; } + + +// [Display(Name = "批次属性07")] +// public string BatchAttr07 { set; get; } +// [Display(Name = "批次属性08")] +// public string BatchAttr08 { set; get; } +// [Display(Name = "批次属性09")] +// public string BatchAttr09 { set; get; } +// [Display(Name = "批次属性0")] +// public string BatchAttr0 { set; get; } +// [Display(Name = "批次属性")] +// public string BatchAttr { set; get; } +// [Display(Name = "批次属性2")] +// public string BatchAttr2 { set; get; } +// [Display(Name = "批次属性3")] +// public string BatchAttr3 { set; get; } +// [Display(Name = "批次属性4")] +// public string BatchAttr4 { set; get; } +// [Display(Name = "批次属性5")] +// public string BatchAttr5 { set; get; } + //} +//public class AgvRequestUnplannedDto +//{ +// [Display(Name = "明细")] +// public List Data { set; get; } -/// -/// 海康调闻荫入参明细 -/// -public class AgvRequestDetailDto1 -{ - [Display(Name = "任务类型")] - public string OrderType { set; get; } - [Display(Name = "任务编号")] - public string OrderNum { set; get; } - [Display(Name = "物料编号")] - public string MatCode { set; get; } - [Display(Name = "物料数量")] - public decimal MatQty { set; get; } - [Display(Name = "起始点")] - public string BeginPosition { set; get; } - [Display(Name = "终点")] - public string EndPosition { set; get; } - - [Display(Name = "箱码")] - public string PakingCode { set; get; } - - - [Display(Name = "库存状态")] - public string State { set; get; } - - - [Display(Name = "批次属性07")] - public string BatchAttr07 { set; get; } - [Display(Name = "批次属性08")] - public string BatchAttr08 { set; get; } - [Display(Name = "批次属性09")] - public string BatchAttr09 { set; get; } - [Display(Name = "批次属性10")] - public string BatchAttr10 { set; get; } - [Display(Name = "批次属性11")] - public string BatchAttr11 { set; get; } - [Display(Name = "批次属性12")] - public string BatchAttr12 { set; get; } - [Display(Name = "批次属性13")] - public string BatchAttr13 { set; get; } - [Display(Name = "批次属性14")] - public string BatchAttr14 { set; get; } - [Display(Name = "批次属性15")] - public string BatchAttr15 { set; get; } - -} - -public class AgvRequestUnplannedDto1 -{ - - [Display(Name = "明细")] - public List Data { set; get; } - -} -public class AgvRequestUnplannedDetailDto1 -{ - [Display(Name = "任务类型")] - public string OrderType { set; get; } - [Display(Name = "任务编号")] - public string OrderNum { set; get; } - [Display(Name = "物料编号")] - public string MatCode { set; get; } - [Display(Name = "物料数量")] - public decimal MatQty { set; get; } - [Display(Name = "起始点")] - public string BeginPosition { set; get; } - [Display(Name = "终点")] - public string EndPosition { set; get; } - - [Display(Name = "箱码")] - public string PakingCode { set; get; } - - [Display(Name = "库存状态")] - public string State { set; get; } - - - [Display(Name = "批次属性07")] - public string BatchAttr07 { set; get; } - [Display(Name = "批次属性08")] - public string BatchAttr08 { set; get; } - [Display(Name = "批次属性09")] - public string BatchAttr09 { set; get; } - [Display(Name = "批次属性10")] - public string BatchAttr10 { set; get; } - [Display(Name = "批次属性11")] - public string BatchAttr11 { set; get; } - [Display(Name = "批次属性12")] - public string BatchAttr12 { set; get; } - [Display(Name = "批次属性13")] - public string BatchAttr13 { set; get; } - [Display(Name = "批次属性14")] - public string BatchAttr14 { set; get; } - [Display(Name = "批次属性15")] - public string BatchAttr15 { set; get; } - -} - - -/// -/// 闻荫调海康入参 -/// - -public partial class AgvRequest1 -{ - - /// - /// 任务类型 - /// - [Newtonsoft.Json.JsonProperty("orderType", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string OrderType { get; set; } - - /// - /// 任务编号 - /// - [Newtonsoft.Json.JsonProperty("orderNum", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string OrderNum { get; set; } - - /// - /// 物料编号 - /// - [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string MatCode { get; set; } - - /// - /// 箱码 - /// - [Newtonsoft.Json.JsonProperty("pakingCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string PakingCode { get; set; } - - /// - /// 库存状态 - /// - [Newtonsoft.Json.JsonProperty("state", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string State { get; set; } - - /// - /// 批次 - /// - [Newtonsoft.Json.JsonProperty("batch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string Batch { get; set; } - - - /// - /// 物料数量 - /// - [Newtonsoft.Json.JsonProperty("matQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public decimal MatQty { get; set; } - - /// - /// 来源工位 - /// - [Newtonsoft.Json.JsonProperty("beginPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string BeginPosition { get; set; } - - /// - /// 目标工位 - /// - [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string EndPosition { get; set; } - -} - -[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] -public partial class AgvRequestBack1 -{ - /// - /// 物料编号 - /// - [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string MatCode { get; set; } - - /// - /// 物料数量 - /// - [Newtonsoft.Json.JsonProperty("returnQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public decimal ReturnQty { get; set; } - - /// - /// 目标工位 - /// - [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string EndPosition { get; set; } - -} - -[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] -public partial class AgvRequestUnplanned1 -{ - /// - /// 批次 - /// - [Newtonsoft.Json.JsonProperty("batch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string Batch { get; set; } - - /// - /// 箱码 - /// - [Newtonsoft.Json.JsonProperty("pakingCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string PakingCode { get; set; } - - - /// - /// 库存状态 - /// - [Newtonsoft.Json.JsonProperty("state", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string State { get; set; } - - - /// - /// ERP储位 - /// - [Newtonsoft.Json.JsonProperty("erpLocationCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string ErpLocationCode { get; set; } - - /// - /// 任务类型 - /// - [Newtonsoft.Json.JsonProperty("orderType", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string OrderType { get; set; } - - /// - /// 任务编号 - /// - [Newtonsoft.Json.JsonProperty("orderNum", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string OrderNum { get; set; } - - /// - /// 物料编号 - /// - [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string MatCode { get; set; } +//} +//public class AgvRequestUnplannedDetailDto +//{ +// [Display(Name = "任务类型")] +// public string OrderType { set; get; } +// [Display(Name = "任务编号")] +// public string OrderNum { set; get; } +// [Display(Name = "物料编号")] +// public string MatCode { set; get; } +// [Display(Name = "物料数量")] +// public decimal MatQty { set; get; } +// [Display(Name = "起始点")] +// public string BeginPosition { set; get; } +// [Display(Name = "终点")] +// public string EndPosition { set; get; } + +// [Display(Name = "箱码")] +// public string PakingCode { set; get; } + +// [Display(Name = "库存状态")] +// public string State { set; get; } + + +// [Display(Name = "批次属性07")] +// public string BatchAttr07 { set; get; } +// [Display(Name = "批次属性08")] +// public string BatchAttr08 { set; get; } +// [Display(Name = "批次属性09")] +// public string BatchAttr09 { set; get; } +// [Display(Name = "批次属性0")] +// public string BatchAttr0 { set; get; } +// [Display(Name = "批次属性")] +// public string BatchAttr { set; get; } +// [Display(Name = "批次属性2")] +// public string BatchAttr2 { set; get; } +// [Display(Name = "批次属性3")] +// public string BatchAttr3 { set; get; } +// [Display(Name = "批次属性4")] +// public string BatchAttr4 { set; get; } +// [Display(Name = "批次属性5")] +// public string BatchAttr5 { set; get; } - /// - /// 物料数量 - /// - [Newtonsoft.Json.JsonProperty("matQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public decimal MatQty { get; set; } +//} - /// - /// 来源工位 - /// - [Newtonsoft.Json.JsonProperty("beginPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string BeginPosition { get; set; } - /// - /// 目标工位 - /// - [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] - public string EndPosition { get; set; } +///// +///// 闻荫调海康入参 +///// +//public partial class AgvRequest +//{ +// /// +// /// 任务类型 +// /// +// [Newtonsoft.Json.JsonProperty("orderType", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string OrderType { get; set; } + +// /// +// /// 任务编号 +// /// +// [Newtonsoft.Json.JsonProperty("orderNum", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string OrderNum { get; set; } + +// /// +// /// 物料编号 +// /// +// [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string MatCode { get; set; } + +// /// +// /// 箱码 +// /// +// [Newtonsoft.Json.JsonProperty("pakingCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string PakingCode { get; set; } + +// /// +// /// 库存状态 +// /// +// [Newtonsoft.Json.JsonProperty("state", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string State { get; set; } + +// /// +// /// 批次 +// /// +// [Newtonsoft.Json.JsonProperty("batch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string Batch { get; set; } + + +// /// +// /// 物料数量 +// /// +// [Newtonsoft.Json.JsonProperty("matQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public decimal MatQty { get; set; } + +// /// +// /// 来源工位 +// /// +// [Newtonsoft.Json.JsonProperty("beginPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string BeginPosition { get; set; } + +// /// +// /// 目标工位 +// /// +// [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string EndPosition { get; set; } +//} -} +//[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "4.2.0.0 (NJsonSchema v..0.0 (Newtonsoft.Json v3.0.0.0))")] +//public partial class AgvRequestBack +//{ +// /// +// /// 物料编号 +// /// +// [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string MatCode { get; set; } + +// /// +// /// 物料数量 +// /// +// [Newtonsoft.Json.JsonProperty("returnQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public decimal ReturnQty { get; set; } + +// /// +// /// 目标工位 +// /// +// [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string EndPosition { get; set; } + +//} + +//[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "4.2.0.0 (NJsonSchema v..0.0 (Newtonsoft.Json v3.0.0.0))")] +//public partial class AgvRequestUnplanned +//{ +// /// +// /// 批次 +// /// +// [Newtonsoft.Json.JsonProperty("batch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string Batch { get; set; } + +// /// +// /// 箱码 +// /// +// [Newtonsoft.Json.JsonProperty("pakingCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string PakingCode { get; set; } + + +// /// +// /// 库存状态 +// /// +// [Newtonsoft.Json.JsonProperty("state", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string State { get; set; } + + +// /// +// /// ERP储位 +// /// +// [Newtonsoft.Json.JsonProperty("erpLocationCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string ErpLocationCode { get; set; } + +// /// +// /// 任务类型 +// /// +// [Newtonsoft.Json.JsonProperty("orderType", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string OrderType { get; set; } + +// /// +// /// 任务编号 +// /// +// [Newtonsoft.Json.JsonProperty("orderNum", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string OrderNum { get; set; } + +// /// +// /// 物料编号 +// /// +// [Newtonsoft.Json.JsonProperty("matCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string MatCode { get; set; } + +// /// +// /// 物料数量 +// /// +// [Newtonsoft.Json.JsonProperty("matQty", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public decimal MatQty { get; set; } + +// /// +// /// 来源工位 +// /// +// [Newtonsoft.Json.JsonProperty("beginPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string BeginPosition { get; set; } + +// /// +// /// 目标工位 +// /// +// [Newtonsoft.Json.JsonProperty("endPosition", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] +// public string EndPosition { get; set; } + + + + +//} -#endregion +//#endregion diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index d15e5a63a..7981ac7ad 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -1214,7 +1214,7 @@ public class AssembleIssueJobAppService } var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path); - ret = await client.PushOutTask4FWAsync(request).ConfigureAwait(false); + ret = await client.PushOutTaskAssembleAsync(request).ConfigureAwait(false); } catch (Exception e) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs index 953b452e0..f9febfdfb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs @@ -856,10 +856,15 @@ public class CoatingIssueJobAppService #endif + if (ret.Code != 0) { throw new UserFriendlyException($"调用AGV不成功！原因:{ret.Message}"); } + else + { + return true; + } } return false; @@ -1226,7 +1231,7 @@ public class CoatingIssueJobAppService } var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path); - ret = await client.PushOutTask4FWAsync(request).ConfigureAwait(false); + ret = await client.PushOutTaskCoatingAsync(request).ConfigureAwait(false); } catch (Exception e) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index a247cfddb..921cd36cc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -820,6 +820,10 @@ public class InjectionIssueJobAppService { throw new UserFriendlyException($"调用AGV不成功！原因:{ret.Message}"); } + else + { + return true; + } } return false; @@ -1131,7 +1135,7 @@ public class InjectionIssueJobAppService Message = "OK" }; - + return ret; using var unitOfWork = _unitOfWorkManager.Begin(); @@ -1186,7 +1190,7 @@ public class InjectionIssueJobAppService } var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path); - ret = await client.PushOutTask4FWAsync(request).ConfigureAwait(false); + ret = await client.PushOutTaskInjectionAsync(request).ConfigureAwait(false); } catch (Exception e) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index ad874747f..37d21d510 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -821,6 +821,10 @@ public class KittingIssueJobAppService { throw new UserFriendlyException($"调用AGV不成功！原因:{ret.Message}"); } + else + { + return true; + } } return false; @@ -1182,7 +1186,7 @@ public class KittingIssueJobAppService } var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path); - ret = await client.PushOutTask4FWAsync(request).ConfigureAwait(false); + ret = await client.PushOutTaskKittingAsync(request).ConfigureAwait(false); } catch (Exception e) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index 7ba61be8d..c1fd8cd9a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -821,6 +821,10 @@ public class SparePartIssueJobAppService { throw new UserFriendlyException($"调用AGV不成功！原因:{ret.Message}"); } + else + { + return true; + } } return false; @@ -1134,6 +1138,7 @@ public class SparePartIssueJobAppService ReqCode = job.SparePartRequestNumber, Message = "OK" }; + return ret; //暂时无接口直接返回 using var unitOfWork = _unitOfWorkManager.Begin(); try @@ -1187,7 +1192,7 @@ public class SparePartIssueJobAppService } var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path); - ret = await client.PushOutTask4FWAsync(request).ConfigureAwait(false); + ret = await client.PushOutTaskSparePartAsync(request).ConfigureAwait(false); } catch (Exception e) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs index 29d4acde6..503505562 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/AgvJobClient.cs @@ -1,16 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win_in.Sfs.Wms.Store.Application.Contracts; - -namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; - - //---------------------- // -// Generated using the NSwag toolchain v14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org) // //---------------------- @@ -18,7 +8,6 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; #pragma warning disable 114 // Disable "CS0114 '{derivedDto}.RaisePropertyChanged(String)' hides inherited member 'dtoBase.RaisePropertyChanged(String)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." #pragma warning disable 472 // Disable "CS0472 The result of the expression is always 'false' since a value of type 'Int32' is never equal to 'null' of type 'Int32?' #pragma warning disable 612 // Disable "CS0612 '...' is obsolete" -#pragma warning disable 649 // Disable "CS0649 Field is never assigned to, and will always have its default value null" #pragma warning disable 1573 // Disable "CS1573 Parameter '...' has no matching param tag in the XML comment for ... #pragma warning disable 1591 // Disable "CS1591 Missing XML comment for publicly visible type or member ..." #pragma warning disable 8073 // Disable "CS8073 The result of the expression is always 'false' since a value of type 'T' is never equal to 'null' of type 'T?'" @@ -26,88 +15,788 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; #pragma warning disable 8603 // Disable "CS8603 Possible null reference return" #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter" #pragma warning disable 8625 // Disable "CS8625 Cannot convert null literal to non-nullable reference type" -#pragma warning disable 8765 // Disable "CS8765 Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes)." +#pragma warning disable CS8765 // Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes). +namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; - using System = global::System; +using Win_in.Sfs.Wms.Store.Application.Contracts; +using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")] public partial class AgvJobClient -{ + { +#pragma warning disable 8618 + private string _baseUrl; +#pragma warning restore 8618 + + private System.Net.Http.HttpClient _httpClient; + private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); - +#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public AgvJobClient(string baseUrl, System.Net.Http.HttpClient httpClient, string path) +#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + { + _path = path; + BaseUrl = baseUrl; + _httpClient = httpClient; + } + private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() + { + var settings = new Newtonsoft.Json.JsonSerializerSettings(); + UpdateJsonSerializerSettings(settings); + return settings; + } -#pragma warning disable 8618 - private string _baseUrl; -#pragma warning restore 8618 + public string BaseUrl + { + get { return _baseUrl; } + set + { + _baseUrl = value; + if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/")) + _baseUrl += '/'; + } + } + private string _path; + public string Path + { + get { return _path; } + set + { + _path = value; + } + } + + protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } } + + static partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings); + + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); + partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + + /// Success + /// A server side error occurred. + public virtual System.Threading.Tasks.Task PushOutTaskAssembleAsync(AgvRequest body) + { + return PushOutTaskAssembleAsync(body, System.Threading.CancellationToken.None); + } + + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// Success + /// A server side error occurred. + public virtual async System.Threading.Tasks.Task PushOutTaskAssembleAsync(AgvRequest body, System.Threading.CancellationToken cancellationToken) + { + var client_ = _httpClient; + var disposeClient_ = false; + try + { + using (var request_ = new System.Net.Http.HttpRequestMessage()) + { + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); + var content_ = new System.Net.Http.StringContent(json_); + content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); + request_.Content = content_; + request_.Method = new System.Net.Http.HttpMethod("POST"); + request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("text/plain")); + + var urlBuilder_ = new System.Text.StringBuilder(); + if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); + // Operation Path: "pushOutTaskAssemble" + urlBuilder_.Append("pushOutTaskAssemble"); + + PrepareRequest(client_, request_, urlBuilder_); + + var url_ = urlBuilder_.ToString(); + request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); + + PrepareRequest(client_, request_, url_); + + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); + var disposeResponse_ = true; + try + { + var headers_ = new System.Collections.Generic.Dictionary>(); + foreach (var item_ in response_.Headers) + headers_[item_.Key] = item_.Value; + if (response_.Content != null && response_.Content.Headers != null) + { + foreach (var item_ in response_.Content.Headers) + headers_[item_.Key] = item_.Value; + } + + ProcessResponse(client_, response_); + + var status_ = (int)response_.StatusCode; + if (status_ == 200) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + return objectResponse_.Object; + } + else + if (status_ == 403) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Forbidden", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 401) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Unauthorized", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 400) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Bad Request", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 404) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Not Found", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 501) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 500) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + { + var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false); + throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null); + } + } + finally + { + if (disposeResponse_) + response_.Dispose(); + } + } + } + finally + { + if (disposeClient_) + client_.Dispose(); + } + } + + /// Success + /// A server side error occurred. + public virtual System.Threading.Tasks.Task PushOutTaskInjectionAsync(AgvRequest body) + { + return PushOutTaskInjectionAsync(body, System.Threading.CancellationToken.None); + } + + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// Success + /// A server side error occurred. + public virtual async System.Threading.Tasks.Task PushOutTaskInjectionAsync(AgvRequest body, System.Threading.CancellationToken cancellationToken) + { + var client_ = _httpClient; + var disposeClient_ = false; + try + { + using (var request_ = new System.Net.Http.HttpRequestMessage()) + { + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); + var content_ = new System.Net.Http.StringContent(json_); + content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); + request_.Content = content_; + request_.Method = new System.Net.Http.HttpMethod("POST"); + request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("text/plain")); + + var urlBuilder_ = new System.Text.StringBuilder(); + if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); + // Operation Path: "pushOutTaskInjection" + urlBuilder_.Append("pushOutTaskInjection"); + + PrepareRequest(client_, request_, urlBuilder_); + + var url_ = urlBuilder_.ToString(); + request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); + + PrepareRequest(client_, request_, url_); + + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); + var disposeResponse_ = true; + try + { + var headers_ = new System.Collections.Generic.Dictionary>(); + foreach (var item_ in response_.Headers) + headers_[item_.Key] = item_.Value; + if (response_.Content != null && response_.Content.Headers != null) + { + foreach (var item_ in response_.Content.Headers) + headers_[item_.Key] = item_.Value; + } + + ProcessResponse(client_, response_); + + var status_ = (int)response_.StatusCode; + if (status_ == 200) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + return objectResponse_.Object; + } + else + if (status_ == 403) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Forbidden", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 401) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Unauthorized", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 400) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Bad Request", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 404) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Not Found", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 501) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 500) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + { + var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false); + throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null); + } + } + finally + { + if (disposeResponse_) + response_.Dispose(); + } + } + } + finally + { + if (disposeClient_) + client_.Dispose(); + } + } + + /// Success + /// A server side error occurred. + public virtual System.Threading.Tasks.Task PushOutTaskSparePartAsync(AgvRequest body) + { + return PushOutTaskSparePartAsync(body, System.Threading.CancellationToken.None); + } + + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// Success + /// A server side error occurred. + public virtual async System.Threading.Tasks.Task PushOutTaskSparePartAsync(AgvRequest body, System.Threading.CancellationToken cancellationToken) + { + var client_ = _httpClient; + var disposeClient_ = false; + try + { + using (var request_ = new System.Net.Http.HttpRequestMessage()) + { + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); + var content_ = new System.Net.Http.StringContent(json_); + content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); + request_.Content = content_; + request_.Method = new System.Net.Http.HttpMethod("POST"); + request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("text/plain")); + + var urlBuilder_ = new System.Text.StringBuilder(); + if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); + // Operation Path: "pushOutTaskSparePart" + urlBuilder_.Append("pushOutTaskSparePart"); + + PrepareRequest(client_, request_, urlBuilder_); + + var url_ = urlBuilder_.ToString(); + request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); + + PrepareRequest(client_, request_, url_); + + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); + var disposeResponse_ = true; + try + { + var headers_ = new System.Collections.Generic.Dictionary>(); + foreach (var item_ in response_.Headers) + headers_[item_.Key] = item_.Value; + if (response_.Content != null && response_.Content.Headers != null) + { + foreach (var item_ in response_.Content.Headers) + headers_[item_.Key] = item_.Value; + } + + ProcessResponse(client_, response_); + + var status_ = (int)response_.StatusCode; + if (status_ == 200) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + return objectResponse_.Object; + } + else + if (status_ == 403) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Forbidden", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 401) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Unauthorized", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 400) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Bad Request", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 404) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Not Found", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 501) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 500) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + { + var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false); + throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null); + } + } + finally + { + if (disposeResponse_) + response_.Dispose(); + } + } + } + finally + { + if (disposeClient_) + client_.Dispose(); + } + } + + /// Success + /// A server side error occurred. + public virtual System.Threading.Tasks.Task PushOutTaskCoatingAsync(AgvRequest body) + { + return PushOutTaskCoatingAsync(body, System.Threading.CancellationToken.None); + } + + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// Success + /// A server side error occurred. + public virtual async System.Threading.Tasks.Task PushOutTaskCoatingAsync(AgvRequest body, System.Threading.CancellationToken cancellationToken) + { + var client_ = _httpClient; + var disposeClient_ = false; + try + { + using (var request_ = new System.Net.Http.HttpRequestMessage()) + { + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); + var content_ = new System.Net.Http.StringContent(json_); + content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); + request_.Content = content_; + request_.Method = new System.Net.Http.HttpMethod("POST"); + request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("text/plain")); + + var urlBuilder_ = new System.Text.StringBuilder(); + if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); + // Operation Path: "pushOutTaskCoating" + urlBuilder_.Append("pushOutTaskCoating"); + + PrepareRequest(client_, request_, urlBuilder_); + + var url_ = urlBuilder_.ToString(); + request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); + + PrepareRequest(client_, request_, url_); + + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); + var disposeResponse_ = true; + try + { + var headers_ = new System.Collections.Generic.Dictionary>(); + foreach (var item_ in response_.Headers) + headers_[item_.Key] = item_.Value; + if (response_.Content != null && response_.Content.Headers != null) + { + foreach (var item_ in response_.Content.Headers) + headers_[item_.Key] = item_.Value; + } - private System.Net.Http.HttpClient _httpClient; - private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); - private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; + ProcessResponse(client_, response_); -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public AgvJobClient(string baseUrl, System.Net.Http.HttpClient httpClient,string path) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - { - BaseUrl = baseUrl; - _httpClient = httpClient; - _path = path; - Initialize(); + var status_ = (int)response_.StatusCode; + if (status_ == 200) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + return objectResponse_.Object; + } + else + if (status_ == 403) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Forbidden", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 401) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Unauthorized", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 400) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Bad Request", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 404) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Not Found", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 501) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 500) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + { + var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false); + throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null); + } + } + finally + { + if (disposeResponse_) + response_.Dispose(); + } + } + } + finally + { + if (disposeClient_) + client_.Dispose(); + } } - private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() + /// Success + /// A server side error occurred. + public virtual System.Threading.Tasks.Task PushOutTaskKittingAsync(AgvRequest body) { - var settings = new Newtonsoft.Json.JsonSerializerSettings(); - UpdateJsonSerializerSettings(settings); - return settings; + return PushOutTaskKittingAsync(body, System.Threading.CancellationToken.None); } - public string BaseUrl + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// Success + /// A server side error occurred. + public virtual async System.Threading.Tasks.Task PushOutTaskKittingAsync(AgvRequest body, System.Threading.CancellationToken cancellationToken) { - get { return _baseUrl; } - set + var client_ = _httpClient; + var disposeClient_ = false; + try { - _baseUrl = value; - if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/")) - _baseUrl += '/'; - } - } - - private string _path; - public string Path - { - get { return _path; } - set - { - _path = value; - } - } + using (var request_ = new System.Net.Http.HttpRequestMessage()) + { + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); + var content_ = new System.Net.Http.StringContent(json_); + content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); + request_.Content = content_; + request_.Method = new System.Net.Http.HttpMethod("POST"); + request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("text/plain")); + var urlBuilder_ = new System.Text.StringBuilder(); + if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); + // Operation Path: "pushOutTaskKitting" + urlBuilder_.Append("pushOutTaskKitting"); + PrepareRequest(client_, request_, urlBuilder_); + var url_ = urlBuilder_.ToString(); + request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } } + PrepareRequest(client_, request_, url_); - static partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings); + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); + var disposeResponse_ = true; + try + { + var headers_ = new System.Collections.Generic.Dictionary>(); + foreach (var item_ in response_.Headers) + headers_[item_.Key] = item_.Value; + if (response_.Content != null && response_.Content.Headers != null) + { + foreach (var item_ in response_.Content.Headers) + headers_[item_.Key] = item_.Value; + } - partial void Initialize(); + ProcessResponse(client_, response_); - partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); - partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); - partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + var status_ = (int)response_.StatusCode; + if (status_ == 200) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + return objectResponse_.Object; + } + else + if (status_ == 403) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Forbidden", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 401) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Unauthorized", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 400) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Bad Request", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 404) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Not Found", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 501) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + if (status_ == 500) + { + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_, cancellationToken).ConfigureAwait(false); + if (objectResponse_.Object == null) + { + throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null); + } + throw new ApiException("Server Error", status_, objectResponse_.Text, headers_, objectResponse_.Object, null); + } + else + { + var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false); + throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null); + } + } + finally + { + if (disposeResponse_) + response_.Dispose(); + } + } + } + finally + { + if (disposeClient_) + client_.Dispose(); + } + } /// Success /// A server side error occurred. - public virtual System.Threading.Tasks.Task PushOutTask4FWAsync(AgvRequest body) + public virtual System.Threading.Tasks.Task PushOutTaskUnplannedAsync(AgvRequestUnplanned body) { - return PushOutTask4FWAsync(body, System.Threading.CancellationToken.None); + return PushOutTaskUnplannedAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Success /// A server side error occurred. - public virtual async System.Threading.Tasks.Task PushOutTask4FWAsync(AgvRequest body, System.Threading.CancellationToken cancellationToken) + public virtual async System.Threading.Tasks.Task PushOutTaskUnplannedAsync(AgvRequestUnplanned body, System.Threading.CancellationToken cancellationToken) { var client_ = _httpClient; var disposeClient_ = false; @@ -115,7 +804,7 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; { using (var request_ = new System.Net.Http.HttpRequestMessage()) { - var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, JsonSerializerSettings); + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); var content_ = new System.Net.Http.StringContent(json_); content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; @@ -124,8 +813,8 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; var urlBuilder_ = new System.Text.StringBuilder(); if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); - // Operation Path: "pushOutTask4FW" - urlBuilder_.Append("pushOutTask4FW"); + // Operation Path: "pushOutTaskUnplanned" + urlBuilder_.Append("pushOutTaskUnplanned"); PrepareRequest(client_, request_, urlBuilder_); @@ -241,15 +930,15 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; /// Success /// A server side error occurred. - public virtual System.Threading.Tasks.Task PushOutTaskUnplannedAsync(AgvRequestUnplanned body) + public virtual System.Threading.Tasks.Task PushOutTaskUnplannedReceiptAsync(AgvRequestUnplanned body) { - return PushOutTaskUnplannedAsync(body, System.Threading.CancellationToken.None); + return PushOutTaskUnplannedReceiptAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Success /// A server side error occurred. - public virtual async System.Threading.Tasks.Task PushOutTaskUnplannedAsync(AgvRequestUnplanned body, System.Threading.CancellationToken cancellationToken) + public virtual async System.Threading.Tasks.Task PushOutTaskUnplannedReceiptAsync(AgvRequestUnplanned body, System.Threading.CancellationToken cancellationToken) { var client_ = _httpClient; var disposeClient_ = false; @@ -257,7 +946,7 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; { using (var request_ = new System.Net.Http.HttpRequestMessage()) { - var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, JsonSerializerSettings); + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); var content_ = new System.Net.Http.StringContent(json_); content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; @@ -266,8 +955,8 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; var urlBuilder_ = new System.Text.StringBuilder(); if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); - // Operation Path: "pushOutTaskUnplanned" - urlBuilder_.Append("pushOutTaskUnplanned"); + // Operation Path: "pushOutTaskUnplannedReceipt" + urlBuilder_.Append("pushOutTaskUnplannedReceipt"); PrepareRequest(client_, request_, urlBuilder_); @@ -399,7 +1088,7 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; { using (var request_ = new System.Net.Http.HttpRequestMessage()) { - var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, JsonSerializerSettings); + var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value); var content_ = new System.Net.Http.StringContent(json_); content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; @@ -635,7 +1324,7 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; } } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")] public partial class RemoteServiceErrorInfo { [Newtonsoft.Json.JsonProperty("code", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] @@ -655,7 +1344,7 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")] public partial class RemoteServiceErrorResponse { [Newtonsoft.Json.JsonProperty("error", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] @@ -663,7 +1352,7 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")] public partial class RemoteServiceValidationErrorInfo { [Newtonsoft.Json.JsonProperty("message", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] @@ -674,10 +1363,11 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; } - + + - [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")] public partial class ApiException : System.Exception { public int StatusCode { get; private set; } @@ -700,7 +1390,7 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")] public partial class ApiException : ApiException { public TResult Result { get; private set; } @@ -714,10 +1404,10 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy; -#pragma warning restore 108 -#pragma warning restore 114 -#pragma warning restore 472 -#pragma warning restore 612 +#pragma warning restore 108 +#pragma warning restore 114 +#pragma warning restore 472 +#pragma warning restore 612 #pragma warning restore 1573 #pragma warning restore 1591 #pragma warning restore 8073 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index aa3b7d919..fb6ee6529 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -667,44 +667,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase } - /// - /// 调用 Agv 接口 - /// - /// - /// - /// - /// - [HttpPost("call-agv")] - public async Task CallAgvAsync(List inputs) - { - - var res = new ReusltObject(); - List errors = new List(); - List successList = new List(); - foreach (var itm in inputs) - { - var jobres = await SendInterFaceAsync(itm).ConfigureAwait(false); - if (jobres.Code != "0") - { - _logger.LogInformation(jobres.Message); - errors.Add(jobres.Message); - } - else - { - successList.Add(jobres.Message); - } - } - if (errors.Count > 0) - { - res.Code = -1; - res.Message = string.Join(",", errors); - res.Data = ""; - return res; - } - return res; - - - } + @@ -854,65 +817,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase } return ret; } - private async Task SendInterFaceAsync(TransferNoteDTO job) - { - var ret = new AgvResultObject - { - Code = "0", - ReqCode = job.RequestNumber, - Message = "OK" - }; - //using var unitOfWork = _unitOfWorkManager.Begin(); - try - { - var first = job.Details.FirstOrDefault(); - var request = new AgvRequest(); - request.MatCode = first.ItemCode; - request.MatQty = first.Qty; - request.OrderNum = job.Number; - request.OrderType =EnumTransSubType.Agv_Transfer_WIP.ToString(); - - var httpclient = _httpClientFactory.CreateClient(); - _agvOptions.Value.Address = string.IsNullOrEmpty(_agvOptions.Value.Address) - ? "http://7e42682n64.goho.co:21171/" - : _agvOptions.Value.Address; //测试地址 - _agvOptions.Value.Token = - string.IsNullOrEmpty(_agvOptions.Value.Token) ? string.Empty : _agvOptions.Value.Token; //测试token - _agvOptions.Value.UserName = - string.IsNullOrEmpty(_agvOptions.Value.UserName) ? "" : _agvOptions.Value.UserName; //测试用户名 - _agvOptions.Value.Password = - string.IsNullOrEmpty(_agvOptions.Value.Password) ? "" : _agvOptions.Value.Password; //测试密码 - _agvOptions.Value.Path = string.IsNullOrEmpty(_agvOptions.Value.Path) - ? "zozocnApi/custom/receiveProductionPlan" - : _agvOptions.Value.Path; //测试密码 - var flag = DateTime.Now.ToString("yyyyMMddHHmmss"); - - if (!string.IsNullOrEmpty(_agvOptions.Value.Token)) - { - var token = _agvOptions.Value.Token; - httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); - } - if (!string.IsNullOrEmpty(_agvOptions.Value.UserName) && !string.IsNullOrEmpty(_agvOptions.Value.Password)) - { - var username = _agvOptions.Value.UserName; - var password = _agvOptions.Value.Password; - httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", - Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}"))); - } - var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path); - ret = await client.PushOutTask4FWAsync(request).ConfigureAwait(false); - } - catch (Exception e) - { - ret = new AgvResultObject(); - ret.Code = "1"; - ret.Message = e.Message; - ret.ReqCode = job.RequestNumber; - //await unitOfWork.RollbackAsync().ConfigureAwait(false); - - } - return ret; - } +