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-20 09:44:13 +08:00
parent 9fcb54d1d9
commit c0e7a6eff1
6 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,9 +481,14 @@
原箱仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestStockCode">
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcStockCode">
<summary>
原箱仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcBoxOrgCode">
<summary>
目标箱的仓库或重新上架选择仓位对应的仓库
原箱组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestSubStockCode">
@@ -491,6 +496,11 @@
目标箱仓位或重新上架选择仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestStockCode">
<summary>
目标箱的仓库或重新上架选择仓位对应的仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestBoxOrgCode">
<summary>
目标箱组织编码

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

@@ -49,32 +49,33 @@ 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("SrcSubStockCode")]
public string SrcSubStockCode { get; set; }
/// <summary>
/// 目标箱的仓库或重新上架选择仓位对应的仓库
/// 原箱仓库
///</summary>
[Column("SrcStockCode")]
public string SrcStockCode { get; set; }
/// <summary>
/// 原箱组织编码
/// </summary>
[Column("DestStockCode")]
public string DestStockCode { get; set; }
///// <summary>
///// 目标箱仓位或重新上架选择仓位
/////</summary>
//[Column("DestSubStockId")]
//public int DestSubStockId { get; set; }
[Column("SrcBoxOrgCode")]
public string SrcBoxOrgCode { get; set; }
/// <summary>
/// 目标箱仓位或重新上架选择仓位
///</summary>
[Column("DestSubStockCode")]
public string DestSubStockCode { get; set; }
/// <summary>
/// 目标箱的仓库或重新上架选择仓位对应的仓库
/// </summary>
[Column("DestStockCode")]
public string DestStockCode { get; set; }
/// <summary>
/// 目标箱组织编码
/// </summary>
[Column("DestBoxOrgCode")]

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

@@ -169,7 +169,12 @@ 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 ?? "";//原乡仓位需要去拉一下库存获取
if (subStock_s != null)
{
entity.SrcSubStockCode = subStock_s.Code;//原乡仓位需要去拉一下库存获取
entity.SrcBoxOrgCode = subStock_s.ErpOrgCode;
entity.SrcStockCode = subStock_s.StockCode;
}
if (subStock != null)
{
//entity.DestSubStockId = dt.SubStockId;

4
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -172,8 +172,8 @@ namespace WMS.Web.Repositories
DestBox = s.destBox.BoxBillNo,
Qty=s.changeBox.Qty,
DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.SrcSubStockCode + s.changeBox.SrcStockCode + s.changeBox.SrcBoxOrgCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.DestSubStockCode + s.changeBox.DestStockCode + s.changeBox.DestBoxOrgCode),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId),
CreateTime = s.changeBox.CreateTime.DateToStringSeconds()
#endregion

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

@@ -181,8 +181,8 @@ namespace WMS.Web.Repositories
#region dto组装
BillNo = s.moveBox.BillNo,
Box = s.box.BoxBillNo,
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.moveBox.SrcSubStockCode + s.moveBox.StockCode + s.moveBox.OrgCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.moveBox.DestSubStockCode + s.moveBox.StockCode + s.moveBox.OrgCode),
Qty = s.moveBox.Qty,
Type = s.moveBox.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId),

2
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -259,7 +259,7 @@ namespace WMS.Web.Repositories
BillNo = s.order.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.detail.SubStockCode + s.detail.StockCode + s.detail.OrgCode),
Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber,