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 09:52:46 +08:00
parent b9862b9a20
commit fb4eb5877d
12 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs
View File

@@ -54,11 +54,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("DestBoxId")]
public int DestBoxId { get; set; }
/// <summary>
/// 原箱仓位
///</summary>
[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; }
///// <summary>
///// 原箱仓位
/////</summary>
//[Column("SrcSubStockId")]
//public int SrcSubStockId { get; set; }
/// <summary>
/// 原箱仓位
///</summary>
@@ -69,11 +69,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("DestStockCode")]
public string DestStockCode { get; set; }
/// <summary>
/// 目标箱仓位或重新上架选择仓位
///</summary>
[Column("DestSubStockId")]
public int DestSubStockId { get; set; }
///// <summary>
///// 目标箱仓位或重新上架选择仓位
/////</summary>
//[Column("DestSubStockId")]
//public int DestSubStockId { get; set; }
/// <summary>
/// 目标箱仓位或重新上架选择仓位
///</summary>

20
src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
View File

@@ -40,16 +40,16 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 原仓位Id
/// </summary>
[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; }
/// <summary>
/// 目标仓位Id
/// </summary>
[Column("DestSubStockId")]
public int DestSubStockId { get; set; }
///// <summary>
///// 原仓位Id
///// </summary>
//[Column("SrcSubStockId")]
//public int SrcSubStockId { get; set; }
///// <summary>
///// 目标仓位Id
///// </summary>
//[Column("DestSubStockId")]
//public int DestSubStockId { get; set; }
/// <summary>
/// 原仓位编码
/// </summary>

10
src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs
View File

@@ -34,11 +34,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary>
/// 仓位
///</summary>
[Column("SubStockId")]
public int SubStockId { get; set; }
///// <summary>
///// 仓位
/////</summary>
//[Column("SubStockId")]
//public int SubStockId { get; set; }
/// <summary>
/// 仓位
/// </summary>

10
src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
View File

@@ -50,11 +50,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位
/// </summary>
[Column("SubStockId")]
public int SubStockId { get; set; }
///// <summary>
///// 仓位
///// </summary>
//[Column("SubStockId")]
//public int SubStockId { get; set; }
/// <summary>
/// 仓位
/// </summary>

4
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -168,8 +168,8 @@ namespace WMS.Web.Domain.Services
{
ChangeBoxRecord entity = new ChangeBoxRecord();
entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId);
entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取
entity.SrcSubStockCode = subStock_s?.Code ?? "";
//entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取
entity.SrcSubStockCode = subStock_s?.Code ?? "";//原乡仓位需要去拉一下库存获取
if (subStock != null)
{
//entity.DestSubStockId = dt.SubStockId;

8
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -89,11 +89,11 @@ namespace WMS.Web.Domain.Services
TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(profitList);
var subIds = takeStock.Details.Select(s => s.SubStockId).ToList();
var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList();
var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details)
{
var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId);
var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode);
d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code;
@@ -110,11 +110,11 @@ namespace WMS.Web.Domain.Services
TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(lossList);
var subIds = takeStock.Details.Select(s => s.SubStockId).ToList();
var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList();
var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details)
{
var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId);
var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode);
d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code;