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-08-08 11:48:13 +08:00
parent 6a60c68537
commit 8324794a0f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,12 +505,12 @@ namespace BarCode.Web.Domain.Services
if (spec == "") if (spec == "")
{ {
spec = y[0].Specifications; spec = y[0].Specifications+" 序列码存在已使用, 请选择未使用序列码的数据 ！</br>";
// _logger.LogInformation($"获取到：specA:{y[0].Specifications}"); // _logger.LogInformation($"获取到：specA:{y[0].Specifications}");
} }
else else
{ {
spec = spec + "," + y[0].Specifications; spec = spec + y[0].Specifications + " 序列码存在已使用, 请选择未使用序列码的数据 ！</br>";
// _logger.LogInformation($"获取到：spec:{spec}"); // _logger.LogInformation($"获取到：spec:{spec}");
} }
} }
@@ -538,12 +538,12 @@ namespace BarCode.Web.Domain.Services
var y = dto.ids.Where(x => x.Id == generateRecords[i].Id).ToList(); var y = dto.ids.Where(x => x.Id == generateRecords[i].Id).ToList();
if (specNum == "") if (specNum == "")
{ {
specNum = y[0].Specifications; specNum = y[0].Specifications + " 序列码存在已使用, 不支持转两件装！<br>";
// _logger.LogInformation($"获取到：specA:{y[0].Specifications}"); // _logger.LogInformation($"获取到：specA:{y[0].Specifications}");
} }
else else
{ {
specNum = specNum + "," + y[0].Specifications; specNum = specNum + y[0].Specifications + " 序列码存在已使用, 不支持转两件装！<br>";
// _logger.LogInformation($"获取到：spec:{spec}"); // _logger.LogInformation($"获取到：spec:{spec}");
} }
@@ -552,18 +552,18 @@ namespace BarCode.Web.Domain.Services
} }
if (strMes != "" && specNum != "") if (strMes != "" && specNum != "")
{ {
ValueTuple<int, string> IsUseError = (70003, specNum + " 条码个数为单数, 不支持转两件装！" + strMes + " 序列码存在已使用, 不支持转两件装！"); ValueTuple<int, string> IsUseError = (70003, specNum + strMes );
return Result.ReFailure(IsUseError); return Result.ReFailure(IsUseError);
} }
else if (specNum != "") else if (specNum != "")
{ {
ValueTuple<int, string> strMesError = (70005, specNum + " 条码个数为单数, 不支持转两件装！"); ValueTuple<int, string> strMesError = (70005, specNum );
return Result.ReFailure(strMesError); return Result.ReFailure(strMesError);
} }
else if (strMes != "") else if (strMes != "")
{ {
ValueTuple<int, string> strMesError = (70004, strMes + " 序列码存在已使用, 不支持转两件装！"); ValueTuple<int, string> strMesError = (70004, strMes );
return Result.ReFailure(strMesError); return Result.ReFailure(strMesError);
} }

8
src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -362,7 +362,7 @@ namespace BarCode.Web.Repositories
Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
MaterialNumber = s.serial.MaterialNumber, MaterialNumber = s.serial.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
// BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber, SerialNumber = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode, NumberCode = s.serial.NumberCode,
Number = s.sg == null ? 0 : s.sg.Number, Number = s.sg == null ? 0 : s.sg.Number,
@@ -500,7 +500,7 @@ namespace BarCode.Web.Repositories
Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
MaterialNumber = s.serial.MaterialNumber, MaterialNumber = s.serial.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
// BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber, SerialNumber = s.serial.SerialNumber,
SerialNumber2 = s.serial.SerialNumber, SerialNumber2 = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode, NumberCode = s.serial.NumberCode,
@@ -543,7 +543,7 @@ namespace BarCode.Web.Repositories
list2.Old_Specifications = list[i].Old_Specifications; list2.Old_Specifications = list[i].Old_Specifications;
list2.MaterialNumber = list[i].MaterialNumber; list2.MaterialNumber = list[i].MaterialNumber;
list2.MaterialName = list[i].MaterialName; list2.MaterialName = list[i].MaterialName;
// list2.BarCode = list[i].BarCode; list2.BarCode = list[i].BarCode;
list2.SerialNumber = serialNumbers[0].SerialNumber; list2.SerialNumber = serialNumbers[0].SerialNumber;
list2.SerialNumber2 = list[i].SerialNumber; list2.SerialNumber2 = list[i].SerialNumber;
list2.NumberCode = serialNumbers[0].NumberCode; list2.NumberCode = serialNumbers[0].NumberCode;
@@ -585,7 +585,7 @@ namespace BarCode.Web.Repositories
list2.Old_Specifications = list[i].Old_Specifications; list2.Old_Specifications = list[i].Old_Specifications;
list2.MaterialNumber = list[i].MaterialNumber; list2.MaterialNumber = list[i].MaterialNumber;
list2.MaterialName = list[i].MaterialName; list2.MaterialName = list[i].MaterialName;
// list2.BarCode = list[i].BarCode; list2.BarCode = list[i].BarCode;
list2.SerialNumber = serialNumbers[0].SerialNumber; list2.SerialNumber = serialNumbers[0].SerialNumber;
list2.SerialNumber2 = list[i].SerialNumber; list2.SerialNumber2 = list[i].SerialNumber;
list2.NumberCode = serialNumbers[0].NumberCode; list2.NumberCode = serialNumbers[0].NumberCode;