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-16 15:39:45 +08:00
parent 405b414912
commit d8e2c7509d
28 changed files with 343 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,11 +62,11 @@ namespace WMS.Web.Domain.Entitys
public List<BoxDetails> Details { get; set; } = new List<BoxDetails>();
//移出
public Result Out(List<(int MaterialId, decimal Qty, List<string> SerialNumbers)> list)
public Result Out(List<(string MaterialNumber, decimal Qty, List<string> SerialNumbers)> list)
{
foreach (var l in list)
{
var d = this.Details.FirstOrDefault(f => f.MaterialId == l.MaterialId);
var d = this.Details.FirstOrDefault(f => f.MaterialNumber == l.MaterialNumber);
if (d == null) return Result.ReFailure(ResultCodes.BoxMateriaNoData);
d.Qty = d.Qty - l.Qty;
if (d.Qty <= 0) this.Details.Remove(d);
@@ -76,16 +76,16 @@ namespace WMS.Web.Domain.Entitys
}
//移入
public Result In(List<(int MaterialId, decimal Qty, List<string> SerialNumbers)> list)
public Result In(List<(string MaterialNumber, decimal Qty, List<string> SerialNumbers)> list)
{
foreach (var l in list)
{
var d = this.Details.FirstOrDefault(f => f.MaterialId == l.MaterialId);
var d = this.Details.FirstOrDefault(f => f.MaterialNumber == l.MaterialNumber);
if (d == null)
{
this.Details.Add(new BoxDetails()
{
MaterialId = l.MaterialId,
MaterialNumber = l.MaterialNumber,
Qty = l.Qty,
//SerialNumbers=l.SerialNumbers
});
@@ -98,14 +98,14 @@ namespace WMS.Web.Domain.Entitys
}
//移入
public Result TakeStock(int materialId, decimal qty)
public Result TakeStock(string materialNumber, decimal qty)
{
var d = this.Details.FirstOrDefault(f => f.MaterialId == materialId);
var d = this.Details.FirstOrDefault(f => f.MaterialNumber == materialNumber);
if (d == null)
{
this.Details.Add(new BoxDetails()
{
MaterialId = materialId,
MaterialNumber = materialNumber,
Qty = qty
});
}
@@ -114,17 +114,17 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 出入库回退上架
/// </summary>
/// <param name="materialId"></param>
/// <param name="materialNumber"></param>
/// <param name="qty"></param>
/// <returns></returns>
public Result BackRecordUp(int materialId, decimal qty)
public Result BackRecordUp(string materialNumber, decimal qty)
{
var d = this.Details.FirstOrDefault(f => f.MaterialId == materialId);
var d = this.Details.FirstOrDefault(f => f.MaterialNumber == materialNumber);
if (d == null)
{
this.Details.Add(new BoxDetails()
{
MaterialId = materialId,
MaterialNumber = materialNumber,
Qty = qty
});
}
@@ -136,12 +136,12 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 出入库回退下架
/// </summary>
/// <param name="materialId"></param>
/// <param name="materialNumber"></param>
/// <param name="qty"></param>
/// <returns></returns>
public Result BackRecordDown(int materialId, decimal qty)
public Result BackRecordDown(string materialNumber, decimal qty)
{
var d = this.Details.FirstOrDefault(f => f.MaterialId == materialId);
var d = this.Details.FirstOrDefault(f => f.MaterialNumber == materialNumber);
if (d != null)
d.Qty = (d.Qty - qty) > 0 ? (d.Qty - qty) : 0;
@@ -150,12 +150,12 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 出库
/// </summary>
/// <param name="materialId"></param>
/// <param name="materialNumber"></param>
/// <param name="qty"></param>
/// <returns></returns>
public Result OutStock(int materialId, decimal qty)
public Result OutStock(string materialNumber, decimal qty)
{
var d = this.Details.FirstOrDefault(f => f.MaterialId == materialId);
var d = this.Details.FirstOrDefault(f => f.MaterialNumber == materialNumber);
if (d != null)
d.Qty = (d.Qty - qty) > 0 ? (d.Qty - qty) : 0;

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

@@ -23,10 +23,10 @@ namespace WMS.Web.Domain.Entitys
/// 单据头ID
/// </summary>
public int Fid { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>

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

@@ -24,11 +24,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("BillNo")]
public string BillNo { get; set; }
/// <summary>
/// 物料ID
/// </summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//[Column("MaterialId")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
@@ -99,14 +99,14 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
/// <param name="creatorId"></param>
/// <param name="qty"></param>
/// <param name="materialId"></param>
/// <param name="materialNumber"></param>
/// <param name="serialNumbers"></param>
public void Create(int creatorId,decimal qty,int materialId, List<string> serialNumbers,int srcBoxId,int destBoxId)
public void Create(int creatorId,decimal qty,string materialNumber, List<string> serialNumbers,int srcBoxId,int destBoxId)
{
this.SrcBoxId = srcBoxId;
this.DestBoxId = destBoxId;
this.SerialNumbers = serialNumbers;
this.MaterialId = materialId;
this.MaterialNumber = materialNumber;
this.Qty = qty;
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;

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

@@ -24,11 +24,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("Fid")]
public int Fid { get; set; }
/// <summary>
/// 物料Id
///</summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
///// <summary>
///// 物料Id
/////</summary>
//[Column("MaterialId")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>

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

@@ -25,11 +25,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("Fid")]
public int Fid { get; set; }
/// <summary>
/// 物料Id
///</summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
///// <summary>
///// 物料Id
/////</summary>
//[Column("MaterialId")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>

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

@@ -27,11 +27,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("Fid")]
public int Fid { get; set; }
/// <summary>
/// 物料Id
///</summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
///// <summary>
///// 物料Id
/////</summary>
//[Column("MaterialId")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>

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

@@ -15,12 +15,12 @@ namespace WMS.Web.Domain.Entitys
public class SerialNumberOperate : EntityBase
{
public SerialNumberOperate() { }
public SerialNumberOperate(string serialNumber, SerialNumberOperateType operateType, int materialId, string operateUser, string remark,
public SerialNumberOperate(string serialNumber, SerialNumberOperateType operateType, string materialNumber, string operateUser, string remark,
int? supplierId = null, int? orgId = null, int? stockId = null,
DateTime? operateTime = null)
{
this.SerialNumber = serialNumber;
this.MaterialId = materialId;
this.MaterialNumber = materialNumber;
this.OperateType = operateType;
this.OperateUser = operateUser;
this.Remark = remark;
@@ -41,10 +41,10 @@ namespace WMS.Web.Domain.Entitys
/// 序列号操作类型
/// </summary>
public SerialNumberOperateType OperateType { get; set; } = SerialNumberOperateType.Generate;
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
@@ -77,13 +77,13 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 装箱(记录)
/// </summary>
/// <param name="SerialNumber"></param>
/// <param name="MaterialId"></param>
/// <param name="serialNumber"></param>
/// <param name="materialNumber"></param>
/// <param name="box"></param>
public void CompleteCartonBox(string serialNumber, int materialId, Box box)
public void CompleteCartonBox(string serialNumber, string materialNumber, Box box)
{
this.SerialNumber = serialNumber;
this.MaterialId = materialId;
this.MaterialNumber = materialNumber;
this.OperateType = SerialNumberOperateType.CompleteCartonBox;
this.OperateTime = box.CompleteCartonTime;
this.OperateUser = box.CreateUser;

18
src/WMS.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -17,10 +17,10 @@ namespace WMS.Web.Domain.Entitys
public class SerialNumbers : EntityBase
{
public SerialNumbers() { }
public SerialNumbers(string serialNumber, int materialId, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime)
public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime)
{
this.SerialNumber = serialNumber;
this.MaterialId = materialId;
this.MaterialNumber = materialNumber;
this.BoxId = boxId;
this.OpsBoxId = opsBoxId;
this.Creator = creator;
@@ -37,11 +37,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("SerialNumber")]
public string SerialNumber { get; set; }
/// <summary>
/// 物料ID
/// </summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//[Column("MaterialId")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
@@ -118,9 +118,9 @@ namespace WMS.Web.Domain.Entitys
/// 出库
/// </summary>
/// <param name="outStock">出库单</param>
public void OutStock(OutStock outStock, int materialId)
public void OutStock(OutStock outStock, string materialNumber)
{
var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == materialId);
var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == materialNumber);
if (outstockDetail == null) return;
//按产品出才解绑 按箱子出不解绑
if (outStock.Method == InventoryInOutMethod.Product)

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

@@ -30,11 +30,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("BoxId")]
public int BoxId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//[Column("MaterialId")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>