xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改null操作

Browse Source
This commit is contained in:
橙子
2023-01-05 20:32:58 +08:00
parent efbf799218
commit b7c9b84449
25 changed files with 71 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs
View File

@@ -8,7 +8,7 @@ namespace Yi.Framework.Model.Base
{
public class Entity<Key> : IEntity<Key>
{
public Key Id { get; set; }
public Key Id { get; set; }=default(Key)!;
public object[] GetKeys()
{

2
Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs
View File

@@ -12,7 +12,7 @@ namespace Yi.Framework.Model.Base
//
// 摘要:
// Id of the entity.
public TKey Id { get; set; }
public TKey? Id { get; set; }
public override string ToString()
{

2
Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs
View File

@@ -13,6 +13,6 @@ namespace Yi.Framework.Model.Base
public interface IEntityDto<TKey> : IEntityDto
{
TKey Id { get; set; }
TKey? Id { get; set; }
}
}

4
Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs
View File

@@ -11,8 +11,8 @@ namespace Yi.Framework.Model.Base.Query
{
public class QueryParameter
{
public string Key { get; set; }
public string Value { get; set; }
public string? Key { get; set; }
public string? Value { get; set; }
[JsonConverter(typeof(StringEnumConverter))]
public ConditionalType Type { get; set; } = ConditionalType.Like;
}

8
Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/MaterialEntity.cs
View File

@@ -30,21 +30,21 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 物料编码
/// </summary>
public string Code { get; set; }
public string Code { get; set; }=string.Empty;
/// <summary>
/// 物料名称
/// </summary>
public string Name { get; set; }
public string Name { get; set; }=string.Empty;
/// <summary>
/// 物料单位
/// </summary>
public string UnitName { get; set; }
public string UnitName { get; set; }=string.Empty;
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
public string? Remarks { get; set; }
}
}

14
Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs
View File

@@ -20,7 +20,7 @@ namespace Yi.Framework.Model.ERP.Entitys
/// </summary>
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
public long Id { get; set; }
/// <summary>
/// 租户id
@@ -35,28 +35,28 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 物料id
/// </summary>
public long MaterialId { get; set; }
public long MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
public string MaterialName { get; set; }=string.Empty;
/// <summary>
/// 物料单位
/// </summary>
public string MaterialUnit { get; set; }
public string MaterialUnit { get; set; }=string.Empty ;
/// <summary>
/// 单价
/// </summary>
public float UnitPrice { get; set; }
public float UnitPrice { get; set; }
/// <summary>
/// 总数量
/// </summary>
public long TotalNumber { get; set; }
public long TotalNumber { get; set; }
/// <summary>
/// 已完成数量
/// </summary>
@@ -64,6 +64,6 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
public string? Remarks { get; set; }
}
}

11
Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs
View File

@@ -30,22 +30,22 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 采购单号
/// </summary>
public string Code { get; set; }
public string Code { get; set; }=string.Empty;
/// <summary>
/// 需求时间
/// </summary>
public DateTime NeedTime { get; set; }
public DateTime? NeedTime { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string Buyer { get; set; }
public string? Buyer { get; set; }
/// <summary>
/// 总共金额
/// </summary>
public float TotalMoney { get; set; }
public float TotalMoney { get; set; }
/// <summary>
/// 已支付金额
@@ -55,7 +55,8 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 采购状态
/// </summary>
public PurchaseStateEnum PurchaseState { get; set; }
public PurchaseStateEnum PurchaseState { get; set; } = PurchaseStateEnum.Build;
}
public enum PurchaseStateEnum

12
Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs
View File

@@ -30,29 +30,29 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 供应商编码
/// </summary>
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
/// <summary>
/// 供应商名称
/// </summary>
public string Name { get; set; }
public string Name { get; set; }= string.Empty;
/// <summary>
/// 供应商地址
/// </summary>
public string Address { get; set; }
public string? Address { get; set; }
/// <summary>
/// 电话
/// </summary>
public long Phone { get; set; }
public long? Phone { get; set; }
/// <summary>
/// 传真
/// </summary>
public string Fax { get; set; }
public string? Fax { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string Email { get; set; }
public string? Email { get; set; }
}
}

8
Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/UnitEntity.cs
View File

@@ -20,7 +20,7 @@ namespace Yi.Framework.Model.ERP.Entitys
/// </summary>
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
public long Id { get; set; }
/// <summary>
/// 租户id
@@ -30,16 +30,16 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 单位编码
/// </summary>
public string Code { get; set; }
public string Code { get; set; }=string.Empty;
/// <summary>
/// 单位名称
/// </summary>
public string Name { get; set; }
public string Name { get; set; }=string.Empty;
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
public string? Remarks { get; set; }
}
}

10
Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/WarehouseEntity.cs
View File

@@ -21,7 +21,7 @@ namespace Yi.Framework.Model.ERP.Entitys
/// </summary>
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
public long Id { get; set; }
/// <summary>
/// 租户id
@@ -31,21 +31,21 @@ namespace Yi.Framework.Model.ERP.Entitys
/// <summary>
/// 仓库编码
/// </summary>
public string Code { get; set; }
public string Code { get; set; }=string.Empty;
/// <summary>
/// 仓库名称
/// </summary>
public string Name { get; set; }
public string Name { get; set; }=string.Empty ;
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
public string? Remarks { get; set; }
/// <summary>
/// 状态
/// </summary>
public StateEnum State { get; set; }
public StateEnum State { get; set; } = StateEnum.Normal;
}
}

4
Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/StudentEntity.cs
View File

@@ -7,8 +7,8 @@ namespace Yi.Framework.Model.RABC.Entitys
[SugarTable("Student")]
public class StudentEntity : IEntity<Guid>, IMultiTenant
{
public string Name { get; set; }
public string Remark { get; set; }
public string? Name { get; set; }
public string? Remark { get; set; }
[SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
public Guid Id { get; set; }

2
Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs
View File

@@ -146,7 +146,7 @@ namespace Yi.Framework.Model.RABC.Entitys
/// <summary>
/// 构建密码，MD5盐值加密
/// </summary>
public UserEntity BuildPassword(string password = null)
public UserEntity BuildPassword(string? password = null)
{
//如果不传值，那就把自己的password当作传进来的password
if (password == null)

2
Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs
View File

@@ -29,7 +29,7 @@ namespace Yi.Framework.Model.SHOP.Entitys
/// 分类名称
///</summary>
[SugarColumn(ColumnName = "CategoryName")]
public string CategoryName { get; set; }
public string? CategoryName { get; set; }
/// <summary>
/// 创建者
///</summary>

2
Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs
View File

@@ -29,7 +29,7 @@ namespace Yi.Framework.Model.SHOP.Entitys
/// 商品规格名
///</summary>
[SugarColumn(ColumnName = "SpecsName")]
public string SpecsName { get; set; }
public string? SpecsName { get; set; }
/// <summary>
/// 创建者
///</summary>

2
Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs
View File

@@ -29,7 +29,7 @@ namespace Yi.Framework.Model.SHOP.Entitys
/// 商品规格组名
///</summary>
[SugarColumn(ColumnName = "SpecsGroupName")]
public string SpecsGroupName { get; set; }
public string? SpecsGroupName { get; set; }
/// <summary>
/// 创建者
///</summary>

4
Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
View File

@@ -6,11 +6,11 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;CS8625;CS8618</NoWarn>
<NoWarn>1701;1702</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>1701;1702;CS8625;CS8618</NoWarn>
<NoWarn>1701;1702</NoWarn>
</PropertyGroup>
<ItemGroup>