diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index d98d34e3..548be548 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1017,6 +1017,11 @@ 序列号操作类型 + + + 物料ID + + 供应商Id diff --git a/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs b/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs index 7093f551..5f4f6ae0 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs @@ -15,11 +15,12 @@ namespace WMS.Web.Domain.Entitys public class SerialNumberOperate : EntityBase { public SerialNumberOperate() { } - public SerialNumberOperate(string serialNumber, SerialNumberOperateType operateType, string operateUser, string remark, + public SerialNumberOperate(string serialNumber, SerialNumberOperateType operateType, int materialId,string operateUser, string remark, int? supplierId = null, int? orgId = null, int? stockId = null, DateTime? operateTime = null) { this.SerialNumber = serialNumber; + this.MaterialId = materialId; this.OperateType = operateType; this.OperateUser = operateUser; this.Remark = remark; @@ -41,6 +42,10 @@ namespace WMS.Web.Domain.Entitys /// public SerialNumberOperateType OperateType { get; set; } = SerialNumberOperateType.Generate; /// + /// 物料ID + /// + public int MaterialId { get; set; } + /// /// 供应商Id /// public int SupplierId { get; set; } = 0; diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index 605dc4ea..be113ed0 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -83,7 +83,7 @@ namespace WMS.Web.Domain.Services SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialId,b.Id,b.OpsBoxId, opsSerial.BarCereateUser,opsSerial.BarCreateTime); sList.Add(s); //序列号记录 - SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime); + SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialId, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime); soList.Add(so); } }