|
|
|
@ -26,58 +26,105 @@ namespace Win_in.Sfs.Wms.Store.Jobs.AgvJobs; |
|
|
|
public class AgvJobAccountService : ApplicationService |
|
|
|
{ |
|
|
|
|
|
|
|
private readonly Func<string, IAgvJobAccountService> _Accessor; |
|
|
|
|
|
|
|
|
|
|
|
public AgvJobAccountService( |
|
|
|
Func<string, IAgvJobAccountService> Accessor |
|
|
|
|
|
|
|
|
|
|
|
) |
|
|
|
{ |
|
|
|
_Accessor = Accessor; |
|
|
|
|
|
|
|
} |
|
|
|
[HttpPost("accountOutOrder")] |
|
|
|
public async Task<AgvResultObject> AccountOutOrderAsync(AgvRequestOnlyJobHK request) |
|
|
|
{ |
|
|
|
var res = new AgvResultObject(); |
|
|
|
; |
|
|
|
|
|
|
|
|
|
|
|
List<string> errors= new List<string>(); |
|
|
|
var jobList = request.Data.Select(p => p.OrderNum).Distinct(); |
|
|
|
foreach (var job in jobList) |
|
|
|
{ |
|
|
|
var jobdetails = request.Data.Where(p => p.OrderNum == job); |
|
|
|
if (jobdetails!=null && jobdetails.Any()) |
|
|
|
{ |
|
|
|
var first= jobdetails.FirstOrDefault(); |
|
|
|
var agvJobAccountService = _Accessor(first.OrderType); |
|
|
|
var jobreq = new AgvRequestOnlyJobHK(); |
|
|
|
jobreq.Data =jobdetails.ToList(); |
|
|
|
var result = await agvJobAccountService.AccountOutOrderAsync(jobreq).ConfigureAwait(false); |
|
|
|
if (result.Code != "0") |
|
|
|
{ |
|
|
|
errors.Add($"任务{job}类型{first.OrderType}错误{result.Message}"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (errors.Count > 0) |
|
|
|
{ |
|
|
|
res.Code = "1"; |
|
|
|
res.Message =string.Join(",",errors); |
|
|
|
res.ReqCode = "0"; |
|
|
|
return res; |
|
|
|
} |
|
|
|
|
|
|
|
res.Code = "0"; |
|
|
|
res.ReqCode = "0"; |
|
|
|
res.Message = "OK"; |
|
|
|
|
|
|
|
return res; |
|
|
|
|
|
|
|
} |
|
|
|
//private readonly Func<string, IAgvJobAccountService> _Accessor;
|
|
|
|
|
|
|
|
//private readonly IAssembleIssueJobAppService _assembleIssueJobAppService;
|
|
|
|
//private readonly ICoatingIssueJobAppService _coatingIssueJobAppService;
|
|
|
|
//private readonly IInjectionIssueJobAppService _injectionIssueJobAppService;
|
|
|
|
//private readonly IKittingIssueJobAppService _kittingIssueJobAppService;
|
|
|
|
//private readonly ISparePartIssueJobAppService _sparePartIssueJobAppService;
|
|
|
|
//private readonly IProductionLineAppService _productionLineAppService;
|
|
|
|
|
|
|
|
//private readonly IUnplannedIssueJobAppService _unplannedIssueJobAppService;
|
|
|
|
//private readonly IUnplannedReceiptJobAppService _unplannedReceiptJobAppService;
|
|
|
|
|
|
|
|
|
|
|
|
//public AgvJobAccountService(
|
|
|
|
|
|
|
|
// IAssembleIssueJobAppService assembleIssueJobAppService,
|
|
|
|
// ICoatingIssueJobAppService coatingIssueJobAppService,
|
|
|
|
// IInjectionIssueJobAppService injectionIssueJobAppService,
|
|
|
|
// IKittingIssueJobAppService kittingIssueJobAppService,
|
|
|
|
// ISparePartIssueJobAppService sparePartIssueJobAppService,
|
|
|
|
// IProductionLineAppService productionLineAppService,
|
|
|
|
// IUnplannedIssueJobAppService unplannedIssueJobAppService,
|
|
|
|
// IUnplannedReceiptJobAppService unplannedReceiptJobAppService
|
|
|
|
// //Func<string, IAgvJobAccountService> Accessor
|
|
|
|
|
|
|
|
// )
|
|
|
|
//{
|
|
|
|
// _unplannedIssueJobAppService = unplannedIssueJobAppService;
|
|
|
|
// _assembleIssueJobAppService = assembleIssueJobAppService;
|
|
|
|
// _coatingIssueJobAppService = coatingIssueJobAppService;
|
|
|
|
// _injectionIssueJobAppService = injectionIssueJobAppService;
|
|
|
|
// _kittingIssueJobAppService = kittingIssueJobAppService;
|
|
|
|
// _sparePartIssueJobAppService = sparePartIssueJobAppService;
|
|
|
|
// _productionLineAppService = productionLineAppService;
|
|
|
|
// _unplannedIssueJobAppService = unplannedIssueJobAppService;
|
|
|
|
// _unplannedReceiptJobAppService = unplannedReceiptJobAppService;
|
|
|
|
|
|
|
|
//}
|
|
|
|
//[HttpPost("accountOutOrder")]
|
|
|
|
//public async Task<AgvResultObject> CallBackAgvAsync(AgvRequestDto request)
|
|
|
|
//{
|
|
|
|
// var res = new AgvResultObject();
|
|
|
|
// List<string> errors= new List<string>();
|
|
|
|
// var jobList = request.Data.Select(p => p.OrderNum).Distinct();//多少个任务
|
|
|
|
// foreach (var job in jobList)
|
|
|
|
// {
|
|
|
|
// var jobdetails = request.Data.Where(p => p.OrderNum == job);//每个任务的明细
|
|
|
|
// if (jobdetails!=null && jobdetails.Any())
|
|
|
|
// {
|
|
|
|
// var first= jobdetails.FirstOrDefault();//每个任务指定那种类型
|
|
|
|
// var jobreq = new AgvRequestDto();
|
|
|
|
// jobreq.Data = jobdetails.ToList();//
|
|
|
|
// switch (int.Parse(first.OrderType))
|
|
|
|
// {
|
|
|
|
// case (int)EnumJobType.AssembleIssueJob:
|
|
|
|
// await _assembleIssueJobAppService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// break;
|
|
|
|
// case (int)EnumJobType.CoatingIssueJob:
|
|
|
|
// await _coatingIssueJobAppService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// break;
|
|
|
|
// case (int)EnumJobType.InjectionIssueJob:
|
|
|
|
// await _injectionIssueJobAppService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// break;
|
|
|
|
// case (int)EnumJobType.KittingIssueJob:
|
|
|
|
// await _assembleIssueJobAppService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// break;
|
|
|
|
// case (int)EnumJobType.SparePartIssueJob:
|
|
|
|
// await _sparePartIssueJobAppService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// break;
|
|
|
|
// case (int)EnumJobType.UnplannedIssueJob:
|
|
|
|
// await _sparePartIssueJobAppService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// break;
|
|
|
|
// case (int)EnumJobType.UnplannedReceiptJob:
|
|
|
|
// await _sparePartIssueJobAppService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// break;
|
|
|
|
// }
|
|
|
|
|
|
|
|
// // var result = await agvJobAccountService.CallBackAgvAsync(jobreq).ConfigureAwait(false);
|
|
|
|
// if (result.Code != "0")
|
|
|
|
// {
|
|
|
|
// errors.Add($"任务{job}类型{first.OrderType}错误{result.Message}");
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// if (errors.Count > 0)
|
|
|
|
// {
|
|
|
|
// res.Code = "1";
|
|
|
|
// res.Message =string.Join(",",errors);
|
|
|
|
// res.ReqCode = "0";
|
|
|
|
// return res;
|
|
|
|
// }
|
|
|
|
|
|
|
|
// res.Code = "0";
|
|
|
|
// res.ReqCode = "0";
|
|
|
|
// res.Message = "OK";
|
|
|
|
|
|
|
|
// return res;
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
