From 66e64a32c19cfdb131304a1b8025c363eb6b5a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZR20090193-=E9=99=88=E6=95=AC=E5=8B=87?= Date: Fri, 15 Mar 2024 15:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Code/Entity/CodeCountry.cs | 2 +- .../DS.WMS.Core/Code/Entity/CodeCtn.cs | 38 +++--- .../DS.WMS.Core/Code/Entity/CodeFormCopy.cs | 6 +- .../DS.WMS.Core/Code/Entity/CodeFormSet.cs | 4 +- .../DS.WMS.Core/Code/Entity/CodeFrt.cs | 4 +- .../DS.WMS.Core/Code/Entity/CodeGoods.cs | 14 +-- .../DS.WMS.Core/Code/Entity/CodeGoodsType.cs | 4 +- .../DS.WMS.Core/Code/Entity/CodeIssueType.cs | 4 +- .../DS.WMS.Core/Code/Entity/CodeLanes.cs | 10 +- .../DS.WMS.Core/Code/Entity/CodePackage.cs | 6 +- .../DS.WMS.Core/Code/Entity/CodePort.cs | 8 +- .../Code/Entity/CodeSourceDetail.cs | 2 +- .../DS.WMS.Core/Code/Entity/CodeStlMode.cs | 2 +- .../DS.WMS.Core/Code/Entity/CodeVessel.cs | 4 +- .../DS.WMS.Core/Info/Entity/InfoClient.cs | 114 +++++++++--------- .../Info/Entity/InfoClientAccountDate.cs | 20 +-- .../DS.WMS.Core/Info/Entity/InfoClientBank.cs | 20 +-- .../Info/Entity/InfoClientContact.cs | 34 +++--- .../Info/Entity/InfoClientContract.cs | 12 +- .../Info/Entity/InfoClientShipper.cs | 12 +- .../DS.WMS.Core/Info/Entity/InfoClientTag.cs | 43 +++---- ds-wms-service/DS.WMS.Test/SaasTest.cs | 8 +- 22 files changed, 194 insertions(+), 177 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCountry.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCountry.cs index 42fa8d4b..91de798e 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCountry.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCountry.cs @@ -24,7 +24,7 @@ public class CodeCountry: BaseModel /// /// 国家英文名称 /// - [SugarColumn(ColumnDescription = "国家英文名称", Length = 200)] + [SugarColumn(ColumnDescription = "国家英文名称", Length = 200, IsNullable = true)] public string CountryEnName { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCtn.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCtn.cs index 7cfe1aa3..d459b882 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCtn.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeCtn.cs @@ -3,66 +3,76 @@ using DS.Module.Core.Data; using SqlSugar; namespace DS.WMS.Core.Code.Entity; + /// /// 集装箱信息表 /// -[SqlSugar.SugarTable("op_code_ctn","集装箱信息表")] -public class CodeCtn: BaseModel +[SqlSugar.SugarTable("op_code_ctn", "集装箱信息表")] +public class CodeCtn : BaseModel { /// /// 集装箱类型 /// [SugarColumn(ColumnDescription = "集装箱类型", Length = 5)] public string CtnSize { get; set; } + /// /// 集装箱尺寸 /// [SugarColumn(ColumnDescription = "集装箱尺寸", Length = 10)] public string CtnType { get; set; } + /// /// 表现形式 /// [SugarColumn(ColumnDescription = "表现形式", Length = 10)] public string CtnName { get; set; } + /// /// EDI代码 /// - [SugarColumn(ColumnDescription = "EDI代码", Length = 5)] + [SugarColumn(ColumnDescription = "EDI代码", Length = 5, IsNullable = true)] public string EdiCode { get; set; } + /// /// 箱皮重 /// - [SugarColumn(ColumnDescription = "箱皮重", Length = 18,DecimalDigits = 3,DefaultValue ="0")] - public decimal CtnWeight { get; set; } + [SugarColumn(ColumnDescription = "箱皮重", Length = 18, DecimalDigits = 3, DefaultValue = "0")] + public decimal CtnWeight { get; set; } + /// /// 中文说明 /// - [SugarColumn(ColumnDescription = "中文说明", Length = 100)] + [SugarColumn(ColumnDescription = "中文说明", Length = 100, IsNullable = true)] public string CnExplain { get; set; } + /// /// 英文说明 /// - [SugarColumn(ColumnDescription = "英文说明", Length = 100)] + [SugarColumn(ColumnDescription = "英文说明", Length = 100, IsNullable = true)] public string EnExplain { get; set; } - + /// /// AFR代码 /// - [SugarColumn(ColumnDescription = "AFR代码", Length = 10)] + [SugarColumn(ColumnDescription = "AFR代码", Length = 10, IsNullable = true)] public string AfrCode { get; set; } + /// /// 默认限重 /// - [SugarColumn(ColumnDescription = "默认限重", Length = 18,DecimalDigits = 3,DefaultValue ="0")] - public decimal LimitWeight { get; set; } + [SugarColumn(ColumnDescription = "默认限重", Length = 18, DecimalDigits = 3, DefaultValue = "0")] + public decimal LimitWeight { get; set; } + /// /// TEU /// - [SugarColumn(ColumnDescription = "TEU", Length = 8,DecimalDigits = 2,DefaultValue ="0")] - public decimal TEU { get; set; } + [SugarColumn(ColumnDescription = "TEU", Length = 8, DecimalDigits = 2, DefaultValue = "0")] + public decimal TEU { get; set; } + /// /// 状态 0启用 1禁用 /// - [SugarColumn(ColumnDescription = "状态",DefaultValue = "0")] + [SugarColumn(ColumnDescription = "状态", DefaultValue = "0")] public StatusEnum? Status { get; set; } = StatusEnum.Enable; } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs index 9803d92e..3fdded6b 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs @@ -13,16 +13,19 @@ public class CodeFormCopy : BaseOrgModel /// /// 权限Id /// + [SugarColumn(ColumnDescription = "权限Id", IsNullable = false)] public long? PermissionId { get; set; } /// /// 模板名称 /// + [SugarColumn(ColumnDescription = "模板名称", IsNullable = false)] public string TemplateName { get; set; } /// /// 是否公共标识 /// + [SugarColumn(ColumnDescription = "是否公共标识", IsNullable = false,DefaultValue = "0")] public bool IsPublic { get; set; } = false; /// @@ -34,7 +37,8 @@ public class CodeFormCopy : BaseOrgModel /// /// 排序号 /// - public string OrderNo { get; set; } + [SugarColumn(ColumnDescription = "排序号", IsNullable = true,DefaultValue = "100")] + public int? OrderNo { get; set; } = 100; /// /// 状态 diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormSet.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormSet.cs index ff7d9c1f..72699b9b 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormSet.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormSet.cs @@ -13,6 +13,7 @@ public class CodeFormSet : BaseOrgModel /// /// 权限Id /// + [SugarColumn(ColumnDescription = "权限Id", IsNullable = false)] public long? PermissionId { get; set; } /// @@ -24,7 +25,8 @@ public class CodeFormSet : BaseOrgModel /// /// 排序号 /// - public string OrderNo { get; set; } + [SugarColumn(ColumnDescription = "排序号", IsNullable = true,DefaultValue = "100")] + public int? OrderNo { get; set; } = 100; /// /// 状态 diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFrt.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFrt.cs index 3cfaa100..6d2d7858 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFrt.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFrt.cs @@ -17,13 +17,13 @@ public class CodeFrt: BaseModel /// /// 中文名称 /// - [SugarColumn(ColumnDescription = "中文名称", Length = 50)] + [SugarColumn(ColumnDescription = "中文名称", Length = 50,IsNullable = true)] public string CnName { get; set; } /// /// EDI代码 /// - [SugarColumn(ColumnDescription = "EDI代码", Length = 5)] + [SugarColumn(ColumnDescription = "EDI代码", Length = 5,IsNullable = true)] public string EdiCode { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoods.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoods.cs index 34832be7..22a69230 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoods.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoods.cs @@ -24,18 +24,18 @@ public class CodeGoods: BaseModel /// /// 物料号 /// - [SugarColumn(ColumnDescription = "物料号", Length = 50)] + [SugarColumn(ColumnDescription = "物料号", Length = 50,IsNullable = true)] public string GoodNo { get; set; } /// /// 英文名称 /// - [SugarColumn(ColumnDescription = "英文名称", Length = 10)] + [SugarColumn(ColumnDescription = "英文名称", Length = 10,IsNullable = true)] public string EnName { get; set; } /// /// 商品描述 /// - [SugarColumn(ColumnDescription = "商品描述", Length = 200)] + [SugarColumn(ColumnDescription = "商品描述", Length = 200,IsNullable = true)] public string Description { get; set; } /// @@ -75,25 +75,25 @@ public class CodeGoods: BaseModel /// /// 海关代码 /// - [SugarColumn(ColumnDescription = "海关代码", Length = 50)] + [SugarColumn(ColumnDescription = "海关代码", Length = 50,IsNullable = true)] public string HSCode { get; set; } /// /// 申报计量单位 /// - [SugarColumn(ColumnDescription = "物料号", Length = 50)] + [SugarColumn(ColumnDescription = "物料号", Length = 50,IsNullable = true)] public string RuleUnit { get; set; } /// /// 法定第一计量单位 /// - [SugarColumn(ColumnDescription = "法定第一计量单位", Length = 50)] + [SugarColumn(ColumnDescription = "法定第一计量单位", Length = 50,IsNullable = true)] public string RuleUnit1 { get; set; } /// /// 法定第二计量单位 /// - [SugarColumn(ColumnDescription = "法定第二计量单位", Length = 50)] + [SugarColumn(ColumnDescription = "法定第二计量单位", Length = 50,IsNullable = true)] public string RuleUnit2 { get; set; } /// /// 状态 0启用 1禁用 diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoodsType.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoodsType.cs index ddd4a566..faa1f41f 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoodsType.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeGoodsType.cs @@ -24,12 +24,12 @@ public class CodeGoodsType: BaseModel /// /// 英文名称 /// - [SugarColumn(ColumnDescription = "英文名称", Length = 10)] + [SugarColumn(ColumnDescription = "英文名称", Length = 10,IsNullable = true)] public string EnName { get; set; } /// /// 描述 /// - [SugarColumn(ColumnDescription = "描述", Length = 200)] + [SugarColumn(ColumnDescription = "描述", Length = 200,IsNullable = true)] public string Description { get; set; } /// /// 状态 0启用 1禁用 diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeIssueType.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeIssueType.cs index ec0e1d58..5cd47644 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeIssueType.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeIssueType.cs @@ -23,12 +23,12 @@ public class CodeIssueType: BaseModel /// /// 正本份数 /// - [SugarColumn(ColumnDescription = "正本份数", Length = 5)] + [SugarColumn(ColumnDescription = "正本份数", Length = 5,IsNullable = true)] public string NoBill { get; set; } /// /// 副本份数 /// - [SugarColumn(ColumnDescription = "副本份数", Length = 5)] + [SugarColumn(ColumnDescription = "副本份数", Length = 5,IsNullable = true)] public string CopyNoBill { get; set; } /// /// 状态 0启用 1禁用 diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeLanes.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeLanes.cs index b0826da9..1ad02b49 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeLanes.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeLanes.cs @@ -22,29 +22,29 @@ public class CodeLanes: BaseModel /// /// 航线英文名称 /// - [SugarColumn(ColumnDescription = "航线英文名称", Length = 20)] + [SugarColumn(ColumnDescription = "航线英文名称", Length = 20,IsNullable = true)] public string LaneEnName { get; set; } /// /// 默认操作员 /// - [SugarColumn(ColumnDescription = "默认操作员")] + [SugarColumn(ColumnDescription = "默认操作员",IsNullable = true)] public long Operator { get; set; } /// /// 默认单证 /// - [SugarColumn(ColumnDescription = "默认单证")] + [SugarColumn(ColumnDescription = "默认单证",IsNullable = true)] public long VouchingClerk { get; set; } /// /// 默认客服 /// - [SugarColumn(ColumnDescription = "默认客服")] + [SugarColumn(ColumnDescription = "默认客服",IsNullable = true)] public long CustomerService { get; set; } /// /// EDI代码 /// - [SugarColumn(ColumnDescription = "EDI代码", Length = 5)] + [SugarColumn(ColumnDescription = "EDI代码", Length = 5,IsNullable = true)] public string EdiCode { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodePackage.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodePackage.cs index 5b94585f..f093eb55 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodePackage.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodePackage.cs @@ -18,17 +18,17 @@ public class CodePackage: BaseModel /// /// 中文说明 /// - [SugarColumn(ColumnDescription = "中文说明", Length = 100)] + [SugarColumn(ColumnDescription = "中文说明", Length = 100,IsNullable = true)] public string CnExplain { get; set; } /// /// AFR代码 /// - [SugarColumn(ColumnDescription = "AFR代码", Length = 10)] + [SugarColumn(ColumnDescription = "AFR代码", Length = 10,IsNullable = true)] public string AfrCode { get; set; } /// /// EDI代码 /// - [SugarColumn(ColumnDescription = "EDI代码", Length = 5)] + [SugarColumn(ColumnDescription = "EDI代码", Length = 5,IsNullable = true)] public string EdiCode { get; set; } /// /// 状态 0启用 1禁用 diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodePort.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodePort.cs index f4ae6e05..b51af6ea 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodePort.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodePort.cs @@ -22,7 +22,7 @@ public class CodePort: BaseModel /// /// 国家名称 /// - [SugarColumn(ColumnDescription = "国家名称", Length = 80)] + [SugarColumn(ColumnDescription = "国家名称", Length = 80,IsNullable = true)] public string CountryName { get; set; } /// /// 所在大洲 @@ -42,17 +42,17 @@ public class CodePort: BaseModel /// /// 国家Id /// - [SugarColumn(ColumnDescription = "国家Id")] + [SugarColumn(ColumnDescription = "国家Id",IsNullable = true)] public long CountryId { get; set; } /// /// 航线Id /// - [SugarColumn(ColumnDescription = "航线Id")] + [SugarColumn(ColumnDescription = "航线Id",IsNullable = true)] public long LaneId { get; set; } /// /// EDI代码 /// - [SugarColumn(ColumnDescription = "EDI代码", Length = 5)] + [SugarColumn(ColumnDescription = "EDI代码", Length = 5,IsNullable = true)] public string EdiCode { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeSourceDetail.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeSourceDetail.cs index ccd6c061..35151e1f 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeSourceDetail.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeSourceDetail.cs @@ -23,7 +23,7 @@ public class CodeSourceDetail: BaseModel /// /// 英文名称 /// - [SugarColumn(ColumnDescription = "英文名称", Length = 100)] + [SugarColumn(ColumnDescription = "英文名称", Length = 100,IsNullable = true)] public string EnName { get; set; } /// /// 状态 0启用 1禁用 diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeStlMode.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeStlMode.cs index ff42eb59..bf627c56 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeStlMode.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeStlMode.cs @@ -28,7 +28,7 @@ public class CodeStlMode: BaseModel /// /// 财务软件代码 /// - [SugarColumn(ColumnDescription = "财务软件代码", Length = 30)] + [SugarColumn(ColumnDescription = "财务软件代码", Length = 30,IsNullable = true)] public string FinanceSoftCode { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeVessel.cs b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeVessel.cs index 080c9f17..4f803f11 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeVessel.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeVessel.cs @@ -22,7 +22,7 @@ public class CodeVessel: BaseModel /// /// 船公司Id /// - [SugarColumn(ColumnDescription = "船公司Id")] + [SugarColumn(ColumnDescription = "船公司Id",IsNullable = true)] public long CarrierId { get; set; } /// @@ -34,7 +34,7 @@ public class CodeVessel: BaseModel /// /// EDI代码-船舶呼号 /// - [SugarColumn(ColumnDescription = "EDI代码-船舶呼号", Length = 5)] + [SugarColumn(ColumnDescription = "EDI代码-船舶呼号", Length = 5,IsNullable = true)] public string EdiCode { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs index 0fbb00c6..6cf0e728 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs @@ -25,19 +25,19 @@ public class InfoClient : BaseOrgModel /// /// Desc:客户中文名称或描述信息 /// - [SugarColumn(ColumnDescription = "客户中文名称或描述信息", Length = 50)] + [SugarColumn(ColumnDescription = "客户中文名称或描述信息", IsNullable = true, Length = 50)] public string Description { get; set; } /// /// Desc:客户英文简称 /// - [SugarColumn(ColumnDescription = "客户英文简称", Length = 50)] + [SugarColumn(ColumnDescription = "客户英文简称", IsNullable = true, Length = 50)] public string Name { get; set; } /// /// Desc:客户英文全称 /// - [SugarColumn(ColumnDescription = "客户英文全称", Length = 50)] + [SugarColumn(ColumnDescription = "客户英文全称", IsNullable = true, Length = 50)] public string EnFullName { get; set; } /// @@ -49,7 +49,7 @@ public class InfoClient : BaseOrgModel /// /// Desc:通讯地址 /// - [SugarColumn(ColumnDescription = "通讯地址", Length = 1000)] + [SugarColumn(ColumnDescription = "通讯地址", IsNullable = true, Length = 1000)] public string Address { get; set; } /// @@ -61,147 +61,147 @@ public class InfoClient : BaseOrgModel /// /// Desc:网页 /// - [SugarColumn(ColumnDescription = "网页", Length = 50)] + [SugarColumn(ColumnDescription = "网页", IsNullable = true, Length = 50)] public string Web { get; set; } /// /// Desc:电话 /// - [SugarColumn(ColumnDescription = "电话", Length = 50)] + [SugarColumn(ColumnDescription = "电话", IsNullable = true, Length = 50)] public string Tel { get; set; } /// /// Desc:传真 /// - [SugarColumn(ColumnDescription = "传真", Length = 50)] + [SugarColumn(ColumnDescription = "传真", IsNullable = true, Length = 50)] public string Fax { get; set; } /// /// Desc:负责人 /// - [SugarColumn(ColumnDescription = "负责人", Length = 20)] + [SugarColumn(ColumnDescription = "负责人", IsNullable = true, Length = 20)] public string Chief { get; set; } /// /// Desc:所属揽货人 /// - [SugarColumn(ColumnDescription = "所属揽货人")] + [SugarColumn(ColumnDescription = "所属揽货人", IsNullable = true)] public long SaleId { get; set; } /// /// Desc:所属操作人 /// - [SugarColumn(ColumnDescription = "所属操作人")] + [SugarColumn(ColumnDescription = "所属操作人", IsNullable = true)] public long Op { get; set; } /// /// Desc:所属单证 /// - [SugarColumn(ColumnDescription = "所属单证")] + [SugarColumn(ColumnDescription = "所属单证", IsNullable = true)] public long Doc { get; set; } /// /// Desc:国家 /// - [SugarColumn(ColumnDescription = "国家", Length = 50)] + [SugarColumn(ColumnDescription = "国家", Length = 50, IsNullable = true)] public string Country { get; set; } /// /// Desc:省或州 /// - [SugarColumn(ColumnDescription = "省或州", Length = 50)] + [SugarColumn(ColumnDescription = "省或州", Length = 50, IsNullable = true)] public string Province { get; set; } /// /// Desc:城市 /// - [SugarColumn(ColumnDescription = "城市", Length = 50)] + [SugarColumn(ColumnDescription = "城市", Length = 50, IsNullable = true)] public string City { get; set; } /// /// Desc:提单信息 /// - [SugarColumn(ColumnDescription = "提单信息", Length = 600)] + [SugarColumn(ColumnDescription = "提单信息", Length = 600, IsNullable = true)] public string BLContent { get; set; } /// /// Desc:是否停用该客户信息 /// - [SugarColumn(ColumnDescription = "是否停用该客户信息")] + [SugarColumn(ColumnDescription = "是否停用该客户信息",DefaultValue = "0")] public bool? IsStop { get; set; } = false; /// /// Desc:发票抬头1 /// - [SugarColumn(ColumnDescription = "发票抬头1", Length = 60)] + [SugarColumn(ColumnDescription = "发票抬头1", Length = 60, IsNullable = true)] public string BillRises1 { get; set; } /// /// Desc:发票抬头2 /// - [SugarColumn(ColumnDescription = "发票抬头2", Length = 60)] + [SugarColumn(ColumnDescription = "发票抬头2", Length = 60, IsNullable = true)] public string BillRises2 { get; set; } /// /// Desc:美元支票抬头 /// - [SugarColumn(ColumnDescription = "美元支票抬头", Length = 60)] + [SugarColumn(ColumnDescription = "美元支票抬头", Length = 60, IsNullable = true)] public string USDBillRises { get; set; } /// /// Desc:人民币支票抬头 /// - [SugarColumn(ColumnDescription = "人民币支票抬头", Length = 60)] + [SugarColumn(ColumnDescription = "人民币支票抬头", Length = 60, IsNullable = true)] public string RMBBillRises { get; set; } /// /// Desc:人民币开户银行 /// - [SugarColumn(ColumnDescription = "人民币开户银行", Length = 60)] + [SugarColumn(ColumnDescription = "人民币开户银行", Length = 60, IsNullable = true)] public string RMBBank { get; set; } /// /// Desc:人民币账号 /// - [SugarColumn(ColumnDescription = "人民币账号", Length = 30)] + [SugarColumn(ColumnDescription = "人民币账号", Length = 30, IsNullable = true)] public string RMBAccount { get; set; } /// /// Desc:人民币联机行号 /// - [SugarColumn(ColumnDescription = "人民币联机行号", Length = 20)] + [SugarColumn(ColumnDescription = "人民币联机行号", Length = 20, IsNullable = true)] public string RMBOnlineNO { get; set; } /// /// Desc:美元开户银行 /// - [SugarColumn(ColumnDescription = "美元开户银行", Length = 60)] + [SugarColumn(ColumnDescription = "美元开户银行", Length = 60, IsNullable = true)] public string USDBank { get; set; } /// /// Desc:美元账号 /// - [SugarColumn(ColumnDescription = "美元账号", Length = 30)] + [SugarColumn(ColumnDescription = "美元账号", Length = 30, IsNullable = true)] public string USDAccount { get; set; } /// /// Desc:美元联机行号 /// - [SugarColumn(ColumnDescription = "美元联机行号", Length = 20)] + [SugarColumn(ColumnDescription = "美元联机行号", Length = 20, IsNullable = true)] public string USDOnlineNO { get; set; } /// /// Desc:自定义属性1 /// - [SugarColumn(ColumnDescription = "自定义属性1", Length = 12)] + [SugarColumn(ColumnDescription = "自定义属性1", Length = 12, IsNullable = true)] public string CustomAttributes1 { get; set; } /// /// Desc:自定义属性2 /// - [SugarColumn(ColumnDescription = "自定义属性2", Length = 12)] + [SugarColumn(ColumnDescription = "自定义属性2", Length = 12, IsNullable = true)] public string CustomAttributes2 { get; set; } /// @@ -225,7 +225,7 @@ public class InfoClient : BaseOrgModel /// /// Desc:结算方式编码 /// - [SugarColumn(ColumnDescription = "结算方式编码", Length = 30)] + [SugarColumn(ColumnDescription = "结算方式编码", Length = 30, IsNullable = true)] public string StlName { get; set; } @@ -238,31 +238,31 @@ public class InfoClient : BaseOrgModel /// /// Desc:月结算时间 /// - [SugarColumn(ColumnDescription = "月结算时间", Length = 2)] + [SugarColumn(ColumnDescription = "月结算时间", Length = 2, IsNullable = true)] public string StlDate { get; set; } /// /// Desc:上半月结算时间 /// - [SugarColumn(ColumnDescription = "上半月结算时间", Length = 2)] + [SugarColumn(ColumnDescription = "上半月结算时间", Length = 2, IsNullable = true)] public string StlFirstHalfDate { get; set; } /// /// Desc:下半月结算时间 /// - [SugarColumn(ColumnDescription = "下半月结算时间", Length = 2)] + [SugarColumn(ColumnDescription = "下半月结算时间", Length = 2, IsNullable = true)] public string StlMiddleDate { get; set; } /// /// Desc:票结结算时间 /// - [SugarColumn(ColumnDescription = "发票结算时间", Length = 2)] + [SugarColumn(ColumnDescription = "发票结算时间", Length = 2, IsNullable = true)] public string InvoiceStlDate { get; set; } /// /// Desc:等级 /// - [SugarColumn(ColumnDescription = "等级", Length = 1)] + [SugarColumn(ColumnDescription = "等级", Length = 1, IsNullable = true)] public string Level { get; set; } @@ -270,44 +270,44 @@ public class InfoClient : BaseOrgModel /// /// Desc:QQ /// - [SugarColumn(ColumnDescription = "QQ", Length = 50)] + [SugarColumn(ColumnDescription = "QQ", Length = 50, IsNullable = true)] public string QQ { get; set; } /// /// Desc:MSN /// - [SugarColumn(ColumnDescription = "MSN", Length = 50)] + [SugarColumn(ColumnDescription = "MSN", Length = 50, IsNullable = true)] public string MSN { get; set; } /// /// Desc:财务应收账款代码 /// - [SugarColumn(ColumnDescription = "财务应收账款代码", Length = 50)] + [SugarColumn(ColumnDescription = "财务应收账款代码", Length = 50, IsNullable = true)] public string FARCode { get; set; } /// /// Desc:财务应付账款代码 /// - [SugarColumn(ColumnDescription = "财务应付账款代码", Length = 50)] + [SugarColumn(ColumnDescription = "财务应付账款代码", Length = 50, IsNullable = true)] public string FAPCode { get; set; } /// /// Desc:冷藏费率 /// - [SugarColumn(ColumnDescription = "冷藏费率", Length = 50, DefaultValue = "0")] + [SugarColumn(ColumnDescription = "冷藏费率", Length = 50, DefaultValue = "0", IsNullable = true)] public string UnitPrice { get; set; } /// /// Desc:企业备案号 /// - [SugarColumn(ColumnDescription = "企业备案号", Length = 50)] + [SugarColumn(ColumnDescription = "企业备案号", Length = 50, IsNullable = true)] public string RegistrationNo { get; set; } /// /// Desc:财务序号 /// - [SugarColumn(ColumnDescription = "财务序号", Length = 50)] + [SugarColumn(ColumnDescription = "财务序号", Length = 50, IsNullable = true)] public string OrderNo { get; set; } @@ -315,43 +315,43 @@ public class InfoClient : BaseOrgModel /// /// Desc:纳税人识别号 /// - [SugarColumn(ColumnDescription = "纳税人识别号", Length = 30)] + [SugarColumn(ColumnDescription = "纳税人识别号", Length = 30, IsNullable = true)] public string TaxNo { get; set; } /// /// Desc:EDI代码 /// - [SugarColumn(ColumnDescription = "EDI代码", Length = 20)] + [SugarColumn(ColumnDescription = "EDI代码", Length = 20, IsNullable = true)] public string EDICode { get; set; } /// /// Desc:EDI代码2 /// - [SugarColumn(ColumnDescription = "EDI代码2", Length = 20)] + [SugarColumn(ColumnDescription = "EDI代码2", Length = 20, IsNullable = true)] public string EDICode2 { get; set; } /// /// Desc:EDI代码3 /// - [SugarColumn(ColumnDescription = "EDI代码3", Length = 20)] + [SugarColumn(ColumnDescription = "EDI代码3", Length = 20, IsNullable = true)] public string EDICode3 { get; set; } /// /// Desc:组织机构代码 /// - [SugarColumn(ColumnDescription = "组织机构代码", Length = 50)] + [SugarColumn(ColumnDescription = "组织机构代码", Length = 50, IsNullable = true)] public string OrganizationCode { get; set; } /// /// Desc: 所属集团 /// - [SugarColumn(ColumnDescription = "所属集团", Length = 50)] + [SugarColumn(ColumnDescription = "所属集团", Length = 50, IsNullable = true)] public string PcorpName { get; set; } /// /// Desc:企业商检备案号 /// - [SugarColumn(ColumnDescription = "商检备案号", Length = 50)] + [SugarColumn(ColumnDescription = "商检备案号", Length = 50, IsNullable = true)] public string InspectionNo { get; set; } /// @@ -368,7 +368,7 @@ public class InfoClient : BaseOrgModel /// /// 审批意见 /// - [SugarColumn(ColumnDescription = "审批意见", Length = 100)] + [SugarColumn(ColumnDescription = "审批意见", Length = 100, IsNullable = true)] public string AuditNote { get; set; } @@ -376,7 +376,7 @@ public class InfoClient : BaseOrgModel /// /// Desc:默认付费方式 /// - [SugarColumn(ColumnDescription = "默认付费方式", Length = 20)] + [SugarColumn(ColumnDescription = "默认付费方式", Length = 20, IsNullable = true)] public string FeeFRT { get; set; } /// @@ -394,13 +394,13 @@ public class InfoClient : BaseOrgModel /// /// Desc:发票银行 /// - [SugarColumn(ColumnDescription = "发票银行", Length = 150)] + [SugarColumn(ColumnDescription = "发票银行", Length = 150, IsNullable = true)] public string InvoiceBank { get; set; } /// /// Desc:发票地址电话 /// - [SugarColumn(ColumnDescription = "发票地址电话", Length = 200)] + [SugarColumn(ColumnDescription = "发票地址电话", Length = 200, IsNullable = true)] public string InvoiceAddrTel { get; set; } /// @@ -424,19 +424,19 @@ public class InfoClient : BaseOrgModel /// /// Desc:提成参与人 /// - [SugarColumn(ColumnDescription = "提成参与人")] + [SugarColumn(ColumnDescription = "提成参与人", IsNullable = true)] public long CommissionUserId { get; set; } /// /// Desc:运输公司列表 /// - [SugarColumn(ColumnDescription = "运输公司列表", Length = 200)] + [SugarColumn(ColumnDescription = "运输公司列表", Length = 200, IsNullable = true)] public string CarrierList { get; set; } /// /// Desc:集装箱尺寸 /// - [SugarColumn(ColumnDescription = "集装箱尺寸", Length = 50)] + [SugarColumn(ColumnDescription = "集装箱尺寸", Length = 50, IsNullable = true)] public string CtnType { get; set; } @@ -449,12 +449,12 @@ public class InfoClient : BaseOrgModel /// /// Desc:英文简称 /// - [SugarColumn(ColumnDescription = "英文简称", Length = 50)] + [SugarColumn(ColumnDescription = "英文简称", Length = 50, IsNullable = true)] public string EnShortName { get; set; } /// /// Desc:仓储费开始日期模式 /// - [SugarColumn(ColumnDescription = "仓储费开始日期模式", Length = 50)] + [SugarColumn(ColumnDescription = "仓储费开始日期模式", Length = 50, IsNullable = true)] public string WMSFeeRateType { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs index 73d7436f..9fe0bc45 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs @@ -19,56 +19,56 @@ public class InfoClientAccountDate : BaseOrgModel /// /// Desc:业务来源Id /// - [SugarColumn(ColumnDescription = "业务来源Id")] + [SugarColumn(ColumnDescription = "业务来源Id", IsNullable = true)] public long SourceId { get; set; } /// /// Desc:合同生效日期 /// - [SugarColumn(ColumnDescription = "合同生效日期")] + [SugarColumn(ColumnDescription = "合同生效日期", IsNullable = true)] public DateTime? BeginDate { get; set; } /// /// Desc:合同结束日期 /// - [SugarColumn(ColumnDescription = "合同失效日期")] + [SugarColumn(ColumnDescription = "合同失效日期", IsNullable = true)] public DateTime? EndDate { get; set; } /// /// Desc:业务类型 /// - [SugarColumn(ColumnDescription = "业务类型",Length = 20)] + [SugarColumn(ColumnDescription = "业务类型",Length = 20, IsNullable = true)] public string BusinessType { get; set; } /// /// Desc:揽货人Id /// - [SugarColumn(ColumnDescription = "揽货人Id")] + [SugarColumn(ColumnDescription = "揽货人Id", IsNullable = true)] public long SaleId { get; set; } /// /// Desc:账期类型 /// - [SugarColumn(ColumnDescription = "账期类型",Length = 20)] + [SugarColumn(ColumnDescription = "账期类型",Length = 20, IsNullable = true)] public string AccountType { get; set; } /// /// Desc:账期起算日 /// - [SugarColumn(ColumnDescription = "账期起算日",Length = 20)] + [SugarColumn(ColumnDescription = "账期起算日",Length = 20, IsNullable = true)] public string AccountStartDate { get; set; } /// /// Desc:间隔月份 /// - [SugarColumn(ColumnDescription = "间隔月份")] + [SugarColumn(ColumnDescription = "间隔月份", IsNullable = true)] public byte? AccountMonth { get; set; } /// /// Desc:账期日期 /// - [SugarColumn(ColumnDescription = "账期日期")] + [SugarColumn(ColumnDescription = "账期日期", IsNullable = true)] public byte? AccountDays { get; set; } /// @@ -81,7 +81,7 @@ public class InfoClientAccountDate : BaseOrgModel /// /// Desc:合同Id /// - [SugarColumn(ColumnDescription = "合同Id")] + [SugarColumn(ColumnDescription = "合同Id", IsNullable = true)] public long ContractId { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientBank.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientBank.cs index bfbfc63b..b883ff26 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientBank.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientBank.cs @@ -31,62 +31,62 @@ public class InfoClientBank : BaseOrgModel /// /// Desc:银行名称 /// - [SugarColumn(ColumnDescription = "银行名称", Length = 100)] + [SugarColumn(ColumnDescription = "银行名称", Length = 100, IsNullable = true)] public string BankName { get; set; } /// /// Desc:银行账户 /// - [SugarColumn(ColumnDescription = "银行账户", Length = 40)] + [SugarColumn(ColumnDescription = "银行账户", Length = 40, IsNullable = true)] public string Account { get; set; } /// /// Desc:银行地址 /// - [SugarColumn(ColumnDescription = "银行地址", Length = 50)] + [SugarColumn(ColumnDescription = "银行地址", Length = 50, IsNullable = true)] public string BankAddress { get; set; } /// /// Desc:财务软件代码 /// - [SugarColumn(ColumnDescription = "财务软件代码", Length = 50)] + [SugarColumn(ColumnDescription = "财务软件代码", Length = 50, IsNullable = true)] public string FinanceSoftCode { get; set; } /// /// Desc:科目代码 /// - [SugarColumn(ColumnDescription = "科目代码", Length = 20)] + [SugarColumn(ColumnDescription = "科目代码", Length = 20, IsNullable = true)] public string SubjectCode { get; set; } /// /// Desc:户头名称 /// - [SugarColumn(ColumnDescription = "户头名称", Length = 100)] + [SugarColumn(ColumnDescription = "户头名称", Length = 100, IsNullable = true)] public string AccountName { get; set; } /// /// Desc:代理银行名称 /// - [SugarColumn(ColumnDescription = "代理银行名称", Length = 20)] + [SugarColumn(ColumnDescription = "代理银行名称", Length = 20, IsNullable = true)] public string BankAgentName { get; set; } /// /// Desc:银行账号 /// - [SugarColumn(ColumnDescription = "银行账号", Length = 20)] + [SugarColumn(ColumnDescription = "银行账号", Length = 20, IsNullable = true)] public string BankAccountNo { get; set; } /// /// Desc: 银行SWIFT /// - [SugarColumn(ColumnDescription = "银行SWIFT", Length = 20)] + [SugarColumn(ColumnDescription = "银行SWIFT", Length = 20, IsNullable = true)] public string SWIFT { get; set; } /// /// Desc: 国家Id /// - [SugarColumn(ColumnDescription = "国家Id")] + [SugarColumn(ColumnDescription = "国家Id", IsNullable = true)] public long? CountryId { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs index f4003cfd..d2b07566 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs @@ -32,103 +32,103 @@ public class InfoClientContact : BaseOrgModel /// /// Desc:职务 /// - [SugarColumn(ColumnDescription = "职务", Length = 50)] + [SugarColumn(ColumnDescription = "职务", Length = 50, IsNullable = true)] public string Job { get; set; } /// /// Desc:通讯地址 /// - [SugarColumn(ColumnDescription = "通讯地址", Length = 100)] + [SugarColumn(ColumnDescription = "通讯地址", Length = 100, IsNullable = true)] public string Address { get; set; } /// /// Desc:邮箱 /// - [SugarColumn(ColumnDescription = "邮箱", Length = 50)] + [SugarColumn(ColumnDescription = "邮箱", Length = 50, IsNullable = true)] public string Email { get; set; } /// /// Desc:手机 /// - [SugarColumn(ColumnDescription = "手机", Length = 50)] + [SugarColumn(ColumnDescription = "手机", Length = 50, IsNullable = true)] public string Mobile { get; set; } /// /// Desc:电话 /// - [SugarColumn(ColumnDescription = "电话", Length = 50)] + [SugarColumn(ColumnDescription = "电话", Length = 50, IsNullable = true)] public string Tel { get; set; } /// /// Desc:传真 /// - [SugarColumn(ColumnDescription = "传真", Length = 50)] + [SugarColumn(ColumnDescription = "传真", Length = 50, IsNullable = true)] public string Fax { get; set; } /// /// Desc:QQ /// - [SugarColumn(ColumnDescription = "QQ", Length = 50)] + [SugarColumn(ColumnDescription = "QQ", Length = 50, IsNullable = true)] public string QQ { get; set; } /// /// Desc:是否为操作 /// - [SugarColumn(ColumnDescription = "是否为操作")] + [SugarColumn(ColumnDescription = "是否为操作",DefaultValue = "0")] public bool? IsOperator { get; set; } = false; /// /// Desc:是否为财务 /// - [SugarColumn(ColumnDescription = "是否为财务")] + [SugarColumn(ColumnDescription = "是否为财务",DefaultValue = "0")] public bool? IsFinancialStaff { get; set; } = false; /// /// Desc:是否为销售 /// - [SugarColumn(ColumnDescription = "是否为销售")] + [SugarColumn(ColumnDescription = "是否为销售",DefaultValue = "0")] public bool? IsSaleMan { get; set; } = false; /// /// Desc:是否为其他 /// - [SugarColumn(ColumnDescription = "是否为其他")] + [SugarColumn(ColumnDescription = "是否为其他",DefaultValue = "0")] public bool? IsOther { get; set; } = false; /// /// Desc:是否保险联系人 /// - [SugarColumn(ColumnDescription = "是否保险联系人")] + [SugarColumn(ColumnDescription = "是否保险联系人",DefaultValue = "0")] public bool? IsInsurance { get; set; } = false; /// /// Desc:是否对账联系人 /// - [SugarColumn(ColumnDescription = "是否对账联系人")] + [SugarColumn(ColumnDescription = "是否对账联系人",DefaultValue = "0")] public bool? IsCheckAccount { get; set; } = false; /// /// 提醒日期1 /// - [SugarColumn(ColumnDescription = "提醒日期1")] + [SugarColumn(ColumnDescription = "提醒日期1", IsNullable = true)] public DateTime Anniversary1 { get; set; } /// /// 提醒日期2 /// - [SugarColumn(ColumnDescription = "提醒日期2")] + [SugarColumn(ColumnDescription = "提醒日期2", IsNullable = true)] public DateTime Anniversary2 { get; set; } /// /// 提醒备注1 /// - [SugarColumn(ColumnDescription = "提醒备注1", Length = 200)] + [SugarColumn(ColumnDescription = "提醒备注1", Length = 200, IsNullable = true)] public string AnniversaryNote1 { get; set; } /// /// 提醒备注2 /// - [SugarColumn(ColumnDescription = "提醒备注2", Length = 200)] + [SugarColumn(ColumnDescription = "提醒备注2", Length = 200, IsNullable = true)] public string AnniversaryNote2 { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContract.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContract.cs index 38979d4b..0aadd3c2 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContract.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContract.cs @@ -23,32 +23,32 @@ public class InfoClientContract : BaseOrgModel /// /// Desc:签订日期 /// - [SugarColumn(ColumnDescription = "签订日期")] + [SugarColumn(ColumnDescription = "签订日期", IsNullable = true)] public DateTime SignDate { get; set; } /// /// Desc:起始日期 /// - [SugarColumn(ColumnDescription = "起始日期")] + [SugarColumn(ColumnDescription = "起始日期", IsNullable = true)] public DateTime StartDate { get; set; } /// /// Desc:截止日期 /// - [SugarColumn(ColumnDescription = "截止日期")] + [SugarColumn(ColumnDescription = "截止日期", IsNullable = true)] public DateTime EndDate { get; set; } /// /// Desc:负责人 /// - [SugarColumn(ColumnDescription = "负责人", Length = 20)] + [SugarColumn(ColumnDescription = "负责人", Length = 20, IsNullable = true)] public string Chief { get; set; } /// /// Desc:签订部门Id /// - [SugarColumn(ColumnDescription = "签订部门Id")] + [SugarColumn(ColumnDescription = "签订部门Id", IsNullable = true)] public long DeptId { get; set; } /// /// Desc:合同名称 /// - [SugarColumn(ColumnDescription = "合同名称", Length = 100)] + [SugarColumn(ColumnDescription = "合同名称", Length = 100, IsNullable = true)] public string ContractName { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientShipper.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientShipper.cs index 9474bafc..6a0e4591 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientShipper.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientShipper.cs @@ -7,7 +7,7 @@ namespace DS.WMS.Core.Info.Entity; /// /// 往来单位-收发货人信息 /// -[SqlSugar.SugarTable("info_client_contact")] +[SqlSugar.SugarTable("info_client_shipper")] public class InfoClientShipper : BaseOrgModel { /// @@ -43,25 +43,25 @@ public class InfoClientShipper : BaseOrgModel /// /// Desc:详细信息 /// - [SugarColumn(ColumnDescription = "详细信息", Length = 600)] + [SugarColumn(ColumnDescription = "详细信息", Length = 600, IsNullable = true)] public string ShortDetail { get; set; } /// /// Desc:联系人 /// - [SugarColumn(ColumnDescription = "联系人", Length = 25)] + [SugarColumn(ColumnDescription = "联系人", Length = 25, IsNullable = true)] public string ATTN { get; set; } /// /// Desc:邮箱 /// - [SugarColumn(ColumnDescription = "邮箱", Length = 50)] + [SugarColumn(ColumnDescription = "邮箱", Length = 50, IsNullable = true)] public string Email { get; set; } /// /// Desc:电话 /// - [SugarColumn(ColumnDescription = "电话", Length = 50)] + [SugarColumn(ColumnDescription = "电话", Length = 50, IsNullable = true)] public string Tel { get; set; } // /// @@ -72,7 +72,7 @@ public class InfoClientShipper : BaseOrgModel /// /// Desc:公司代码 /// - [SugarColumn(ColumnDescription = "公司代码", Length = 50)] + [SugarColumn(ColumnDescription = "公司代码", Length = 50, IsNullable = true)] public string CompanyNo { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs index 0aa68f13..7ae89f29 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs @@ -15,127 +15,128 @@ public class InfoClientTag : BaseOrgModel public long ClientId { get; set; } /// /// Desc:是否特批放单客户 - /// + /// + [SugarColumn(ColumnDescription = "是否特批放单客户", DefaultValue = "0")] public bool? IsSpecialApproval { get; set; } /// /// Desc:是否船公司 /// - [SugarColumn(ColumnDescription = "是否船公司")] + [SugarColumn(ColumnDescription = "是否船公司", DefaultValue = "0")] public bool? IsCarrier { get; set; } = false; /// /// Desc:是否订舱公司 /// - [SugarColumn(ColumnDescription = "是否订舱公司")] + [SugarColumn(ColumnDescription = "是否订舱公司", DefaultValue = "0")] public bool? IsBooking { get; set; } = false; /// /// Desc:是否场站 /// - [SugarColumn(ColumnDescription = "是否场站")] + [SugarColumn(ColumnDescription = "是否场站", DefaultValue = "0")] public bool? IsYard { get; set; } = false; /// /// Desc:是否车队 /// - [SugarColumn(ColumnDescription = "是否车队")] + [SugarColumn(ColumnDescription = "是否车队", DefaultValue = "0")] public bool? IsTruck { get; set; } = false; /// /// Desc:是否委托单位 /// - [SugarColumn(ColumnDescription = "是否委托单位")] + [SugarColumn(ColumnDescription = "是否委托单位", DefaultValue = "0")] public bool? IsController { get; set; } = false; /// /// Desc:是否报关行 /// - [SugarColumn(ColumnDescription = "是否报关行")] + [SugarColumn(ColumnDescription = "是否报关行", DefaultValue = "0")] public bool? IsCustom { get; set; } = false; /// /// Desc:是否代理(国外) /// - [SugarColumn(ColumnDescription = "是否代理(国外)")] + [SugarColumn(ColumnDescription = "是否代理(国外)", DefaultValue = "0")] public bool? IsAgent { get; set; } = false; /// /// Desc:是否代理(国内) /// - [SugarColumn(ColumnDescription = "是否代理(国内)")] + [SugarColumn(ColumnDescription = "是否代理(国内)", DefaultValue = "0")] public bool? IsAgentCn { get; set; } = false; /// /// Desc:是否快递公司 /// - [SugarColumn(ColumnDescription = "是否快递公司")] + [SugarColumn(ColumnDescription = "是否快递公司", DefaultValue = "0")] public bool? IsExpress { get; set; } = false; /// /// Desc:是否航空公司 /// - [SugarColumn(ColumnDescription = "是否航空公司")] + [SugarColumn(ColumnDescription = "是否航空公司", DefaultValue = "0")] public bool? IsAirLines { get; set; } = false; /// /// Desc:是否发货人 /// - [SugarColumn(ColumnDescription = "是否发货人")] + [SugarColumn(ColumnDescription = "是否发货人", DefaultValue = "0")] public bool? IsShipper { get; set; } = false; /// /// Desc:是否收货人 /// - [SugarColumn(ColumnDescription = "是否收货人")] + [SugarColumn(ColumnDescription = "是否收货人", DefaultValue = "0")] public bool? IsConsignee { get; set; } = false; /// /// Desc:是否通知人 /// - [SugarColumn(ColumnDescription = "是否通知人")] + [SugarColumn(ColumnDescription = "是否通知人", DefaultValue = "0")] public bool? IsNotifyParty { get; set; } = false; /// /// Desc:是否仓库 /// - [SugarColumn(ColumnDescription = "是否仓库")] + [SugarColumn(ColumnDescription = "是否仓库", DefaultValue = "0")] public bool? IsWareHouse { get; set; } /// /// Desc:是否码头 /// - [SugarColumn(ColumnDescription = "是否码头")] + [SugarColumn(ColumnDescription = "是否码头", DefaultValue = "0")] public bool? IsWharf { get; set; } = false; /// /// Desc:是否保险公司 /// - [SugarColumn(ColumnDescription = "是否保险公司")] + [SugarColumn(ColumnDescription = "是否保险公司", DefaultValue = "0")] public bool? IsInsurer { get; set; } = false; /// /// Desc:是否租箱公司 /// - [SugarColumn(ColumnDescription = "是否租箱公司")] + [SugarColumn(ColumnDescription = "是否租箱公司", DefaultValue = "0")] public bool? IsLeasing { get; set; } = false; /// /// Desc:是否贸易代理 /// - [SugarColumn(ColumnDescription = "是否贸易代理")] + [SugarColumn(ColumnDescription = "是否贸易代理", DefaultValue = "0")] public bool? IsTradingAgency { get; set; } = false; /// /// Desc:是否其他 /// - [SugarColumn(ColumnDescription = "是否其他")] + [SugarColumn(ColumnDescription = "是否其他", DefaultValue = "0")] public bool? IsOther { get; set; } = false; /// /// Desc:其他类型 /// - [SugarColumn(ColumnDescription = "其他类型", Length = 100)] + [SugarColumn(ColumnDescription = "其他类型", Length = 100,IsNullable = true)] public string Others { get; set; } diff --git a/ds-wms-service/DS.WMS.Test/SaasTest.cs b/ds-wms-service/DS.WMS.Test/SaasTest.cs index ec1a0c67..d02af8da 100644 --- a/ds-wms-service/DS.WMS.Test/SaasTest.cs +++ b/ds-wms-service/DS.WMS.Test/SaasTest.cs @@ -27,13 +27,13 @@ public class SaasTest { Type[] types= Assembly .LoadFrom("DS.WMS.Core.dll")//如果 .dll报错,可以换成 xxx.exe 有些生成的是exe - .GetTypes().Where(it=>it.FullName.Contains("DS.WMS.Core.Code.Entity."))//命名空间过滤,当然你也可以写其他条件过滤 + .GetTypes().Where(it=>it.FullName.Contains("DS.WMS.Core.Code.Entity.")||it.FullName.Contains("DS.WMS.Core.Info.Entity."))//命名空间过滤,当然你也可以写其他条件过滤 .ToArray(); var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - var temp = tenantDb.CodeFirst.GetDifferenceTables(types); + // var temp = tenantDb.CodeFirst.GetDifferenceTables(types); // var diffString= tenantDb.CodeFirst.GetDifferenceTables(types).ToDiffString(); - // StaticConfig.CodeFirst_MySqlCollate="utf8mb4_0900_ai_ci";//较高版本支持 - // tenantDb.CodeFirst.InitTables(types); + StaticConfig.CodeFirst_MySqlCollate="utf8mb4_0900_ai_ci";//较高版本支持 + tenantDb.CodeFirst.InitTables(types); // //初始化数库 // tenantDb.DbMaintenance.CreateDatabase(); //