diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 548be548..8de24776 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1052,6 +1052,14 @@ 备注 + + + 装箱(记录) + + + + + 序列号 @@ -1761,6 +1769,11 @@ 出库服务 + + + 序列号服务 + + 盘点单服务 @@ -3315,6 +3328,11 @@ + + + 序列号服务 + + 盘点单服务 @@ -3690,6 +3708,21 @@ 序列号操作类型 + + + 装箱 + + + + + 移箱 + + + + + 改箱 + + 非采购上架方式 diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs index 106d7d77..b05cd54e 100644 --- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs +++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs @@ -34,7 +34,7 @@ namespace WMS.Web.Core.Dto /// 完成装箱时间 /// [JsonProperty("CompleteCartonTime")] - public string CompleteCartonTime { get; set; } + public DateTime CompleteCartonTime { get; set; } = DateTime.Now; /// /// 箱子创建用户 /// diff --git a/src/WMS.Web.Domain/Entitys/Box.cs b/src/WMS.Web.Domain/Entitys/Box.cs index 48ffea00..2fb91b5e 100644 --- a/src/WMS.Web.Domain/Entitys/Box.cs +++ b/src/WMS.Web.Domain/Entitys/Box.cs @@ -33,15 +33,15 @@ namespace WMS.Web.Domain.Entitys /// /// 供应商Id /// - public int? SupplierId { get; set; } + public int SupplierId { get; set; } = 0; /// /// 组织Id /// - public int? OrgId { get; set; } + public int OrgId { get; set; } = 0; /// /// 完成装箱时间 /// - public string CompleteCartonTime { get; set; } + public DateTime CompleteCartonTime { get; set; } = DateTime.Now; /// /// 箱子创建用户 /// diff --git a/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs b/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs index 5f4f6ae0..dae6743f 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs @@ -15,7 +15,7 @@ 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, int materialId, string operateUser, string remark, int? supplierId = null, int? orgId = null, int? stockId = null, DateTime? operateTime = null) { @@ -69,5 +69,23 @@ namespace WMS.Web.Domain.Entitys /// 备注 /// public string Remark { get; set; } + + /// + /// 装箱(记录) + /// + /// + /// + /// + public void CompleteCartonBox(string serialNumber, int materialId, Box box) + { + this.SerialNumber = serialNumber; + this.MaterialId = materialId; + this.OperateType = SerialNumberOperateType.CompleteCartonBox; + this.OperateTime = box.CompleteCartonTime; + this.OperateUser = box.CreateUser; + this.OrgId = box.OrgId; + this.SupplierId = box.SupplierId; + this.Remark = "箱号: " + box.BoxBillNo; + } } } diff --git a/src/WMS.Web.Domain/IService/ISerialNumberService.cs b/src/WMS.Web.Domain/IService/ISerialNumberService.cs new file mode 100644 index 00000000..64954ea5 --- /dev/null +++ b/src/WMS.Web.Domain/IService/ISerialNumberService.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Domain.IService +{ + /// + /// 序列号服务 + /// + public interface ISerialNumberService + { + } +} diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index be113ed0..0b8e8b8a 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -82,9 +82,13 @@ 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, detail.MaterialId, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime); soList.Add(so); + //序列号记录(装箱) + SerialNumberOperate so_g = new SerialNumberOperate(); + so_g.CompleteCartonBox(sn.SerialNumber, detail.MaterialId, b); + soList.Add(so_g); } } #endregion diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs new file mode 100644 index 00000000..4862c9b8 --- /dev/null +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; +using WMS.Web.Domain.IService; + +namespace WMS.Web.Domain.Services +{ + /// + /// 序列号服务 + /// + public class SerialNumberService: ISerialNumberService + { + } +} diff --git a/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs b/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs index 69519cba..be3b4231 100644 --- a/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs +++ b/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs @@ -1,14 +1,32 @@ using System; using System.Collections.Generic; using System.Text; +using WMS.Web.Core; namespace WMS.Web.Domain.Values { /// /// 序列号操作类型 /// - public enum SerialNumberOperateType + public enum SerialNumberOperateType { - Generate = 0 + //序列号生成 + [EnumRemark("序列号生成")] + Generate = 0, + /// + /// 装箱 + /// + [EnumRemark("装箱")] + CompleteCartonBox = 1, + /// + /// 移箱 + /// + [EnumRemark("移箱")] + MoveBox = 2, + /// + /// 改箱 + /// + [EnumRemark("改箱")] + ChangeBox = 3, } } diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index dd923f6d..c308db73 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -262,8 +262,7 @@ namespace WMS.Web.Repositories.DependencyInjection Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); - - + Services.AddTransient(); } } }