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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-03-18 14:38:03 +08:00
parent 3f453a0618
commit d60ac7113b
9 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -392,9 +392,9 @@ namespace WMS.Web.Api.Controllers
foreach (var detail in boxResponse.Details) foreach (var detail in boxResponse.Details)
{ {
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialId); detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialNumber);
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, detail.MaterialId); detail.MaterialNumber = detail.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialId); detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber);
} }
boxResponse.BoxBillNo = boxBillNo; boxResponse.BoxBillNo = boxBillNo;
boxResponse.Details = boxResponse.Details.Where(w => w.Qty > 0).ToList(); boxResponse.Details = boxResponse.Details.Where(w => w.Qty > 0).ToList();
@@ -472,7 +472,7 @@ namespace WMS.Web.Api.Controllers
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode); var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData); if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
_logger.LogInformation($"请求序列号信息结果:{res.MaterialId} {res.MaterialNumber}"); _logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");
return Result<MaterialResponse>.ReSuccess(res); return Result<MaterialResponse>.ReSuccess(res);
} }

10
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -275,11 +275,6 @@
根据箱号获取物料信息 根据箱号获取物料信息
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.BoxDetailResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BoxDetailResponse.MaterialName"> <member name="P:WMS.Web.Core.Dto.BoxDetailResponse.MaterialName">
<summary> <summary>
物料名称 物料名称
@@ -4483,11 +4478,6 @@
详情 详情
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoDetailsResponse.MaterialId">
<summary>
物料Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoDetailsResponse.MaterialName"> <member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoDetailsResponse.MaterialName">
<summary> <summary>
物料名称 物料名称

8
src/WMS.Web.Core/Dto/BoxDetailResponse.cs
View File

@@ -10,10 +10,10 @@ namespace WMS.Web.Core.Dto
public class BoxDetailResponse public class BoxDetailResponse
{ {
/// <summary> ///// <summary>
/// 物料ID ///// 物料ID
/// </summary> ///// </summary>
public int MaterialId { get; set; } //public int MaterialId { get; set; }
/// <summary> /// <summary>
/// 物料名称 /// 物料名称
/// </summary> /// </summary>

8
src/WMS.Web.Core/Dto/MaterialResponse.cs
View File

@@ -33,10 +33,10 @@ namespace WMS.Web.Core.Dto
/// 序列号 /// 序列号
/// </summary> /// </summary>
public string SerialNumber { get; set; } public string SerialNumber { get; set; }
/// <summary> ///// <summary>
/// 物料ID ///// 物料ID
/// </summary> ///// </summary>
public int MaterialId { get; set; } //public int MaterialId { get; set; }
/// <summary> /// <summary>
/// 物料名称 /// 物料名称
/// </summary> /// </summary>

8
src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
View File

@@ -33,10 +33,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
public class GetOutStockTaskByNoDetailsResponse public class GetOutStockTaskByNoDetailsResponse
{ {
/// <summary> ///// <summary>
/// 物料Id ///// 物料Id
///</summary> /////</summary>
public int MaterialId { get; set; } //public int MaterialId { get; set; }
/// <summary> /// <summary>
/// 物料名称 /// 物料名称
/// </summary> /// </summary>

1
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -131,7 +131,6 @@ namespace WMS.Web.Repositories
detail.MaterialNumber = d.MaterialNumber; detail.MaterialNumber = d.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialNumber); detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialNumber);
detail.SerialNumbers = d.SerialNumbers; detail.SerialNumbers = d.SerialNumbers;
detail.MaterialId = 0;
detail.Qty = d.Qty; detail.Qty = d.Qty;
details.Add(detail); details.Add(detail);
} }

1
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -365,7 +365,6 @@ namespace WMS.Web.Repositories
detail.MaterialNumber = d.MaterialNumber; detail.MaterialNumber = d.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialNumber); detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialNumber);
detail.SerialNumbers = boxDetail.SerialNumbers; detail.SerialNumbers = boxDetail.SerialNumbers;
detail.MaterialId = 0;
detail.Qty = boxDetail.Qty; detail.Qty = boxDetail.Qty;
details.Add(detail); details.Add(detail);
} }

12
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -379,9 +379,9 @@ namespace WMS.Web.Repositories
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套
foreach (var r in response.SelectMany(s => s.details)) foreach (var r in response.SelectMany(s => s.details))
{ {
r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialId); r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialNumber);
r.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, r.MaterialId); r.MaterialNumber = r.MaterialNumber;
r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialId); r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialNumber);
} }
return response; return response;
} }
@@ -410,9 +410,9 @@ namespace WMS.Web.Repositories
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套
foreach (var r in response.details) foreach (var r in response.details)
{ {
r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialId); r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialNumber);
r.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, r.MaterialId); r.MaterialNumber = r.MaterialNumber;
r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialId); r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialNumber);
} }
return response; return response;
} }

10
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -192,10 +192,10 @@ namespace WMS.Web.Repositories
var material = m.FirstOrDefault(); var material = m.FirstOrDefault();
if (material != null) if (material != null)
{ {
response.MaterialId = material.MaterialId; //response.MaterialId = material.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, material.MaterialId); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, material.MaterialNumber);
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, material.MaterialId); response.MaterialNumber = material.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, material.MaterialId); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, material.MaterialNumber);
return response; return response;
} }
var entity = await _context.SerialNumbers var entity = await _context.SerialNumbers
@@ -209,7 +209,7 @@ namespace WMS.Web.Repositories
response.BoxBillNo = entity?.box?.BoxBillNo ?? ""; response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? ""; response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber; response.SerialNumber = entity.serial.SerialNumber;
response.MaterialId = 0; //response.MaterialId = 0;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber; response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);