18923810322/BarCode-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改了规格

Browse Source
This commit is contained in:
18923810322
2026-04-14 16:42:21 +08:00
parent ebeeb2806f
commit 50633ae9c5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BarCode.Web.Api/Controllers/TestController.cs
View File

@@ -162,7 +162,7 @@ namespace BarCode.Web.Api.Controllers
}
private async Task GetBox()
{
{
string[] arr = System.IO.File.ReadAllLines("E:\\1\\x.txt");
var sList = GetS();
//var sList = new List<SerialNumbers>();

2
src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
View File

@@ -631,7 +631,7 @@
第二件装
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Box.SaveBoxDetailsRequest.Spec">
<member name="P:BarCode.Web.Core.Dto.Box.SaveBoxDetailsRequest.Specifications">
<summary>
规格型号
</summary>

2
src/BarCode.Web.Core/Dto/Box/SaveBoxDetailsRequest.cs
View File

@@ -31,7 +31,7 @@ namespace BarCode.Web.Core.Dto.Box
/// </summary>
///
[Required(ErrorMessage = "物料规格不能为空")]
public string Spec { get; set; } = string.Empty;
public string Specifications { get; set; } = string.Empty;

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

@@ -128,15 +128,15 @@ namespace BarCode.Web.Domain.Services
var resCarton = box.Carton(dto.IsCarton, loginInfo.UserInfo.UcId);
if (!resCarton.IsSuccess) return resCarton;
var materialNumbers = dto.Details.GroupBy(g => new { g.MaterialNumber, g.Spec }).Select(s => s.Key).ToList();
var materialNumbers = dto.Details.GroupBy(g => new { g.MaterialNumber, g.Specifications }).Select(s => s.Key).ToList();
foreach (var m in materialNumbers)
{
List<string> s=[null];
s.Clear();
var detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber) && f.Spec.Equals(m.Spec));
var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Spec.Equals(m.Spec)).Select(s => s.SerialNumber).ToList();
var serialNumbersTwo = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Spec.Equals(m.Spec)).Select(s => s.TwoSerialNumber).ToList();
var detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber) && f.Spec.Equals(m.Specifications));
var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Specifications.Equals(m.Specifications)).Select(s => s.SerialNumber).ToList();
var serialNumbersTwo = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Specifications.Equals(m.Specifications)).Select(s => s.TwoSerialNumber).ToList();
var intCount = serialNumbers.Count();
s = serialNumbers;
serialNumbersTwo.RemoveAll(string.IsNullOrEmpty);
@@ -173,7 +173,7 @@ namespace BarCode.Web.Domain.Services
Qty = intCount,
// SerialNumbers = serialNumbers
SerialNumbers = s,
Spec=m.Spec
Spec=m.Specifications
};
box.Details.Add(detail);
}

4
src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs
View File

@@ -289,9 +289,9 @@ namespace BarCode.Web.Repositories
query = query.Where(w => rec_code == w.OrgCode);
}
if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => mNumber.Contains(w.MaterialNumber));
query = query.Where(w => (mNumber.Contains(w.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)));
if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => (mSpec.Contains(w.Specifications)));
query = query.Where(w => (mSpec.Contains(w.Specifications)|| w.Specifications.Contains(dto.MaterialNumber)));