diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 2f7cd400..e73963dc 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -510,11 +510,6 @@ 用户信息 - - - - - token信息 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 98ea2df6..ebd1347f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -74,6 +74,71 @@ 序列号集 + + + 老ops箱信息头 + + + + + ID + + + + + 对应老OPS的箱ID + + + + + 箱编号(老OPS生成的箱号) + + + + + 创建时间(对应老OPS的创建时间) + + + + + 明细 + + + + + 老ops箱信息明细 + + + + + ID + + + + + 单据头ID + + + + + 物料ID + + + + + 供应商ID + + + + + 数量(装箱数量) + + + + + 序列号集 + + 箱库存表头 diff --git a/src/WMS.Web.Domain/Entitys/Box.cs b/src/WMS.Web.Domain/Entitys/Box.cs new file mode 100644 index 00000000..bd54a38c --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/Box.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// 老ops箱信息头 + /// + + [Serializable] + [Table("t_ops_box")] + public class Box + { + /// + /// ID + /// + public int Id { get; set; } + + /// + /// 对应老OPS的箱ID + /// + public int OpsBoxId { get; set; } + + /// + /// 箱编号(老OPS生成的箱号) + /// + public string BoxBillNo { get; set; } + + /// + /// 创建时间(对应老OPS的创建时间) + /// + public DateTime CreateTime { get; set; } + + /// + /// 明细 + /// + [NotMapped] + public List Details = new List(); + } +} diff --git a/src/WMS.Web.Domain/Entitys/BoxDetails.cs b/src/WMS.Web.Domain/Entitys/BoxDetails.cs new file mode 100644 index 00000000..fa75df3f --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/BoxDetails.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// 老ops箱信息明细 + /// + + [Serializable] + [Table("t_ops_box_details")] + public class BoxDetails + { + /// + /// ID + /// + public int Id { get; set; } + + /// + /// 单据头ID + /// + public int Fid { get; set; } + /// + /// 物料ID + /// + public int MaterialId { get; set; } + /// + /// 供应商ID + /// + public int SupplierId { get; set; } + /// + /// 数量(装箱数量) + /// + public decimal Qty { get; set; } + /// + /// 序列号集 + /// + public string SerialNumbers { get; set; } + } +} diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs index 6893a87d..80f4c4d1 100644 --- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs +++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs @@ -182,6 +182,26 @@ namespace WMS.Web.Repositories.Configuration }); #endregion + #region 箱信息 + builder.Entity(ent => + { + ent.ToTable("t_ops_box"); + ent.HasKey(x => x.Id); + + ent.HasMany(p => p.Details) + .WithOne() + .HasForeignKey(p => p.Fid) + .OnDelete(DeleteBehavior.Cascade); + }); + builder.Entity(ent => + { + ent.ToTable("t_ops_box_details"); + ent.HasKey(x => x.Id); + }); + #endregion + + + base.OnModelCreating(builder); } @@ -203,5 +223,8 @@ namespace WMS.Web.Repositories.Configuration public DbSet BoxInventoryDetails { get; set; } public DbSet InventoryDetails { get; set; } public DbSet InventoryInOutDetails { get; set; } + + public DbSet Box { get; set; } + public DbSet BoxDetails { get; set; } } }