Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceProjectBaseInfo.cs

@@ -20,32 +20,37 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, Length = 64)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务项代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项代码", Length = 100, IsNullable = true)]
         public string SERVICE_PROJECT_CODE { get; set; }
 
         /// <summary>
         /// 服务项名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项名称", Length = 150, IsNullable = true)]
         public string SERVICE_PROJECT_NAME { get; set; }
 
         /// <summary>
         /// 显示顺序号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "显示顺序号", IsNullable = true)]
         public int SORT_NO { get; set; }
 
         /// <summary>
         /// 是否启用
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否启用", IsNullable = false, DefaultValue = "0")]
         public int IS_ENABLE { get; set; }
 
         /// <summary>
         /// 服务项目说明
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项目说明", Length = 500, IsNullable = true)]
         public string SERVICE_PROJECT_NOTE { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowActivitiesInfo.cs

@@ -18,17 +18,19 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, Length = 64)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 状态主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态主键", Length = 64, IsNullable = true)]
         public string STATUS_SKU_ID { get; set; }
 
         /// <summary>
         /// 状态显示名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态显示名称", Length = 20, IsNullable = true)]
         public string SHOW_NAME { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowActivitiesRelation.cs

@@ -17,37 +17,43 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, Length = 64)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务流程主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程主键", Length = 64, IsNullable = true)]
         public string SERVICE_WORKFLOW_ID { get; set; }
 
         /// <summary>
         /// 服务项目主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项目主键", Length = 64, IsNullable = true)]
         public string SERVICE_ACTIVITIES_ID { get; set; }
 
         /// <summary>
         /// 显示顺序号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "显示顺序号", IsNullable = true)]
         public int SORT_NO { get; set; }
 
         /// <summary>
         /// 是否包含子状态 1-包含 0-不包含
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否包含子状态 1-包含 0-不包含", IsNullable = false,DefaultValue = "0")]
         public int IS_CONTAINS_SUB { get; set; }
 
         /// <summary>
         /// 值类型 STRING-字符 DATETIME-日期
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "值类型 STRING-字符 DATETIME-日期", Length = 64, IsNullable = true)]
         public string VAL_TYPE { get; set; }
 
         /// <summary>
         /// 流程版本号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "流程版本号", Length = 40, IsNullable = true)]
         public string WF_VERSION { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowActivitiesSubRelation.cs

@@ -17,37 +17,43 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务流程主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程主键", Length = 64, IsNullable = true)]
         public string SERVICE_WORKFLOW_ID { get; set; }
 
         /// <summary>
         /// 服务项目主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项目主键", Length = 64, IsNullable = true)]
         public string SERVICE_ACTIVITIES_ID { get; set; }
 
         /// <summary>
         /// 子服务活动主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "子服务活动主键", Length = 64, IsNullable = true)]
         public string SUB_SERVICE_ACTIVITIES_ID { get; set; }
 
         /// <summary>
         /// 显示顺序号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "显示顺序号", IsNullable = true)]
         public int SORT_NO { get; set; }
 
         /// <summary>
         /// 值类型 STRING-字符 DATETIME-日期
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "值类型 STRING-字符 DATETIME-日期", Length = 64, IsNullable = true)]
         public string VAL_TYPE { get; set; }
 
         /// <summary>
         /// 流程版本号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "流程版本号", Length = 40, IsNullable = true)]
         public string WF_VERSION { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowActivitiesTriggerRelation.cs

@@ -17,27 +17,31 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务流程主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程主键", Length = 64, IsNullable = true)]
         public string SERVICE_WORKFLOW_ID { get; set; }
 
         /// <summary>
         /// 服务项目主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项目主键", Length = 64, IsNullable = true)]
         public string SERVICE_ACTIVITIES_ID { get; set; }
 
         /// <summary>
         /// 触发器主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "触发器主键", Length = 64, IsNullable = true)]
         public string STATUS_TRIGGER_ID { get; set; }
 
         /// <summary>
         /// 流程版本号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "流程版本号", Length = 40, IsNullable = true)]
         public string WF_VERSION { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowBaseInfo.cs

@@ -18,72 +18,85 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务流程代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程代码", Length = 100, IsNullable = true)]
         public string SERVICE_WORKFLOW_CODE { get; set; }
 
         /// <summary>
         /// 服务流程名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程名称", Length = 150, IsNullable = true)]
         public string SERVICE_WORKFLOW_NAME { get; set; }
 
         /// <summary>
         /// 服务流程说明
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程说明", Length = 200, IsNullable = true)]
         public string SERVICE_WORKFLOW_NOTE { get; set; }
 
         /// <summary>
         /// 发布版本
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布版本", Length = 40, IsNullable = true)]
         public string RELEASE_VERSION { get; set; }
 
         /// <summary>
         /// 当前编辑版本,发布后版本被清除
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "当前编辑版本,发布后版本被清除", Length = 40, IsNullable = true)]
         public string DEVELOP_VERSION { get; set; }
 
         /// <summary>
         /// 是否启用 1-启用 0-未启用
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "当前编辑版本,发布后版本被清除", IsNullable = false,DefaultValue = "0")]
         public int IS_ENABLE { get; set; } = 0;
 
         /// <summary>
         /// 所属租户ID
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "所属租户ID", IsNullable = true)]
         public long BELONG_TENANT_ID { get; set; }
 
         /// <summary>
         /// 所属租户名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "所属租户名称", IsNullable = true)]
         public string BELONG_TENANT_NAME { get; set; }
 
         /// <summary>
         /// 状态数量
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态数量", IsNullable = true)]
         public int STATUS_NUM { get; set; }
 
         /// <summary>
         /// 发布日期
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布日期", IsNullable = true)]
         public Nullable<DateTime> PUBLISH_DATE { get; set; }
 
         /// <summary>
         /// 发布人
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布人", IsNullable = true)]
         public long PUBLISH_ER { get; set; }
 
         /// <summary>
         /// 发布人名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布人名称", Length = 64, IsNullable = true)]
         public string PUBLISH_NAME { get; set; }
 
         /// <summary>
         /// 是否锁止 1-锁止（不允许修改，只能取消锁止后才能修改） 0-未锁止
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否锁止 1-锁止（不允许修改，只能取消锁止后才能修改） 0-未锁止", IsNullable = true)]
 
         public int IS_LOCK { get; set; } = 0;
 

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowProjectRelation.cs

@@ -17,22 +17,25 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务流程主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程主键", Length = 64, IsNullable = true)]
         public string SERVICE_WORKFLOW_ID { get; set; }
 
         /// <summary>
         /// 服务项目主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项目主键", Length = 64, IsNullable = true)]
         public string SERVICE_PROJECT_ID { get; set; }
 
         /// <summary>
         /// 流程版本号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "流程版本号", Length = 40, IsNullable = true)]
         public string WF_VERSION { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowReleaseInfo.cs

@@ -17,52 +17,61 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务流程主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程主键", Length = 64, IsNullable = true)]
         public string SERVICE_WF_ID { get; set; }
 
         /// <summary>
         /// 发布版本
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布版本", Length = 40, IsNullable = true)]
         public string RELEASE_VERSION { get; set; }
 
         /// <summary>
         /// 发布日期
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布日期", IsNullable = true)]
         public DateTime PUBLISH_DATE { get; set; }
 
         /// <summary>
         /// 发布人
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布人", IsNullable = true)]
         public long PUBLISH_ER { get; set; }
 
         /// <summary>
         /// 发布人名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布人名称", Length = 64, IsNullable = true)]
         public string PUBLISH_NAME { get; set; }
 
         /// <summary>
         /// 是否作废 1-已作废 0-未作废（默认未作废）
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布人", IsNullable = false,DefaultValue = "0")]
         public int IS_DEL { get; set; }
 
         /// <summary>
         /// 上一版本主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "上一版本主键", Length = 64, IsNullable = true)]
         public string LAST_PK_ID { get; set; }
 
         /// <summary>
         /// 累计计数
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "累计计数", IsNullable = true)]
         public int TOTAL_NUM { get; set; }
 
         /// <summary>
         /// 报文MD5
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "报文MD5", Length = 64, IsNullable = true)]
         public string MSG_MD5 { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowRunActivitiesInfo.cs

@@ -18,92 +18,109 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 运行主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "运行主键", Length = 64, IsNullable = true)]
         public string RUN_ID { get; set; }
 
         /// <summary>
         /// 执行顺序号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "执行顺序号", IsNullable = true)]
         public int EXEC_SORT_NO { get; set; }
 
         /// <summary>
         /// 是否起始 1-是 0-否
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否起始 1-是 0-否", IsNullable = false,DefaultValue = "0")]
         public int IS_START { get; set; }
 
         /// <summary>
         /// 是否结束 1-是 0-否
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否结束 1-是 0-否", IsNullable = false, DefaultValue = "0")]
         public int IS_END { get; set; }
 
         /// <summary>
         /// 活动主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动主键", Length = 64, IsNullable = true)]
         public string ACT_ID { get; set; }
 
         /// <summary>
         /// 活动值
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动值", Length = 100, IsNullable = true)]
         public string ACT_VAL { get; set; }
 
         /// <summary>
         /// 活动发生时间
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动值", IsNullable = true)]
         public Nullable<DateTime> ACT_DATE { get; set; }
 
         /// <summary>
         /// 活动备注
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动备注", Length = 100, IsNullable = true)]
         public string ACT_REMARK { get; set; }
 
         /// <summary>
         /// 下一个活动ID
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "下一个活动ID", Length = 64, IsNullable = true)]
         public string NEXT_ACT_ID { get; set; }
 
         /// <summary>
         /// 是否已产生 1-已产生 0-未产生
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否已产生 1-已产生 0-未产生", IsNullable = false, DefaultValue = "0")]
         public int IS_YIELD { get; set; }
 
         /// <summary>
         /// 状态主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态主键", Length = 64, IsNullable = true)]
         public string STATUS_SKU_ID { get; set; }
 
         /// <summary>
         /// 状态代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态代码", Length = 100, IsNullable = true)]
         public string STATUS_SKU_CODE { get; set; }
 
         /// <summary>
         /// 状态显示名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态显示名称", Length = 20, IsNullable = true)]
         public string SHOW_NAME { get; set; }
 
         /// <summary>
         /// 来源类型 AUTO-自动 MANUAL-人工
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "来源类型 AUTO-自动 MANUAL-人工", Length = 20, IsNullable = true)]
         public string SOURCE_TYPE { get; set; }
 
         /// <summary>
         /// 父状态主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "父状态主键", Length = 64, IsNullable = true)]
         public string PARENT_ID { get; set;}
 
         /// <summary>
         /// 是否子状态 1-是子状态 0-不是子状态
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否子状态 1-是子状态 0-不是子状态", IsNullable = false, DefaultValue = "0")]
         public int IS_SUB { get; set; }
 
         /// <summary>
         /// 是否子状态满足一个即可 1-其中一个子状态出现即主状态触发 0-不是
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否子状态满足一个即可 1-其中一个子状态出现即主状态触发 0-不是", IsNullable = false, DefaultValue = "0")]
         public int IS_SUB_JUST { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowRunInfo.cs

@@ -18,82 +18,97 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 服务流程主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程主键", Length = 64, IsNullable = true)]
         public string SERVICE_WF_ID { get; set; }
 
         /// <summary>
         /// 业务系统代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "业务系统代码", Length = 64, IsNullable = true)]
         public string BUSI_SYSTEM_CODE { get; set; }
 
         /// <summary>
         /// 业务主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "业务主键", Length = 64, IsNullable = true)]
         public string BUSI_ID { get; set; }
 
         /// <summary>
         /// 提单号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "提单号", Length = 64, IsNullable = true)]
         public string MBL_NO { get; set; }
 
         /// <summary>
         /// 船名航次
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船名航次", Length = 100, IsNullable = true)]
         public string VESSEL_VOYNO { get; set; }
 
         /// <summary>
         /// 订舱编号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱编号", Length = 64, IsNullable = true)]
         public string ORDER_NO { get; set; }
 
         /// <summary>
         /// 发布版本
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布版本", Length = 40, IsNullable = true)]
         public string RELEASE_VERSION { get; set; }
 
         /// <summary>
         /// 状态
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态", Length = 20, IsNullable = true)]
         public string STATUS { get; set; }
 
         /// <summary>
         /// 服务项主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项主键", Length = 64, IsNullable = true)]
         public string SERVICE_PROJECT_ID { get; set; }
 
         /// <summary>
         /// 服务项代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项代码", Length = 100, IsNullable = true)]
         public string SERVICE_PROJECT_CODE { get; set; }
 
         /// <summary>
         /// 服务项名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项名称", Length = 150, IsNullable = true)]
         public string SERVICE_PROJECT_NAME { get; set; }
 
         /// <summary>
         /// 活动数量
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动数量", IsNullable = true)]
         public int ACTIVITIES_NUM { get; set; }
 
         /// <summary>
         /// 最后活动名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "最后活动名称", Length = 100, IsNullable = true)]
         public string LST_ACT_NAME { get; set; }
 
         /// <summary>
         /// 是否已产生 1-已产生 0-未产生
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否已产生 1-已产生 0-未产生", IsNullable = false, DefaultValue = "0")]
         public int IS_YIELD { get; set; }
 
         /// <summary>
         /// 项目发生时间
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "项目发生时间", IsNullable = true)]
         public Nullable<DateTime> ACT_DATE { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowRunLogInfo.cs

@@ -18,176 +18,210 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 批次号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "批次号", Length = 64, IsNullable = true)]
         public string BATCH_NO { get; set; }
 
         /// <summary>
         /// 操作类型 PUSH_PROJECT 推送服务；CANCEL_PROJECT 取消服务；PUSH_STATUS 推送状态；CANCEL_STATUS 取消状态
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "操作类型 PUSH_PROJECT 推送服务；CANCEL_PROJECT 取消服务；PUSH_STATUS 推送状态；CANCEL_STATUS 取消状态", Length = 20, IsNullable = true)]
         public string OPER_TYPE { get; set; }
 
         /// <summary>
         /// 服务流程运行主表ID
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程运行主表ID", Length = 64, IsNullable = true)]
         public string RUN_ID { get; set; }
 
         /// <summary>
         /// 服务流程运行明细ID
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程运行明细ID", Length = 64, IsNullable = true)]
         public string RUN_DETAIL_ID { get; set; }
 
         /// <summary>
         /// 业务系统代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "业务系统代码", Length = 64, IsNullable = true)]
         public string BUSI_SYSTEM_CODE { get; set; }
 
         /// <summary>
         /// 请求来源
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "请求来源", Length = 20, IsNullable = true)]
         public string SOURCE_TYPE { get; set; }
 
         /// <summary>
         /// 业务主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "业务主键", Length = 64, IsNullable = true)]
         public string BUSI_ID { get; set; }
 
         /// <summary>
         /// 提单号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "提单号", Length = 64, IsNullable = true)]
         public string MBL_NO { get; set; }
         /// <summary>
         /// 船名航次
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船名航次", Length = 100, IsNullable = true)]
         public string VESSEL_VOYNO { get; set; }
 
         /// <summary>
         /// 订舱编号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱编号", Length = 64, IsNullable = true)]
         public string ORDER_NO { get; set; }
 
         /// <summary>
         /// 服务流程主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务流程主键", Length = 64, IsNullable = true)]
         public string SERVICE_WF_ID { get; set; }
 
         /// <summary>
         /// 发布版本
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发布版本", Length = 40, IsNullable = true)]
         public string RELEASE_VERSION { get; set; }
 
         /// <summary>
         /// 服务项代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项代码", Length = 100, IsNullable = true)]
         public string SERVICE_PROJECT_CODE { get; set; }
 
         /// <summary>
         /// 服务项名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务项名称", Length = 150, IsNullable = true)]
         public string SERVICE_PROJECT_NAME { get; set; }
 
         /// <summary>
         /// 是否起始 1-是 0-否
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否起始 1-是 0-否", IsNullable = false, DefaultValue = "0")]
         public int IS_START { get; set; }
 
         /// <summary>
         /// 是否结束 1-是 0-否
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否结束 1-是 0-否", IsNullable = true)]
         public int IS_END { get; set; }
 
         /// <summary>
         /// 活动主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动主键", Length = 64, IsNullable = true)]
         public string ACT_ID { get; set; }
 
         /// <summary>
         /// 活动值
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动值", Length = 100, IsNullable = true)]
         public string ACT_VAL { get; set; }
 
         /// <summary>
         /// 活动发生时间
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动发生时间", IsNullable = true)]
         public Nullable<DateTime> ACT_DATE { get; set; }
 
         /// <summary>
         /// 活动备注
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动备注", Length = 100, IsNullable = true)]
         public string ACT_REMARK { get; set; }
 
         /// <summary>
         /// 下一个活动ID
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "下一个活动ID", Length = 64, IsNullable = true)]
         public string NEXT_ACT_ID { get; set; }
 
         /// <summary>
         /// 是否已产生 1-已产生 0-未产生
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "活动发生时间", IsNullable = false,DefaultValue = "0")]
         public int IS_YIELD { get; set; }
 
         /// <summary>
         /// 状态主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态主键", Length = 64, IsNullable = true)]
         public string STATUS_SKU_ID { get; set; }
 
         /// <summary>
         /// 状态代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态代码", Length = 64, IsNullable = true)]
         public string STATUS_SKU_CODE { get; set; }
 
         /// <summary>
         /// 状态显示名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态显示名称", Length = 20, IsNullable = true)]
         public string SHOW_NAME { get; set; }
 
         /// <summary>
         /// 是否子状态 1-是子状态 0-不是子状态
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否子状态 1-是子状态 0-不是子状态", IsNullable = false,DefaultValue = "0")]
         public int IS_SUB { get; set; }
 
         /// <summary>
         /// 是否子状态满足一个即可 1-其中一个子状态出现即主状态触发 0-不是
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否子状态满足一个即可 1-其中一个子状态出现即主状态触发 0-不是", IsNullable = false,DefaultValue = "0")]
         public int IS_SUB_JUST { get; set; }
 
         /// <summary>
         /// 创建时间
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "创建时间", IsNullable = true)]
         public DateTime CreatedTime { get; set; }
 
         /// <summary>
         /// 创建人ID
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "创建人ID", IsNullable = true)]
         public long CreatedUserId { get; set; }
 
         /// <summary>
         /// 创建人名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "创建人名称", Length = 50, IsNullable = true)]
         public string CreatedUserName { get; set; }
 
         /// <summary>
         /// 执行结果代码 SUCC-成功 FAIL-失败 EXCEPT-异常
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "执行结果代码 SUCC-成功 FAIL-失败 EXCEPT-异常", Length = 20, IsNullable = true)]
         public string EXEC_RESULT { get; set; }
 
         /// <summary>
         /// 执行结果说明
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "执行结果说明", Length = 200, IsNullable = true)]
         public string EXEC_NOTE { get; set; }
 
         /// <summary>
         /// 租户id
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "租户id", IsNullable = true)]
         public long? TenantId { get; set; }
 
         /// <summary>
         /// 租户名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "租户名称", IsNullable = true)]
         public string TenantName { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/StatusSkuBaseInfo.cs

@@ -18,37 +18,43 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 状态代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态代码", Length = 100, IsNullable = true)]
         public string STATUS_SKU_CODE { get; set; }
 
         /// <summary>
         /// 状态名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态名称", Length = 150, IsNullable = true)]
         public string STATUS_SKU_NAME { get; set; }
 
         /// <summary>
         /// 显示颜色(背景色)
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "显示颜色(背景色)", Length = 20, IsNullable = true)]
         public string BACKGROUND_COLOR { get; set; }
 
         /// <summary>
         /// 显示顺序号
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "显示顺序号", IsNullable = true)]
         public int SORT_NO { get; set; }
 
         /// <summary>
         /// 是否启用
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否启用", IsNullable = false, DefaultValue = "0")]
         public int IS_ENABLE { get; set; }
 
         /// <summary>
         /// 状态说明
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否启用", Length = 500, IsNullable = true)]
         public string STATUS_SKU_NOTE { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/StatusTriggerBaseInfo.cs

@@ -18,27 +18,31 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 触发器代码
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "触发器代码", Length = 100, IsNullable = true)]
         public string STATUS_TRIGGER_CODE { get; set; }
 
         /// <summary>
         /// 触发器名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "触发器名称", Length = 150, IsNullable = true)]
         public string STATUS_TRIGGER_NAME { get; set; }
 
         /// <summary>
         /// 触发器说明
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "触发器说明", Length = 500, IsNullable = true)]
         public string STATUS_TRIGGER_NOTE { get; set; }
 
         /// <summary>
         /// 是否启用
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "触发器说明",IsNullable = false, DefaultValue = "0")]
         public int IS_ENABLE { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/StatusTriggerConditionInfo.cs

@@ -18,52 +18,61 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 父主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "父主键", Length = 64, IsNullable = true)]
         public string P_ID { get; set; }
 
         /// <summary>
         /// 服务活动主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务活动主键", Length = 64, IsNullable = true)]
         public string SERVICE_ACTIVITIES_ID { get; set; }
 
         /// <summary>
         /// 状态显示名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态显示名称", Length = 20, IsNullable = true)]
         public string SHOW_NAME { get; set; }
 
         /// <summary>
         /// 操作类型
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "操作类型", Length = 40, IsNullable = true)]
         public string OPER_TYPE { get; set; }
 
         /// <summary>
         /// 操作类型名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "操作类型名称", Length = 50, IsNullable = true)]
         public string OPER_TYPE_NAME { get; set; }
 
         /// <summary>
         /// 操作类型判断值
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "操作类型判断值", Length = 200, IsNullable = true)]
         public string OPER_TYPE_VAL { get; set; }
 
         /// <summary>
         /// 随即触发类型
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "随即触发类型", Length = 40, IsNullable = true)]
         public string NEXT_ACTION_TYPE { get; set; }
 
         /// <summary>
         /// 随即触发名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "随即触发名称", Length = 50, IsNullable = true)]
         public string NEXT_ACTION_TYPE_NAME { get; set; }
 
         /// <summary>
         /// LIQUID表达式JSON
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "随即触发名称", ColumnDataType = "text", IsNullable = true)]
         public string LIQUID_EXPRESSION { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/StatusTriggerConditionNextActInfo.cs

@@ -18,27 +18,31 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        [SugarColumn(ColumnDescription = "主键", Length = 64, IsPrimaryKey = true)]
         public string PK_ID { get; set; }
 
         /// <summary>
         /// 触发器主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "触发器主键", Length = 64, IsNullable = true)]
         public string TRIGGER_ID { get; set; }
 
         /// <summary>
         /// 条件ID
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "条件ID", Length = 64, IsNullable = true)]
         public string CONDITION_ID { get; set; }
 
         /// <summary>
         /// 服务活动主键
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "服务活动主键", Length = 64, IsNullable = true)]
         public string SERVICE_ACTIVITIES_ID { get; set; }
 
         /// <summary>
         /// 状态显示名称
         /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态显示名称", Length = 20, IsNullable = true)]
         public string SHOW_NAME { get; set; }
     }
 }