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-13 15:14:32 +08:00
parent 4c02d03bad
commit 0e44b7d2ec
2 changed files with 114 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,7 @@ namespace BarCode.Web.Api.Controllers
}; };
return reponse; return reponse;
} }
/// <summary> /// <summary>
/// Wms获取序列号信息 /// Wms获取序列号信息
/// </summary> /// </summary>
@@ -84,69 +85,109 @@ namespace BarCode.Web.Api.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("GetSerialNumber")] [Route("GetSerialNumber")]
public async Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumber(SerialNumbersWmsRequest dto) public async Task<Result<SerialNumbersWmsResponse>> GetSerialNumber(SerialNumbersWmsRequest dto)
{ {
_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);
//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() 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)
//};
////把查询到的序列码修改成使用
//entity.WmsGet(dto.SerialNumber);
//var list = new List<Domain.Entitys.SerialNumbers>();
//list.Add(entity);
//var res = await _serialNumbersRepositories.EditEntityList(list);
//以前是之前的
var entity = await _serialNumbersRepositories.GetEntityListBySuitNumber(dto.SerialNumber);
if (entity == null) return Result<List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.SerialNumberNoData);
var response2 = new List<SerialNumbersWmsResponse>();
for (int i = 0; i < entity.Count; i++)
{ {
if (entity[i].BoxId > 0) SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
return Result< List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.SerialNumberBindBox); MaterialNumber = entity.MaterialNumber,
if (entity[i].IsUse == true) CreateTime = entity.CreateTime,
return Result< List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.SerialNumberIsUse); Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),
SerialNumbersWmsResponse response = new SerialNumbersWmsResponse() IsTwo = entity.IsTwo,
{ TwoSerialNumber = entity.TwoSerialNumber,
// SerialNumber = entity[i].SerialNumber.Equals(dto.SerialNumber) ? entity[i].SerialNumber : entity[i].NumberCode, TwoNumberCode = entity.TwoNumberCode,
SerialNumber = entity[i].SerialNumber, IsNotCount = entity.IsNotCount
MaterialNumber = entity[i].MaterialNumber, };
CreateTime = entity[i].CreateTime, //把查询到的序列码修改成使用
Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity[i].CreatorId), entity.WmsGet(dto.SerialNumber);
IsTwo=entity[i].IsTwo,
TwoSerialNumber=entity[i].TwoSerialNumber,
TwoNumberCode= entity[i].TwoNumberCode,
IsNotCount = entity[i].IsNotCount
};
response2.Add(response);
//把查询到的序列码修改成使用
entity[i].WmsGet(dto.SerialNumber);
var list = new List<Domain.Entitys.SerialNumbers>(); var list = new List<Domain.Entitys.SerialNumbers>();
list.Add(entity[i]); 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< List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.DateWriteError); _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
_logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}"); return Result<SerialNumbersWmsResponse>.ReSuccess(response);
}
return Result<List<SerialNumbersWmsResponse>>.ReSuccess(response2);
} }
///// <summary>
///// Wms获取序列号信息
///// </summary>
///// <param name="dto"></param>
///// <returns></returns>
//[HttpPost]
//[Route("GetSerialNumber")]
//public async Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumber(SerialNumbersWmsRequest dto)
//{
// _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)
// //};
// ////把查询到的序列码修改成使用
// //entity.WmsGet(dto.SerialNumber);
// //var list = new List<Domain.Entitys.SerialNumbers>();
// //list.Add(entity);
// //var res = await _serialNumbersRepositories.EditEntityList(list);
// //以前是之前的
// var entity = await _serialNumbersRepositories.GetEntityListBySuitNumber(dto.SerialNumber);
// if (entity == null) return Result<List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.SerialNumberNoData);
// var response2 = new List<SerialNumbersWmsResponse>();
// for (int i = 0; i < entity.Count; i++)
// {
// if (entity[i].BoxId > 0)
// return Result< List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.SerialNumberBindBox);
// if (entity[i].IsUse == true)
// return Result< List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.SerialNumberIsUse);
// SerialNumbersWmsResponse response = new SerialNumbersWmsResponse()
// {
// // SerialNumber = entity[i].SerialNumber.Equals(dto.SerialNumber) ? entity[i].SerialNumber : entity[i].NumberCode,
// SerialNumber = entity[i].SerialNumber,
// MaterialNumber = entity[i].MaterialNumber,
// CreateTime = entity[i].CreateTime,
// Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity[i].CreatorId),
// IsTwo=entity[i].IsTwo,
// TwoSerialNumber=entity[i].TwoSerialNumber,
// TwoNumberCode= entity[i].TwoNumberCode,
// IsNotCount = entity[i].IsNotCount
// };
// response2.Add(response);
// //把查询到的序列码修改成使用
// entity[i].WmsGet(dto.SerialNumber);
// var list = new List<Domain.Entitys.SerialNumbers>();
// list.Add(entity[i]);
// var res = await _serialNumbersRepositories.EditEntityList(list);
// if (!res) return Result< List<SerialNumbersWmsResponse>>.ReFailure(ResultCodes.DateWriteError);
// _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
// }
// return Result<List<SerialNumbersWmsResponse>>.ReSuccess(response2);
//}
/// <summary> /// <summary>
/// 获取序列号信息 /// 获取序列号信息
/// </summary> /// </summary>

38
src/BarCode.Web.Domain/Services/BoxService.cs
View File

@@ -352,31 +352,31 @@ namespace BarCode.Web.Domain.Services
bool res_Rollback = false; bool res_Rollback = false;
bool isSuccess = true; bool isSuccess = true;
var sList = await _serialNumbersRepositories.GetEntityListByBoxIds(new List<int>() { boxId }); var sList = await _serialNumbersRepositories.GetEntityListByBoxIds(new List<int>() { boxId });
foreach (var f in sList) //foreach (var f in sList)
{ //{
if( f.IsTwo>1) // if( f.IsTwo>1)
{ // {
//说明是两件装的产品，那么要分别清除 // //说明是两件装的产品，那么要分别清除
var sList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(f.SerialNumber); // var sList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(f.SerialNumber);
for(int i=0;i<sList2.Count;i++) // for(int i=0;i<sList2.Count;i++)
{ // {
sList2[i].UnBox(); // sList2[i].UnBox();
if (!res_Rollback) // if (!res_Rollback)
{ // {
isSuccess = await _serialNumbersRepositories.EditEntityList(sList2, false); // isSuccess = await _serialNumbersRepositories.EditEntityList(sList2, false);
if (!isSuccess) res_Rollback = true; // if (!isSuccess) res_Rollback = true;
} // }
} // }
} // }
f.UnBox(); // f.UnBox();
} //}
// sList.ForEach(f => f.UnBox()); sList.ForEach(f => f.UnBox());
var res = await _boxRepositories.Edit(box, false); var res = await _boxRepositories.Edit(box, false);