fix: ApprovalFlow.Code字段扩容+缩短种子Code前缀+S0实体微调

server/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -11,9 +11,9 @@
     <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
     <Copyright>Admin.NET</Copyright>
     <Description>Admin.NET ͨ��Ȩ�޿���ƽ̨</Description>
-    <AssemblyVersion>1.0.226</AssemblyVersion>
-    <FileVersion>1.0.226</FileVersion>
-    <Version>1.0.226</Version>
+    <AssemblyVersion>1.0.227</AssemblyVersion>
+    <FileVersion>1.0.227</FileVersion>
+    <Version>1.0.227</Version>
   </PropertyGroup>
 
   <ItemGroup>

server/Plugins/Admin.NET.Plugin.AiDOP/Entity/S0/Manufacturing/AdoS0LineSkillDetail.cs

@@ -6,19 +6,19 @@ namespace Admin.NET.Plugin.AiDOP.Entity.S0.Manufacturing;
 [SugarTable("LineSkillDetail", "产线岗位技能明细")]
 public class AdoS0LineSkillDetail : ITenantIdFilter
 {
-    [SugarColumn(ColumnName = "id", ColumnDescription = "明细主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
+    [SugarColumn(ColumnName = "RecID", ColumnDescription = "明细主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
     public long Id { get; set; }
 
-    [SugarColumn(ColumnName = "line_skill_master_id", ColumnDescription = "产线岗位主表ID", ColumnDataType = "bigint")]
+    [SugarColumn(ColumnName = "LineSkillRecID", ColumnDescription = "产线岗位主表ID", ColumnDataType = "bigint")]
     public long LineSkillMasterId { get; set; }
 
-    [SugarColumn(ColumnName = "person_skill_id", ColumnDescription = "人员技能主数据ID", ColumnDataType = "bigint")]
+    [SugarColumn(ColumnName = "PersonSkillId", ColumnDescription = "人员技能主数据ID", ColumnDataType = "bigint")]
     public long PersonSkillId { get; set; }
 
     [SugarColumn(ColumnName = "required_level", ColumnDescription = "要求等级", Length = 50, IsNullable = true)]
     public string? RequiredLevel { get; set; }
 
-    [SugarColumn(ColumnName = "effective_date", ColumnDescription = "生效日期", IsNullable = true)]
+    [SugarColumn(ColumnName = "StartDate", ColumnDescription = "生效日期", IsNullable = true)]
     public DateTime? EffectiveDate { get; set; }
 
     [SugarColumn(ColumnName = "remark", ColumnDescription = "备注", Length = 500, IsNullable = true)]

server/Plugins/Admin.NET.Plugin.AiDOP/Entity/S0/Manufacturing/AdoS0ProdLineDetail.cs

@@ -49,7 +49,7 @@ public class AdoS0ProdLineDetail : ITenantIdFilter
     public decimal StandardStaffCount { get; set; }
 
     [SugarColumn(ColumnName = "Start", ColumnDescription = "起始标记/顺序", IsNullable = true)]
-    public int? Start { get; set; }
+    public long? Start { get; set; }
 
     [SugarColumn(ColumnName = "IsActive", ColumnDescription = "是否启用", ColumnDataType = "boolean")]
     public bool IsActive { get; set; } = true;

server/Plugins/Admin.NET.Plugin.AiDOP/Entity/S0/Manufacturing/AdoS0ProductStructure.cs

@@ -4,7 +4,6 @@ namespace Admin.NET.Plugin.AiDOP.Entity.S0.Manufacturing;
 /// 标准 BOM 行维护（复刻 ProductStructureMaster，路线 A）。
 /// 标 IgnoreTable 避免框架层 CodeFirst 介入 ProductStructureMaster legacy 表 schema（历史 NULL 数据触发 ALTER NOT NULL 失败）。
 /// </summary>
-[IgnoreTable]
 [SugarTable("ProductStructureMaster", "标准BOM行维护（复刻 ProductStructureMaster）")]
 [SugarIndex("ix_ProductStructureMaster_factory_parent", nameof(CompanyRefId), OrderByType.Asc, nameof(FactoryRefId), OrderByType.Asc, nameof(ParentMaterialId), OrderByType.Asc)]
 public class AdoS0ProductStructureMaster : ITenantIdFilter

server/Plugins/Admin.NET.Plugin.AiDOP/Entity/S0/Manufacturing/AdoS0StdOpMaster.cs

@@ -7,7 +7,7 @@ namespace Admin.NET.Plugin.AiDOP.Entity.S0.Manufacturing;
 [SugarIndex("uk_StdOpMaster_scope_name", nameof(CompanyRefId), OrderByType.Asc, nameof(FactoryRefId), OrderByType.Asc, nameof(StdOp), OrderByType.Asc, IsUnique = true)]
 public class AdoS0StdOpMaster : ITenantIdFilter
 {
-    [SugarColumn(ColumnName = "id", ColumnDescription = "标准工序主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
+    [SugarColumn(ColumnName = "RecID", ColumnDescription = "标准工序主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
     public long Id { get; set; }
 
     [SugarColumn(ColumnName = "company_ref_id", ColumnDescription = "关联公司 ID", ColumnDataType = "bigint")]
@@ -19,25 +19,25 @@ public class AdoS0StdOpMaster : ITenantIdFilter
     [SugarColumn(ColumnName = "domain", ColumnDescription = "工厂域编码", Length = 50)]
     public string Domain { get; set; } = string.Empty;
 
-    [SugarColumn(ColumnName = "std_op", ColumnDescription = "标准工序名称", Length = 100)]
+    [SugarColumn(ColumnName = "Descr", ColumnDescription = "标准工序名称", Length = 100)]
     public string StdOp { get; set; } = string.Empty;
 
-    [SugarColumn(ColumnName = "std_op_code", ColumnDescription = "标准工序编码", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "StdOp", ColumnDescription = "标准工序编码", Length = 100, IsNullable = true)]
     public string? StdOpCode { get; set; }
 
-    [SugarColumn(ColumnName = "milestone_op", ColumnDescription = "是否关键工序", Length = 20, IsNullable = true)]
+    [SugarColumn(ColumnName = "MilestoneOp", ColumnDescription = "是否关键工序", Length = 20, IsNullable = true)]
     public string? MilestoneOp { get; set; }
 
-    [SugarColumn(ColumnName = "create_user", ColumnDescription = "创建人", Length = 64, IsNullable = true)]
+    [SugarColumn(ColumnName = "CreateUser", ColumnDescription = "创建人", Length = 64, IsNullable = true)]
     public string? CreateUser { get; set; }
 
-    [SugarColumn(ColumnName = "create_time", ColumnDescription = "创建时间", IsNullable = true)]
+    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间", IsNullable = true)]
     public DateTime? CreateTime { get; set; }
 
-    [SugarColumn(ColumnName = "update_user", ColumnDescription = "更新人", Length = 64, IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateUser", ColumnDescription = "更新人", Length = 64, IsNullable = true)]
     public string? UpdateUser { get; set; }
 
-    [SugarColumn(ColumnName = "update_time", ColumnDescription = "更新时间", IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateTime", ColumnDescription = "更新时间", IsNullable = true)]
     public DateTime? UpdateTime { get; set; }
 
     [SugarColumn(ColumnName = "tenant_id", IsNullable = true)]

server/Plugins/Admin.NET.Plugin.AiDOP/Entity/S0/Warehouse/AdoS0LocationMaster.cs

@@ -7,7 +7,7 @@ namespace Admin.NET.Plugin.AiDOP.Entity.S0.Warehouse;
 [SugarIndex("uk_LocationMaster_domain_location", nameof(DomainCode), OrderByType.Asc, nameof(Location), OrderByType.Asc, IsUnique = true)]
 public class AdoS0LocationMaster : ITenantIdFilter
 {
-    [SugarColumn(ColumnName = "rec_id", ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
+    [SugarColumn(ColumnName = "RecID", ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
     public long Id { get; set; }
 
     [SugarColumn(ColumnName = "company_ref_id", ColumnDescription = "关联公司 ID", ColumnDataType = "bigint")]
@@ -16,7 +16,7 @@ public class AdoS0LocationMaster : ITenantIdFilter
     [SugarColumn(ColumnName = "factory_ref_id", ColumnDescription = "关联工厂 ID", ColumnDataType = "bigint")]
     public long FactoryRefId { get; set; }
 
-    [SugarColumn(ColumnName = "domain_code", ColumnDescription = "工厂域编码", Length = 50)]
+    [SugarColumn(ColumnName = "Domain", ColumnDescription = "工厂域编码", Length = 50)]
     public string DomainCode { get; set; } = string.Empty;
 
     [SugarColumn(ColumnName = "location", ColumnDescription = "库位编码", Length = 100)]
@@ -31,22 +31,22 @@ public class AdoS0LocationMaster : ITenantIdFilter
     [SugarColumn(ColumnName = "typed", ColumnDescription = "库位类型", Length = 50, IsNullable = true)]
     public string? Typed { get; set; }
 
-    [SugarColumn(ColumnName = "physical_address", ColumnDescription = "物理地址", Length = 500, IsNullable = true)]
+    [SugarColumn(ColumnName = "PhysicalAddress", ColumnDescription = "物理地址", Length = 500, IsNullable = true)]
     public string? PhysicalAddress { get; set; }
 
-    [SugarColumn(ColumnName = "is_active", ColumnDescription = "是否启用", ColumnDataType = "boolean")]
+    [SugarColumn(ColumnName = "IsActive", ColumnDescription = "是否启用", ColumnDataType = "boolean")]
     public bool IsActive { get; set; } = true;
 
-    [SugarColumn(ColumnName = "create_user", ColumnDescription = "创建人", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "CreateUser", ColumnDescription = "创建人", Length = 100, IsNullable = true)]
     public string? CreateUser { get; set; }
 
-    [SugarColumn(ColumnName = "create_time", ColumnDescription = "创建时间")]
+    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间")]
     public DateTime CreateTime { get; set; } = DateTime.Now;
 
-    [SugarColumn(ColumnName = "update_user", ColumnDescription = "更新人", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateUser", ColumnDescription = "更新人", Length = 100, IsNullable = true)]
     public string? UpdateUser { get; set; }
 
-    [SugarColumn(ColumnName = "update_time", ColumnDescription = "更新时间", IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateTime", ColumnDescription = "更新时间", IsNullable = true)]
     public DateTime? UpdateTime { get; set; }
 
     [SugarColumn(ColumnName = "tenant_id", IsNullable = true)]

server/Plugins/Admin.NET.Plugin.AiDOP/Infrastructure/AidopImprovementApprovalSeed.cs

@@ -71,7 +71,7 @@ public static class AidopImprovementApprovalSeed
             var flow = new ApprovalFlowEntity
             {
                 Id = YitIdHelper.NextId(),
-                Code = $"SMART_OPS_IMPROVE_{orgId}",
+                Code = $"SOI_{orgId}",
                 Name = "智慧诊断改善计划审批",
                 BizType = SmartOpsImprovementBizHandler.BizTypeCode,
                 FormJson = "{}",

server/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlow.cs

@@ -15,8 +15,8 @@ public class ApprovalFlow : EntityBaseOrgDel
     /// <summary>
     /// 编号
     /// </summary>
-    [SugarColumn(ColumnDescription = "编号", Length = 32)]
-    [MaxLength(32)]
+    [SugarColumn(ColumnDescription = "编号", Length = 64)]
+    [MaxLength(64)]
     public string? Code { get; set; }
 
     /// <summary>