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

增加了仓位编码存储

Browse Source
This commit is contained in:
18942506660
2024-03-14 14:06:26 +08:00
parent 2bf441733c
commit ac7ff7ad88
6 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -481,6 +481,11 @@
原箱仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcSubStockCode">
<summary>
原箱仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestStockCode">
<summary>
目标箱的仓库或重新上架选择仓位对应的仓库
@@ -491,6 +496,11 @@
目标箱仓位或重新上架选择仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestSubStockCode">
<summary>
目标箱仓位或重新上架选择仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestBoxOrgCode">
<summary>
目标箱组织编码
@@ -1386,6 +1396,16 @@
目标仓位Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockCode">
<summary>
原仓位编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockCode">
<summary>
目标仓位编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.Qty">
<summary>
数量
@@ -1411,7 +1431,7 @@
明细信息
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.MoveBoxRecord.Create(WMS.Web.Domain.Values.MoveBoxType,System.Int32,System.Decimal,System.String,System.String,System.Int32,System.Int32)">
<member name="M:WMS.Web.Domain.Entitys.MoveBoxRecord.Create(WMS.Web.Domain.Values.MoveBoxType,System.Int32,System.Decimal,System.String,System.String,System.Int32,System.Int32,System.String)">
<summary>
创建
</summary>
@@ -2151,6 +2171,11 @@
仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.SubStockCode">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.Erp_SubStockCode">
<summary>
子仓库(跟金蝶交互字段)

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

@@ -55,6 +55,11 @@ namespace WMS.Web.Domain.Entitys
[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; }
/// <summary>
/// 原箱仓位
///</summary>
[Column("SrcSubStockCode")]
public string SrcSubStockCode { get; set; }
/// <summary>
/// 目标箱的仓库或重新上架选择仓位对应的仓库
/// </summary>
[Column("DestStockCode")]
@@ -65,6 +70,11 @@ namespace WMS.Web.Domain.Entitys
[Column("DestSubStockId")]
public int DestSubStockId { get; set; }
/// <summary>
/// 目标箱仓位或重新上架选择仓位
///</summary>
[Column("DestSubStockCode")]
public string DestSubStockCode { get; set; }
/// <summary>
/// 目标箱组织编码
/// </summary>
[Column("DestBoxOrgCode")]

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

@@ -51,6 +51,16 @@ namespace WMS.Web.Domain.Entitys
[Column("DestSubStockId")]
public int DestSubStockId { get; set; }
/// <summary>
/// 原仓位编码
/// </summary>
[Column("SrcSubStockCode")]
public string SrcSubStockCode { get; set; }
/// <summary>
/// 目标仓位编码
/// </summary>
[Column("DestSubStockCode")]
public string DestSubStockCode { get; set; }
/// <summary>
/// 数量
/// </summary>
[Column("Qty")]
@@ -79,7 +89,7 @@ namespace WMS.Web.Domain.Entitys
/// 创建
/// </summary>
/// <param name="creatorId"></param>
public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int subStockId, int creatorId)
public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int subStockId, int creatorId,string subStockCode)
{
this.BoxId = boxId;
this.Type = type;
@@ -87,6 +97,8 @@ namespace WMS.Web.Domain.Entitys
this.StockCode = stockCode;
SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值
DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0
SrcSubStockCode = type == MoveBoxType.Up ? "" : subStockCode;//上架 原仓位是0 目标仓位有值
DestSubStockCode = type == MoveBoxType.Up ? subStockCode : ""; //下架 原仓位有值 目标仓位是0
this.Qty = qty;
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;

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

@@ -51,6 +51,11 @@ namespace WMS.Web.Domain.Entitys
[Column("SubStockId")]
public int SubStockId { get; set; }
/// <summary>
/// 仓位
/// </summary>
[Column("SubStockCode")]
public string SubStockCode { get; set; }
/// <summary>
/// 子仓库(跟金蝶交互字段)
/// </summary>
[Column("Erp_SubStockCode")]

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

@@ -157,20 +157,25 @@ namespace WMS.Web.Domain.Services
List<ChangeBoxRecord> list = new List<ChangeBoxRecord>();
var subIds = dto.Select(s => s.SubStockId).ToList();
var subStocks = await _basbicsRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s=>s.SubStockId).ToList(), loginInfo.UserInfo.CompanyId);
foreach (var dt in dto)
{
var subStock = subStocks.FirstOrDefault(f => f.Id == dt.SubStockId);
var boxi = boxs.FirstOrDefault(f => f.BoxId == dt.SrcBoxId);
var subStock_s = subStocks_s.FirstOrDefault(f => f.Id == (boxi?.SubStockId ?? 0));
foreach (var d in dt.Details)
{
ChangeBoxRecord entity = new ChangeBoxRecord();
entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialId, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId);
entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取
entity.SrcSubStockCode = subStock_s?.Code ?? "";
if (subStock != null)
{
entity.DestSubStockId = dt.SubStockId;
entity.DestBoxOrgCode = subStock.ErpOrgCode;
entity.DestStockCode = subStock.StockCode;
entity.DestSubStockCode = subStock.Code;
}
list.Add(entity);
}
@@ -272,7 +277,7 @@ namespace WMS.Web.Domain.Services
{
var subStock = await _basbicsRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId);
var entity = new MoveBoxRecord();
entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, d.Qty, subStock?.ErpOrgCode, subStock?.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId);
entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, d.Qty, subStock?.ErpOrgCode, subStock?.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId, subStock?.Code);
entity.Details = d.Details.Select(s => new MoveBoxRecordDetails()
{
MaterialId = s.MaterialId,

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

@@ -96,6 +96,7 @@ namespace WMS.Web.Domain.Services
var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId);
d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code;
if ((d.StockCode.Equals("HD") || d.StockCode.Equals("GD")) && string.IsNullOrEmpty(d.Erp_SubStockCode))
return Result.ReFailure(ResultCodes.TakeStockErpSubStockError);
}
@@ -116,6 +117,7 @@ namespace WMS.Web.Domain.Services
var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId);
d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code;
if ((d.StockCode.Equals("HD") || d.StockCode.Equals("GD")) && string.IsNullOrEmpty(d.Erp_SubStockCode))
return Result.ReFailure(ResultCodes.TakeStockErpSubStockError);
}