diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 24c8ecac..ccd667bb 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs new file mode 100644 index 00000000..7be7da5d --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs @@ -0,0 +1,58 @@ +using Newtonsoft.Json; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.ERP.Entitys +{ + /// + /// 采购订单字表 + /// + [SugarTable("PurchaseDetail")] + public class PurchaseDetailsEntity : IEntity, IMultiTenant + { + /// + /// 主键 + /// + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } + + /// + /// 租户id + /// + public Guid? TenantId { get; set; } + + /// + /// 采购单id + /// + public long PurchaseId { get; set; } + + /// + /// 物料id + /// + public long MaterialId { get; set; } + + /// + /// 单价 + /// + + public float UnitPrice { get; set; } + /// + /// 总数量 + /// + public long TotalNumber { get; set; } + /// + /// 已完成数量 + /// + public long CompleteNumber { get; set; } + /// + /// 备注 + /// + public string Remarks { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs new file mode 100644 index 00000000..b511c5a9 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs @@ -0,0 +1,68 @@ +using Newtonsoft.Json; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.ERP.Entitys +{ + /// + /// 采购订单 + /// + [SugarTable("Purchase")] + public class PurchaseEntity : IEntity, IMultiTenant + { + /// + /// 主键 + /// + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } + + /// + /// 租户id + /// + public Guid? TenantId { get; set; } + + /// + /// 采购单号 + /// + public string Code { get; set; } + + /// + /// 需求时间 + /// + public DateTime NeedTime { get; set; } + + /// + /// 采购员 + /// + public string Buyer { get; set; } + + /// + /// 总共金额 + /// + public long TotalMoney { get; set; } + + /// + /// 已支付金额 + /// + public long PaidMoney { get; set; } + + /// + /// 采购状态 + /// + public PurchaseStateEnum PurchaseState { get; set; } + } + + public enum PurchaseStateEnum + { + Build=0,//新建 + Run=1,//进行中 + Complete=2,//已完成 + End=3//已结束 + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs new file mode 100644 index 00000000..11217e4b --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs @@ -0,0 +1,58 @@ +using Newtonsoft.Json; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.ERP.Entitys +{ + /// + /// 供应商 + /// + [SugarTable("Supplier")] + public class SupplierEntity : IEntity, IMultiTenant + { + /// + /// 主键 + /// + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } + + /// + /// 租户id + /// + public Guid? TenantId { get; set; } + + /// + /// 供应商编码 + /// + public string Code { get; set; } + + /// + /// 供应商名称 + /// + public string Name { get; set; } + + /// + /// 供应商地址 + /// + public string Address { get; set; } + + /// + /// 电话 + /// + public long Phone { get; set; } + /// + /// 传真 + /// + public string Fax { get; set; } + /// + /// 邮箱 + /// + public string Email { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj index 38505875..bc576f7a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj +++ b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj @@ -50,4 +50,8 @@ + + + +