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

优化合并

Browse Source
This commit is contained in:
tongfei
2024-03-18 11:05:03 +08:00
parent 896450fd23 5621ae5a83
commit 9ad272b956
25 changed files with 176 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Domain/Entitys/Box.cs
View File

@@ -172,7 +172,7 @@ namespace WMS.Web.Domain.Entitys
foreach (var d in detailClone)
{
//如果箱信息存在 箱库存不存在 删除箱信息数据
var inventoryDetail = inventory.Details.FirstOrDefault(f => f.MaterialId == d.MaterialId);
var inventoryDetail = inventory.Details.FirstOrDefault(f => f.MaterialNumber == d.MaterialNumber);
if (inventoryDetail == null)
{
var boxDetail = this.Details.FirstOrDefault(f => f.Id == d.Id);
@@ -182,9 +182,9 @@ namespace WMS.Web.Domain.Entitys
//箱库存存在 箱信息不存在 添加
foreach (var d in inventory.Details)
{
var md = this.Details.FirstOrDefault(w => w.MaterialId == d.MaterialId);
var md = this.Details.FirstOrDefault(w => w.MaterialNumber == d.MaterialNumber);
if (md == null)
this.Details.Add(new BoxDetails() { MaterialId = d.MaterialId, Qty = d.Qty });
this.Details.Add(new BoxDetails() { MaterialNumber = d.MaterialNumber, Qty = d.Qty });
else
md.Qty = d.Qty;
}

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>

26
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>
@@ -89,14 +89,14 @@ 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,string subStockCode)
public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int creatorId,string subStockCode)
{
this.BoxId = boxId;
this.Type = type;
this.OrgCode = orgCode;
this.StockCode = stockCode;
SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值
DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0
//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;

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>

8
src/WMS.Web.Domain/Entitys/OutStockTask.cs
View File

@@ -99,17 +99,17 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 出库 反写 任务单(返回 这个物料下面的来源单号出了多少数量)
/// </summary>
/// <param name="materialId"></param>
/// <param name="materialNumber"></param>
/// <param name="qty"></param>
/// <returns></returns>
public Result<List<(int erpDetailId, decimal qty)>> OutStock(int materialId, decimal qty, int outStockId)
public Result<List<(int erpDetailId, decimal qty)>> OutStock(string materialNumber, decimal qty, int outStockId)
{
if (this.Status == OutStockStatus.Already)
return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockTaskAlready);
if (this.Status == OutStockStatus.Repeal)
return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockTaskRepeal);
var detail = this.Details.FirstOrDefault(f => f.MaterialId == materialId);
var detail = this.Details.FirstOrDefault(f => f.MaterialNumber == materialNumber);
if (detail == null) return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OrderNoData);
if ((detail.AccruedQty - detail.RealityQty) < qty)
return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockQtyError);
@@ -221,7 +221,7 @@ namespace WMS.Web.Domain.Entitys
{
d.Id = 0;
d.Fid = 0;
var detail_new = details_new.FirstOrDefault(f => f.MaterialId == d.MaterialId);
var detail_new = details_new.FirstOrDefault(f => f.MaterialNumber == d.MaterialNumber);
if (detail_new != null)
{
detail_new.AccruedQty += d.AccruedQty;//应出数量累加

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>