zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

dev_DY_CC
赵新宇 1 year ago
parent
4909b31f4e
commit
f014e9163b
6 changed files with 101 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
  2. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
  3. 21
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
  4. 21
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
  5. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs
  6. 19
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/ProxyIssueJobDto.cs

51
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
View File

@ -9,6 +9,7 @@ using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter; using Castle.Components.DictionaryAdapter;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using MyNamespace; using MyNamespace;
using Volo.Abp; using Volo.Abp;
@ -43,8 +44,10 @@ public class AssembleIssueJobAppService
private readonly IHttpClientFactory _httpClientFactory; private readonly IHttpClientFactory _httpClientFactory;
private readonly ITransferLibRequestAppService _transferLibRequestAppService; private readonly ITransferLibRequestAppService _transferLibRequestAppService;
private readonly IOptions<RestoOptions> _options; private readonly IOptions<RestoOptions> _options;
private readonly ILogger<AssembleIssueJobAppService> _logger;
public AssembleIssueJobAppService( public AssembleIssueJobAppService(
ILogger<AssembleIssueJobAppService> logger,
IAssembleIssueJobRepository repository, IAssembleIssueJobManager assembleIssueJobManager, IAssembleIssueJobRepository repository, IAssembleIssueJobManager assembleIssueJobManager,
ILocationAppService locationAppService, ILocationAppService locationAppService,
IAssembleIssueNoteAppService assembleIssueNoteAppService, IExpectOutAppService expectOutAppService IAssembleIssueNoteAppService assembleIssueNoteAppService, IExpectOutAppService expectOutAppService
@ -59,6 +62,7 @@ public class AssembleIssueJobAppService
_httpClientFactory = httpClientFactory; _httpClientFactory = httpClientFactory;
_options = options; _options = options;
_transferLibRequestAppService = transferLibRequestAppService; _transferLibRequestAppService = transferLibRequestAppService;
_logger = logger;
} }
[HttpPost("get-by-number-2")] [HttpPost("get-by-number-2")]
@ -296,24 +300,25 @@ public class AssembleIssueJobAppService
/// <param name="pLoc"></param> /// <param name="pLoc"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("sync-issue-job-stereo")] [HttpPost("sync-issue-job-stereo")]
public async Task<ReusltObject> SyncIssueJobStereoAsync(List<AssembleIssueJobDTO> input, string pLoc) public async Task<ReusltObject> SyncIssueJobStereoAsync(List<AssembleIssueJobDTO> input, string pLoc,Guid uid)
{ {
var ret = new ReusltObject(); var ret = new ReusltObject();
ret.Code = "1"; ret.Code = 0;
ret.Message = "操作成功"; ret.Message = "操作成功";
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
try try
{ {
var IssueJobToRestoDetailDTOs = new List<IssueJobToRestoDetailDTO>(); var IssueJobToRestoDetailDTOs = new List<IssueJobToRestoDetailDTO>();
var main = new IssueJobToRestoDTO(); var main = new IssueJobToRestoDTO();
main.OperatorName = CurrentUser.UserName; main.Uuid = uid;
main.OperatorName = string.IsNullOrEmpty(CurrentUser.UserName)? "admin": CurrentUser.UserName;
foreach (var job in input) foreach (var job in input)
{ {
foreach (var jobitem in job.Details) foreach (var jobitem in job.Details)
{ {
IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO
{ {
Count = jobitem.HandledToQty, Count = jobitem.RecommendFromQty,
ProductNo = jobitem.ItemCode, ProductNo = jobitem.ItemCode,
NeedSite = pLoc, NeedSite = pLoc,
WorkNo = job.Number, WorkNo = job.Number,
@ -333,6 +338,20 @@ public class AssembleIssueJobAppService
_options.Value.Password = ""; //测试密码 _options.Value.Password = ""; //测试密码
#endif #endif
//var json = JsonSerializer.Serialize(main);
_options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址
_options.Value.Token = ""; //测试token
_options.Value.UserName = ""; //测试用户名
_options.Value.Password = ""; //测试密码
_options.Value.Path = "zozocnApi/custom/receiveProductionPlan"; //测试密码
_logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(_options));
var flag = DateTime.Now.ToString("yyyyMMddHHmmss");
_logger.LogInformation($"标志{flag}开始调用高通WMS:传递值{System.Text.Json.JsonSerializer.Serialize(main)}");
if (!string.IsNullOrEmpty(_options.Value.Token)) if (!string.IsNullOrEmpty(_options.Value.Token))
{ {
var token = _options.Value.Token; var token = _options.Value.Token;
@ -349,11 +368,13 @@ public class AssembleIssueJobAppService
var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path); var client = new IssueJobToRestoClient(_options.Value.Address, httpclient, _options.Value.Path);
ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
_logger.LogInformation($"标志{flag}调用高通WMS:返回值{ret}");
} }
catch (Exception ex) catch (Exception ex)
{ {
ret = new ReusltObject(); ret = new ReusltObject();
ret.Code = "2"; ret.Code = 1;
ret.Message = ex.Message; ret.Message = ex.Message;
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
} }
@ -368,7 +389,7 @@ public class AssembleIssueJobAppService
var json = JsonSerializer.Serialize(input); var json = JsonSerializer.Serialize(input);
#endif #endif
var errors = new List<string>(); var errors = new List<string>();
var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" }; var ret = new ReusltObject { Code = int.Parse(GaoTongResultStatus.Success), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" };
try try
{ {
if (input.Jobs.Count > 0) if (input.Jobs.Count > 0)
@ -378,6 +399,12 @@ public class AssembleIssueJobAppService
var query = _repository.WithDetails() var query = _repository.WithDetails()
.Where(p => numbers.Contains(p.Number)); .Where(p => numbers.Contains(p.Number));
var entities = query.ToList(); var entities = query.ToList();
if (entities.Count == 0)
{
errors.Add($"任务号{string.Join(",", numbers)}不存在!");
}
var dtos = ObjectMapper.Map<List<AssembleIssueJob>, List<AssembleIssueJobDTO>>(entities); var dtos = ObjectMapper.Map<List<AssembleIssueJob>, List<AssembleIssueJobDTO>>(entities);
if (input.Jobs.Count == entities.Count) if (input.Jobs.Count == entities.Count)
{ {
@ -417,7 +444,7 @@ public class AssembleIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message Code = int.Parse(GaoTongResultStatus.Failure), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message
}; };
return ret; return ret;
} }
@ -426,7 +453,7 @@ public class AssembleIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", Code = int.Parse(GaoTongResultStatus.Failure),
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
Message = string.Join(",", errors.ToArray()) Message = string.Join(",", errors.ToArray())
}; };
@ -510,6 +537,8 @@ public class AssembleIssueJobAppService
/// <returns></returns> /// <returns></returns>
private async Task CheckDimensionalStorehouseAsync(AssembleIssueJobEditInput input) private async Task CheckDimensionalStorehouseAsync(AssembleIssueJobEditInput input)
{ {
var jobDetailInputdetail = input.Details.FirstOrDefault(); var jobDetailInputdetail = input.Details.FirstOrDefault();
var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode) var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
@ -528,17 +557,19 @@ public class AssembleIssueJobAppService
/// <returns></returns> /// <returns></returns>
private async Task CheckDimensionalStorehouseAsync(AssembleIssueJobDTO assembleIssueJobDto) private async Task CheckDimensionalStorehouseAsync(AssembleIssueJobDTO assembleIssueJobDto)
{ {
var jobDetailInputdetail = assembleIssueJobDto.Details.FirstOrDefault(); var jobDetailInputdetail = assembleIssueJobDto.Details.FirstOrDefault();
var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode) var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
.ConfigureAwait(false); .ConfigureAwait(false);
if (loctionDto.Type == EnumLocationType.DimensionalStorehouse) if (loctionDto.Type == EnumLocationType.DimensionalStorehouse)
{ {
//TODO 立体库 //TODO 立体库
var ret = await SyncIssueJobStereoAsync(new List<AssembleIssueJobDTO> { assembleIssueJobDto }, var ret = await SyncIssueJobStereoAsync(new List<AssembleIssueJobDTO> { assembleIssueJobDto },
loctionDto.Code).ConfigureAwait(false); loctionDto.Code,assembleIssueJobDto.Id).ConfigureAwait(false);
if (ret.Code != "1") if (ret.Code != 0)
{ {
throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}"); throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}");
} }

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
View File

@ -318,7 +318,7 @@ public class CoatingIssueJobAppService
public async Task<ReusltObject> SyncIssueJobStereoAsync(List<CoatingIssueJobDTO> input, string pLoc) public async Task<ReusltObject> SyncIssueJobStereoAsync(List<CoatingIssueJobDTO> input, string pLoc)
{ {
var ret = new ReusltObject(); var ret = new ReusltObject();
ret.Code = "0"; ret.Code = int.Parse(GaoTongResultStatus.Success);
ret.Message = "操作成功"; ret.Message = "操作成功";
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
try try
@ -388,7 +388,7 @@ public class CoatingIssueJobAppService
_logger.LogInformation($"标志{flag}开始调用高通WMS:传递值{System.Text.Json.JsonSerializer.Serialize(main)}"); _logger.LogInformation($"标志{flag}开始调用高通WMS:传递值{System.Text.Json.JsonSerializer.Serialize(main)}");
//_logger.LogInformation(MakeGrid($"标志{flag}开始调用高通WMS明细", main.Details.ToList())); //_logger.LogInformation(MakeGrid($"标志{flag}开始调用高通WMS明细", main.Details.ToList()));
ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
@ -398,7 +398,7 @@ public class CoatingIssueJobAppService
catch (Exception ex) catch (Exception ex)
{ {
ret = new ReusltObject(); ret = new ReusltObject();
ret.Code = "2"; ret.Code = int.Parse(GaoTongResultStatus.Failure);
ret.Message = ex.Message; ret.Message = ex.Message;
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
} }
@ -413,7 +413,7 @@ public class CoatingIssueJobAppService
var json = JsonSerializer.Serialize(input); var json = JsonSerializer.Serialize(input);
#endif #endif
var errors = new List<string>(); var errors = new List<string>();
var ret = new ReusltObject { Code = "0", OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Message = "操作成功" }; var ret = new ReusltObject { Code = 1, OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Message = "操作成功" };
try try
{ {
if (input.Jobs.Count > 0) if (input.Jobs.Count > 0)
@ -424,6 +424,10 @@ public class CoatingIssueJobAppService
.Where(p => numbers.Contains(p.Number)); .Where(p => numbers.Contains(p.Number));
var entities = query.ToList(); var entities = query.ToList();
var dtos = ObjectMapper.Map<List<CoatingIssueJob>, List<CoatingIssueJobDTO>>(entities); var dtos = ObjectMapper.Map<List<CoatingIssueJob>, List<CoatingIssueJobDTO>>(entities);
if (entities.Count == 0)
{
errors.Add($"任务号{string.Join(",", numbers)}不存在!") ;
}
if (input.Jobs.Count == entities.Count) if (input.Jobs.Count == entities.Count)
{ {
errors.Add("立体库提交出库任务和WMS任务不符,请核对! \n"); errors.Add("立体库提交出库任务和WMS任务不符,请核对! \n");
@ -462,7 +466,7 @@ public class CoatingIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message Code = int.Parse(GaoTongResultStatus.Failure), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message
}; };
return ret; return ret;
} }
@ -471,7 +475,7 @@ public class CoatingIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", Code = int.Parse(GaoTongResultStatus.Failure),
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
Message = string.Join(",", errors.ToArray()) Message = string.Join(",", errors.ToArray())
}; };
@ -588,7 +592,7 @@ public class CoatingIssueJobAppService
loctionDto.Code).ConfigureAwait(false); loctionDto.Code).ConfigureAwait(false);
_logger.LogInformation($"立体库任务结束标记{flag}，返回值{ret}"); _logger.LogInformation($"立体库任务结束标记{flag}，返回值{ret}");
if (ret.Code != "0") if (ret.Code != 0)
{ {
throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}"); throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}");
} }

21
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
View File

@ -297,7 +297,7 @@ public class InjectionIssueJobAppService
public async Task<ReusltObject> SyncIssueJobStereoAsync(List<InjectionIssueJobDTO> input, string pLoc) public async Task<ReusltObject> SyncIssueJobStereoAsync(List<InjectionIssueJobDTO> input, string pLoc)
{ {
var ret = new ReusltObject(); var ret = new ReusltObject();
ret.Code = "1"; ret.Code = 1;
ret.Message = "操作成功"; ret.Message = "操作成功";
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
try try
@ -331,6 +331,15 @@ public class InjectionIssueJobAppService
_options.Value.Password = ""; //测试密码 _options.Value.Password = ""; //测试密码
#endif #endif
//var json = JsonSerializer.Serialize(main);
_options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址
_options.Value.Token = ""; //测试token
_options.Value.UserName = ""; //测试用户名
_options.Value.Password = ""; //测试密码
_options.Value.Path = "zozocnApi/custom/receiveProductionPlan"; //测试密码
//_logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(_options));
if (!string.IsNullOrEmpty(_options.Value.Token)) if (!string.IsNullOrEmpty(_options.Value.Token))
{ {
var token = _options.Value.Token; var token = _options.Value.Token;
@ -351,7 +360,7 @@ public class InjectionIssueJobAppService
catch (Exception ex) catch (Exception ex)
{ {
ret = new ReusltObject(); ret = new ReusltObject();
ret.Code = "2"; ret.Code = -1;
ret.Message = ex.Message; ret.Message = ex.Message;
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
} }
@ -366,7 +375,7 @@ public class InjectionIssueJobAppService
var json = JsonSerializer.Serialize(input); var json = JsonSerializer.Serialize(input);
#endif #endif
var errors = new List<string>(); var errors = new List<string>();
var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" }; var ret = new ReusltObject { Code = 1, OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" };
try try
{ {
if (input.Jobs.Count > 0) if (input.Jobs.Count > 0)
@ -415,7 +424,7 @@ public class InjectionIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", Code = 2,
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
Message = ex.Message Message = ex.Message
}; };
@ -426,7 +435,7 @@ public class InjectionIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", Code = 2,
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
Message = string.Join(",", errors.ToArray()) Message = string.Join(",", errors.ToArray())
}; };
@ -538,7 +547,7 @@ public class InjectionIssueJobAppService
//TODO 立体库 //TODO 立体库
var ret = await SyncIssueJobStereoAsync(new List<InjectionIssueJobDTO> { injectionIssueJobDto }, var ret = await SyncIssueJobStereoAsync(new List<InjectionIssueJobDTO> { injectionIssueJobDto },
loctionDto.Code).ConfigureAwait(false); loctionDto.Code).ConfigureAwait(false);
if (ret.Code != "1") if (ret.Code != 1)
{ {
throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}"); throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}");
} }

21
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
View File

@ -296,7 +296,7 @@ public class KittingIssueJobAppService
public async Task<ReusltObject> SyncIssueJobStereoAsync(List<KittingIssueJobDTO> input, string pLoc) public async Task<ReusltObject> SyncIssueJobStereoAsync(List<KittingIssueJobDTO> input, string pLoc)
{ {
var ret = new ReusltObject(); var ret = new ReusltObject();
ret.Code = "1"; ret.Code = 1;
ret.Message = "操作成功"; ret.Message = "操作成功";
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
try try
@ -330,6 +330,15 @@ public class KittingIssueJobAppService
_options.Value.Password = ""; //测试密码 _options.Value.Password = ""; //测试密码
#endif #endif
//var json = JsonSerializer.Serialize(main);
_options.Value.Address = "http://7e42682n64.goho.co:21171/"; //测试地址
_options.Value.Token = ""; //测试token
_options.Value.UserName = ""; //测试用户名
_options.Value.Password = ""; //测试密码
_options.Value.Path = "zozocnApi/custom/receiveProductionPlan"; //测试密码
//_logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(_options));
if (!string.IsNullOrEmpty(_options.Value.Token)) if (!string.IsNullOrEmpty(_options.Value.Token))
{ {
var token = _options.Value.Token; var token = _options.Value.Token;
@ -350,7 +359,7 @@ public class KittingIssueJobAppService
catch (Exception ex) catch (Exception ex)
{ {
ret = new ReusltObject(); ret = new ReusltObject();
ret.Code = "2"; ret.Code = -1;
ret.Message = ex.Message; ret.Message = ex.Message;
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
} }
@ -365,7 +374,7 @@ public class KittingIssueJobAppService
var json = JsonSerializer.Serialize(input); var json = JsonSerializer.Serialize(input);
#endif #endif
var errors = new List<string>(); var errors = new List<string>();
var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" }; var ret = new ReusltObject { Code = 1, OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" };
try try
{ {
if (input.Jobs.Count > 0) if (input.Jobs.Count > 0)
@ -414,7 +423,7 @@ public class KittingIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message Code = 2, OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message
}; };
return ret; return ret;
} }
@ -423,7 +432,7 @@ public class KittingIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", Code = 2,
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
Message = string.Join(",", errors.ToArray()) Message = string.Join(",", errors.ToArray())
}; };
@ -535,7 +544,7 @@ public class KittingIssueJobAppService
//TODO 立体库 //TODO 立体库
var ret = await SyncIssueJobStereoAsync(new List<KittingIssueJobDTO> { kittingIssueJobDto }, var ret = await SyncIssueJobStereoAsync(new List<KittingIssueJobDTO> { kittingIssueJobDto },
loctionDto.Code).ConfigureAwait(false); loctionDto.Code).ConfigureAwait(false);
if (ret.Code != "1") if (ret.Code != 1)
{ {
throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}"); throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}");
} }

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs
View File

@ -289,7 +289,7 @@ public class SparePartIssueJobAppService
public async Task<ReusltObject> SyncIssueJobStereoAsync(List<SparePartIssueJobDTO> input, string pLoc) public async Task<ReusltObject> SyncIssueJobStereoAsync(List<SparePartIssueJobDTO> input, string pLoc)
{ {
var ret = new ReusltObject(); var ret = new ReusltObject();
ret.Code = "1"; ret.Code = 1;
ret.Message = "操作成功"; ret.Message = "操作成功";
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
try try
@ -343,7 +343,7 @@ public class SparePartIssueJobAppService
catch (Exception ex) catch (Exception ex)
{ {
ret = new ReusltObject(); ret = new ReusltObject();
ret.Code = "2"; ret.Code = -1;
ret.Message = ex.Message; ret.Message = ex.Message;
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
} }
@ -358,7 +358,7 @@ public class SparePartIssueJobAppService
var json = JsonSerializer.Serialize(input); var json = JsonSerializer.Serialize(input);
#endif #endif
var errors = new List<string>(); var errors = new List<string>();
var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" }; var ret = new ReusltObject { Code = 1, OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" };
try try
{ {
if (input.Jobs.Count > 0) if (input.Jobs.Count > 0)
@ -407,7 +407,7 @@ public class SparePartIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message Code = 2, OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message
}; };
return ret; return ret;
} }
@ -416,7 +416,7 @@ public class SparePartIssueJobAppService
{ {
ret = new ReusltObject ret = new ReusltObject
{ {
Code = "2", Code = 2,
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
Message = string.Join(",", errors.ToArray()) Message = string.Join(",", errors.ToArray())
}; };
@ -528,7 +528,7 @@ public class SparePartIssueJobAppService
//TODO 立体库 //TODO 立体库
var ret = await SyncIssueJobStereoAsync(new List<SparePartIssueJobDTO> { sparePartIssueJobDto }, var ret = await SyncIssueJobStereoAsync(new List<SparePartIssueJobDTO> { sparePartIssueJobDto },
loctionDto.Code).ConfigureAwait(false); loctionDto.Code).ConfigureAwait(false);
if (ret.Code != "1") if (ret.Code != 1)
{ {
throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}"); throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}");
} }

19
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/ProxyIssueJobDto.cs
View File

@ -54,7 +54,7 @@ public partial class IssueJobToRestoDTO
[System.Text.Json.Serialization.JsonPropertyName("operatorName")] [System.Text.Json.Serialization.JsonPropertyName("operatorName")]
public string OperatorName { get; set; } public string OperatorName { get; set; }
[System.Text.Json.Serialization.JsonPropertyName("details")] [System.Text.Json.Serialization.JsonPropertyName("data")]
public System.Collections.Generic.ICollection<IssueJobToRestoDetailDTO> Details { get; set; } public System.Collections.Generic.ICollection<IssueJobToRestoDetailDTO> Details { get; set; }
} }
@ -90,14 +90,21 @@ public partial class IssueJobToRestoDetailDTO
public partial class ReusltObject public partial class ReusltObject
{ {
[System.Text.Json.Serialization.JsonPropertyName("code")] [System.Text.Json.Serialization.JsonPropertyName("Code")]
public string Code { get; set; } public int Code { get; set; }
[System.Text.Json.Serialization.JsonPropertyName("message")] [System.Text.Json.Serialization.JsonPropertyName("Message")]
public string Message { get; set; } public string Message { get; set; }
[System.Text.Json.Serialization.JsonPropertyName("operateTime")] [System.Text.Json.Serialization.JsonPropertyName("OperateTime")]
public string OperateTime { get; set; } public string OperateTime { get; set; }
[System.Text.Json.Serialization.JsonPropertyName("Data")]
public string Data { set; get; }="";
} }

Write Preview
Loading…
Cancel
Save