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-07 15:43:05 +08:00
parent 8990dabaaf
commit 82cd6e743a
6 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -631,6 +631,12 @@
第二件装
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Box.SaveBoxDetailsRequest.Spec">
<summary>
规格型号
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.Box.SaveBoxRequest">
<summary>
保存箱信息(装箱保存,完成装箱)

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

@@ -136,6 +136,11 @@
物料编码
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.BoxDetails.Spec">
<summary>
物料规格
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.BoxDetails.Qty">
<summary>
数量（装箱数量）

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

@@ -26,6 +26,14 @@ namespace BarCode.Web.Core.Dto.Box
/// 第二件装
/// </summary>
public string TwoSerialNumber { get; set; } = string.Empty;
/// <summary>
/// 规格型号
/// </summary>
///
[Required(ErrorMessage = "物料规格不能为空")]
public string Spec { get; set; } = string.Empty;
}
}

11
src/BarCode.Web.Domain/Entitys/BoxDetails.cs
View File

@@ -30,6 +30,14 @@ namespace BarCode.Web.Domain.Entitys
/// </summary>
[Column("MaterialNumber")]
public string MaterialNumber { get; set; } = "";
/// <summary>
/// 物料规格
/// </summary>
[Column("Spec")]
public string Spec { get; set; } = "";
/// <summary>
/// 数量（装箱数量）
/// </summary>
@@ -40,6 +48,9 @@ namespace BarCode.Web.Domain.Entitys
/// </summary>
[Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>();
///// <summary>
///// 是否计数
///// </summary>

13
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 => g.MaterialNumber).Select(s => s.Key).ToList();
var materialNumbers = dto.Details.GroupBy(g => new { g.MaterialNumber, g.Spec }).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));
var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m)).Select(s => s.SerialNumber).ToList();
var serialNumbersTwo = dto.Details.Where(w => w.MaterialNumber.Equals(m)).Select(s => s.TwoSerialNumber).ToList();
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 intCount = serialNumbers.Count();
s = serialNumbers;
serialNumbersTwo.RemoveAll(string.IsNullOrEmpty);
@@ -168,11 +168,12 @@ namespace BarCode.Web.Domain.Services
{
detail = new BoxDetails()
{
MaterialNumber = m,
MaterialNumber = m.MaterialNumber,
// Qty = serialNumbers.Count(),
Qty = intCount,
// SerialNumbers = serialNumbers
SerialNumbers = s
SerialNumbers = s,
Spec=m.Spec
};
box.Details.Add(detail);
}

2
src/BarCode.Web.Repositories/BoxRepositories.cs
View File

@@ -289,7 +289,7 @@ namespace BarCode.Web.Repositories
Id = s.box.Id,
DetailId = s.detail == null ? 0 : s.detail.Id,
BoxBillNo = s.box.BoxBillNo,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail == null ? "" : s.detail.MaterialNumber),
Specifications =s.detail==null?"":s.detail.Spec ,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail == null ? "" : s.detail.MaterialNumber),
MaterialNumber = s.detail == null ? "" : s.detail.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail == null ? "" : s.detail.MaterialNumber),
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.detail == null ? "" : s.detail.MaterialNumber),