diff --git a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
index 6defc9a..0d59712 100644
--- a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
+++ b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
@@ -77,6 +77,7 @@ namespace BarCode.Web.Api.Controllers
};
return reponse;
}
+
///
/// Wms获取序列号信息
///
@@ -84,69 +85,109 @@ namespace BarCode.Web.Api.Controllers
///
[HttpPost]
[Route("GetSerialNumber")]
- public async Task>> GetSerialNumber(SerialNumbersWmsRequest dto)
+ public async Task> GetSerialNumber(SerialNumbersWmsRequest dto)
{
_logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
- //var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
- //if (entity == null) return Result.ReFailure(ResultCodes.SerialNumberNoData);
- //if (entity.BoxId > 0)
- // return Result.ReFailure(ResultCodes.SerialNumberBindBox);
- //if (entity.IsUse == true)
- // return Result.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();
- //list.Add(entity);
- //var res = await _serialNumbersRepositories.EditEntityList(list);
-
- //以前是之前的
-
- var entity = await _serialNumbersRepositories.GetEntityListBySuitNumber(dto.SerialNumber);
- if (entity == null) return Result>.ReFailure(ResultCodes.SerialNumberNoData);
- var response2 = new List();
- for (int i = 0; i < entity.Count; i++)
+ var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
+ if (entity == null) return Result.ReFailure(ResultCodes.SerialNumberNoData);
+ if (entity.BoxId > 0)
+ return Result.ReFailure(ResultCodes.SerialNumberBindBox);
+ if (entity.IsUse == true)
+ return Result.ReFailure(ResultCodes.SerialNumberIsUse);
+ var response = new SerialNumbersWmsResponse()
{
- if (entity[i].BoxId > 0)
- return Result< List>.ReFailure(ResultCodes.SerialNumberBindBox);
- if (entity[i].IsUse == true)
- return Result< List>.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);
-
+ 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(dto.SerialNumber);
var list = new List();
- list.Add(entity[i]);
- var res = await _serialNumbersRepositories.EditEntityList(list);
+ list.Add(entity);
+ var res = await _serialNumbersRepositories.EditEntityList(list);
+ if (!res) return Result.ReFailure(ResultCodes.DateWriteError);
- if (!res) return Result< List>.ReFailure(ResultCodes.DateWriteError);
+ _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
- _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
- }
- return Result>.ReSuccess(response2);
-
+ return Result.ReSuccess(response);
}
+ /////
+ ///// Wms获取序列号信息
+ /////
+ /////
+ /////
+ //[HttpPost]
+ //[Route("GetSerialNumber")]
+ //public async Task>> GetSerialNumber(SerialNumbersWmsRequest dto)
+ //{
+ // _logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}");
+
+ // //var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber);
+ // //if (entity == null) return Result.ReFailure(ResultCodes.SerialNumberNoData);
+ // //if (entity.BoxId > 0)
+ // // return Result.ReFailure(ResultCodes.SerialNumberBindBox);
+ // //if (entity.IsUse == true)
+ // // return Result.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();
+ // //list.Add(entity);
+ // //var res = await _serialNumbersRepositories.EditEntityList(list);
+
+ // //以前是之前的
+
+ // var entity = await _serialNumbersRepositories.GetEntityListBySuitNumber(dto.SerialNumber);
+ // if (entity == null) return Result>.ReFailure(ResultCodes.SerialNumberNoData);
+ // var response2 = new List();
+ // for (int i = 0; i < entity.Count; i++)
+ // {
+ // if (entity[i].BoxId > 0)
+ // return Result< List>.ReFailure(ResultCodes.SerialNumberBindBox);
+ // if (entity[i].IsUse == true)
+ // return Result< List>.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();
+ // list.Add(entity[i]);
+ // var res = await _serialNumbersRepositories.EditEntityList(list);
+
+ // if (!res) return Result< List>.ReFailure(ResultCodes.DateWriteError);
+
+ // _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}");
+ // }
+ // return Result>.ReSuccess(response2);
+
+ //}
+
///
/// 获取序列号信息
///
diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs
index a13d278..5e5681e 100644
--- a/src/BarCode.Web.Domain/Services/BoxService.cs
+++ b/src/BarCode.Web.Domain/Services/BoxService.cs
@@ -352,31 +352,31 @@ namespace BarCode.Web.Domain.Services
bool res_Rollback = false;
bool isSuccess = true;
var sList = await _serialNumbersRepositories.GetEntityListByBoxIds(new List() { boxId });
- foreach (var f in sList)
- {
- if( f.IsTwo>1)
- {
- //说明是两件装的产品,那么要分别清除
- var sList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(f.SerialNumber);
- for(int i=0;i1)
+ // {
+ // //说明是两件装的产品,那么要分别清除
+ // var sList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(f.SerialNumber);
+ // for(int i=0;i f.UnBox());
+ sList.ForEach(f => f.UnBox());
var res = await _boxRepositories.Edit(box, false);