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-19 16:00:00 +08:00
parent 5a3c26e94e
commit 2fc20d1c53
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
View File

@@ -85,12 +85,13 @@
打印 打印
</summary> </summary>
</member> </member>
<member name="M:BarCode.Web.Domain.Entitys.Box.UnSerialNumber(System.String,System.String)"> <member name="M:BarCode.Web.Domain.Entitys.Box.UnSerialNumber(System.String,System.String,System.String)">
<summary> <summary>
解绑序列号 解绑序列号
</summary> </summary>
<param name="serialNumber"></param> <param name="serialNumber"></param>
<param name="materialNumber"></param> <param name="materialNumber"></param>
/// <param name="isNotCount">是否不计数</param>
</member> </member>
<member name="M:BarCode.Web.Domain.Entitys.Box.Clear"> <member name="M:BarCode.Web.Domain.Entitys.Box.Clear">
<summary> <summary>

26
src/BarCode.Web.Domain/Entitys/Box.cs
View File

@@ -121,7 +121,8 @@ namespace BarCode.Web.Domain.Entitys
/// </summary> /// </summary>
/// <param name="serialNumber"></param> /// <param name="serialNumber"></param>
/// <param name="materialNumber"></param> /// <param name="materialNumber"></param>
public Result UnSerialNumber(string serialNumber, string materialNumber) /// /// <param name="isNotCount">是否不计数</param>
public Result UnSerialNumber(string serialNumber, string materialNumber,string isNotCount)
{ {
var detail = this.Details.FirstOrDefault(f => f.MaterialNumber.Equals(materialNumber)); var detail = this.Details.FirstOrDefault(f => f.MaterialNumber.Equals(materialNumber));
if (detail == null) if (detail == null)
@@ -130,14 +131,31 @@ namespace BarCode.Web.Domain.Entitys
if (serial == null) if (serial == null)
return Result.ReFailure(ResultCodes.BoxSerialNumberNoDataError); return Result.ReFailure(ResultCodes.BoxSerialNumberNoDataError);
detail.SerialNumbers.Remove(serialNumber); detail.SerialNumbers.Remove(serialNumber);
detail.Qty = detail.SerialNumbers.Count();
// detail.Qty = detail.SerialNumbers.Count();
if(isNotCount=="1")
{
}
else
{
detail.Qty = detail.Qty - 1;
}
//如果数量为0了就删除这条明细 //如果数量为0了就删除这条明细
if (detail.SerialNumbers.Count() <= 0) if (detail.Qty <= 0)
this.Details.Remove(detail); this.Details.Remove(detail);
//如果没有明细了 就把状态改成未使用 //如果没有明细了 就把状态改成未使用
if (this.Details.Count() <= 0) if (detail.Qty <= 0)
this.Status = BoxStatus.NoUse; this.Status = BoxStatus.NoUse;
////如果数量为0了就删除这条明细
//if (detail.SerialNumbers.Count() <= 0)
// this.Details.Remove(detail);
////如果没有明细了 就把状态改成未使用
//if (this.Details.Count() <= 0)
// this.Status = BoxStatus.NoUse;
return Result.ReSuccess(); return Result.ReSuccess();
} }

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

@@ -303,7 +303,7 @@ namespace BarCode.Web.Domain.Services
//判断使用的是数字序列码还是序列码 //判断使用的是数字序列码还是序列码
var sStr = s.IsUseNumber == true ? s.NumberCode : s.SerialNumber; var sStr = s.IsUseNumber == true ? s.NumberCode : s.SerialNumber;
var resUn = box.UnSerialNumber(sStr, dto.MaterialNumber); var resUn = box.UnSerialNumber(sStr, dto.MaterialNumber,"0");
if (!resUn.IsSuccess) return resUn; if (!resUn.IsSuccess) return resUn;
//var sList = await _serialNumbersRepositories.GetEntityListContainNumber(new List<string>() { dto.SerialNumber }); //var sList = await _serialNumbersRepositories.GetEntityListContainNumber(new List<string>() { dto.SerialNumber });
@@ -321,11 +321,12 @@ namespace BarCode.Web.Domain.Services
if (Twos == null) if (Twos == null)
return Result.ReFailure(ResultCodes.SerialNumberNoDateError); return Result.ReFailure(ResultCodes.SerialNumberNoDateError);
////判断使用的是数字序列码还是序列码 ////判断使用的是数字序列码还是序列码
//var TwosStr = s.IsUseNumber == true ? s.NumberCode : s.SerialNumber; sList.AddRange(TwosList);
var TwosStr = s.IsUseNumber == true ? Twos.NumberCode : Twos.SerialNumber;
//_logger.LogInformation($"获取到：TwosStr:{TwosStr}"); //_logger.LogInformation($"获取到：TwosStr:{TwosStr}");
//_logger.LogInformation($"获取到：TwosStr:{TwosStr}"); //_logger.LogInformation($"获取到：TwosStr:{TwosStr}");
var TworesUn = box.UnSerialNumber(dto.SerialNumber, dto.MaterialNumber); var TworesUn = box.UnSerialNumber(TwosStr, dto.MaterialNumber,"1");
if (!TworesUn.IsSuccess) return TworesUn; if (!TworesUn.IsSuccess) return TworesUn;
//var sList = await _serialNumbersRepositories.GetEntityListContainNumber(new List<string>() { dto.SerialNumber }); //var sList = await _serialNumbersRepositories.GetEntityListContainNumber(new List<string>() { dto.SerialNumber });

8
src/BarCode.Web.Domain/Services/SerialNumberService.cs
View File

@@ -450,17 +450,17 @@ namespace BarCode.Web.Domain.Services
public async Task<Result> Use(List<int> sGIds) public async Task<Result> Use(List<int> sGIds)
{ {
var sGList = await _sGenerateRecordRepositories.GetEntityList(sGIds,""); var sGList = await _sGenerateRecordRepositories.GetEntityList(sGIds,"");
_logger.LogInformation($"获取到：sGList:{JsonConvert.SerializeObject(sGList)}"); //_logger.LogInformation($"获取到：sGList:{JsonConvert.SerializeObject(sGList)}");
var sGSNumberList = await _serialNumbersRepositories.GetEntityListByGRIds(sGIds); var sGSNumberList = await _serialNumbersRepositories.GetEntityListByGRIds(sGIds);
_logger.LogInformation($"获取到：sGSNumberList:{JsonConvert.SerializeObject(sGSNumberList)}"); // _logger.LogInformation($"获取到：sGSNumberList:{JsonConvert.SerializeObject(sGSNumberList)}");
foreach (var sg in sGList) foreach (var sg in sGList)
{ {
int number = sGSNumberList.Where(w => w.GenerateRecordId == sg.Id && w.BoxId > 0 && w.IsNotCount!="1").Count(); int number = sGSNumberList.Where(w => w.GenerateRecordId == sg.Id && w.BoxId > 0 ).Count();
sg.Use(number); sg.Use(number);
_logger.LogInformation($"获取到：sg:{sg}"); // _logger.LogInformation($"获取到：sg:{sg}");
} }
var isSuccess = await _sGenerateRecordRepositories.EditEntityList(sGList, false); var isSuccess = await _sGenerateRecordRepositories.EditEntityList(sGList, false);