修改了更新已使用
This commit is contained in:
@@ -89,13 +89,19 @@ namespace BarCode.Web.Api.Controllers
|
|||||||
{
|
{
|
||||||
_logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
|
_logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
|
||||||
|
|
||||||
var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
|
//var entity = await _serialNumbersRepositories.GetEntityWms(dto.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 == 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);
|
||||||
var 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,
|
||||||
MaterialNumber = entity.MaterialNumber,
|
MaterialNumber = entity.MaterialNumber,
|
||||||
@@ -107,22 +113,25 @@ namespace BarCode.Web.Api.Controllers
|
|||||||
IsNotCount = entity.IsNotCount
|
IsNotCount = entity.IsNotCount
|
||||||
};
|
};
|
||||||
//把查询到的序列码修改成使用
|
//把查询到的序列码修改成使用
|
||||||
if(entity.IsTwo>1)//说明是两件装
|
//if(entity.IsTwo>1)//说明是两件装
|
||||||
{
|
//{
|
||||||
string[] s = entity.TwoSerialNumber.Split(',');
|
// string[] s = entity.TwoSerialNumber.Split(',');
|
||||||
for (int i = 0; i < s.Length; i++)
|
// for (int i = 0; i < s.Length; i++)
|
||||||
{
|
// {
|
||||||
entity.WmsGet(s[i]);
|
// entity.WmsGet(s[i]);
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
entity.WmsGet(dto.SerialNumber);
|
entity.WmsGet(entityList[i].SerialNumber);
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
list.Add(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
var list = new List<Domain.Entitys.SerialNumbers>();
|
|
||||||
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)}");
|
||||||
|
|||||||
Reference in New Issue
Block a user