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-26 18:11:01 +08:00
parent 1c49c6662f
commit 244b79eb0e
1 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,43 +89,52 @@ namespace BarCode.Web.Api.Controllers
{
_logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
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);
var 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(dto.SerialNumber);
}
//var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
var entityList = await _serialNumbersRepositories.GetEntityWmsBySuitNumber(dto.SerialNumber);
var list = new List<Domain.Entitys.SerialNumbers>();
list.Add(entity);
var res = await _serialNumbersRepositories.EditEntityList(list);
if (!res) return Result<SerialNumbersWmsResponse>.ReFailure(ResultCodes.DateWriteError);
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);
//}
_logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
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);
}