18923810322/BarCode-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改了扫苗慢

Browse Source
This commit is contained in:
18923810322
2025-05-28 10:32:22 +08:00
parent 244b79eb0e
commit 969b8ef5ec
1 changed files with 114 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
src/BarCode.Web.Api/Controllers/WmsBoxController.cs
View File

@@ -87,20 +87,43 @@ namespace BarCode.Web.Api.Controllers
[Route("GetSerialNumber")] [Route("GetSerialNumber")]
public async Task<Result<SerialNumbersWmsResponse>> GetSerialNumber(SerialNumbersWmsRequest dto) public async Task<Result<SerialNumbersWmsResponse>> GetSerialNumber(SerialNumbersWmsRequest dto)
{ {
_logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
//var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber); _logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
var entityList = await _serialNumbersRepositories.GetEntityWmsBySuitNumber(dto.SerialNumber);
var list = new List<Domain.Entitys.SerialNumbers>();
var response = new SerialNumbersWmsResponse(); var response = new SerialNumbersWmsResponse();
for (int i = 0; i < entityList.Count; i++) var list = new List<Domain.Entitys.SerialNumbers>();
{ var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
var entity = entityList[i];
if (entity == null) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberNoData); if (entity == null) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberNoData);
if (entity.BoxId > 0) if (entity.BoxId > 0)
return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberBindBox); return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberBindBox);
if (entity.IsUse == true) if (entity.IsUse == true)
return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberIsUse); return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberIsUse);
if (entity.IsTwo > 1)
{
//把查询到的序列码修改成使用
string[] s = entity.TwoSerialNumber.Split(',');
// string[] sy = entity.TwoNumberCode.Split(',');
for (int i = 0; i < s.Length; i++)
{
response = new SerialNumbersWmsResponse()
{
SerialNumber = s[i],//entity.SerialNumber.Equals(dto.SerialNumber) ? s[i] : sy[i],
MaterialNumber = entity.MaterialNumber,
CreateTime = entity.CreateTime,
Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),
IsTwo = entity.IsTwo,
TwoSerialNumber = entity.TwoSerialNumber,
TwoNumberCode = entity.TwoNumberCode,
IsNotCount = entity.IsNotCount
};
var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]);
entity2.WmsGet(s[i]);
list.Add(entity2);
}
}
else
{
response = new SerialNumbersWmsResponse() response = new SerialNumbersWmsResponse()
{ {
SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode, SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
@@ -112,31 +135,92 @@ namespace BarCode.Web.Api.Controllers
TwoNumberCode = entity.TwoNumberCode, TwoNumberCode = entity.TwoNumberCode,
IsNotCount = entity.IsNotCount IsNotCount = entity.IsNotCount
}; };
//把查询到的序列码修改成使用 entity.WmsGet(dto.SerialNumber);
//if(entity.IsTwo>1)//说明是两件装
//{
// string[] s = entity.TwoSerialNumber.Split(',');
// for (int i = 0; i < s.Length; i++)
// {
// entity.WmsGet(s[i]);
// }
//}
//else
//{
entity.WmsGet(entityList[i].SerialNumber);
//}
list.Add(entity); list.Add(entity);
} }
var res = await _serialNumbersRepositories.EditEntityList(list); var res = await _serialNumbersRepositories.EditEntityList(list);
if (!res) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.DateWriteError); if (!res) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.DateWriteError);
_logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}"); _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
return Result<SerialNumbersWmsResponse>.ReSuccess(response); return Result<SerialNumbersWmsResponse>.ReSuccess(response);
//_logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
//var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
//if (entity.IsTwo > 1)//说明是两件装
//{
//}
//else
//{
// var list = new List<Domain.Entitys.SerialNumbers>();
// var response = new SerialNumbersWmsResponse();
// if (entity == null) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberNoData);
// if (entity.BoxId > 0)
// return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberBindBox);
// if (entity.IsUse == true)
// return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberIsUse);
// response = new SerialNumbersWmsResponse()
// {
// SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
// MaterialNumber = entity.MaterialNumber,
// CreateTime = entity.CreateTime,
// Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),
// IsTwo = entity.IsTwo,
// TwoSerialNumber = entity.TwoSerialNumber,
// TwoNumberCode = entity.TwoNumberCode,
// IsNotCount = entity.IsNotCount
// };
// entity.WmsGet(entityList.SerialNumber);
//}
//// var entityList = await _serialNumbersRepositories.GetEntityWmsBySuitNumber(dto.SerialNumber);
//var list = new List<Domain.Entitys.SerialNumbers>();
//var response = new SerialNumbersWmsResponse();
//for (int i = 0; i < entityList.Count; i++)
//{
// var entity = entityList[i];
// if (entity == null) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberNoData);
// if (entity.BoxId > 0)
// return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberBindBox);
// if (entity.IsUse == true)
// return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.SerialNumberIsUse);
// response = new SerialNumbersWmsResponse()
// {
// SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
// MaterialNumber = entity.MaterialNumber,
// CreateTime = entity.CreateTime,
// Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),
// IsTwo = entity.IsTwo,
// TwoSerialNumber = entity.TwoSerialNumber,
// TwoNumberCode = entity.TwoNumberCode,
// IsNotCount = entity.IsNotCount
// };
// //把查询到的序列码修改成使用
// //if(entity.IsTwo>1)//说明是两件装
// //{
// // string[] s = entity.TwoSerialNumber.Split(',');
// // for (int i = 0; i < s.Length; i++)
// // {
// // entity.WmsGet(s[i]);
// // }
// //}
// //else
// //{
// entity.WmsGet(entityList[i].SerialNumber);
// //}
// list.Add(entity);
//}
//var res = await _serialNumbersRepositories.EditEntityList(list);
// if (!res) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.DateWriteError);
// _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
//return Result<SerialNumbersWmsResponse>.ReSuccess(response);
} }
///// <summary> ///// <summary>