调整海运出口及表单复制字段

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyReq.cs

@@ -1,5 +1,6 @@
 using DS.Module.Core;
 using FluentValidation;
+using SqlSugar;
 
 namespace DS.WMS.Core.Code.Dtos;
 
@@ -34,9 +35,17 @@ public class CodeFormCopyReq
     /// </summary>
     public string TemplateName { get; set; }
     /// <summary>
-    /// 中文视图名
+    /// 复制字段集合
     /// </summary>
-    public string ColumnView { get; set; }
+    public string CopyFields { get; set; }
+    /// <summary>
+    /// 表单序号
+    /// </summary>
+    public int FormNo { get; set; } = 0;
+    ///// <summary>
+    ///// 中文视图名
+    ///// </summary>
+    //public string ColumnView { get; set; }
     /// <summary>
     /// 排序
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyRes.cs

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using SqlSugar;
 
 namespace DS.WMS.Core.Code.Dtos;
 
@@ -16,6 +17,11 @@ public class CodeFormCopyRes
     /// 权限Id
     /// </summary>
     public long? PermissionId { get; set; }
+
+    /// <summary>
+    /// 表单序号
+    /// </summary>
+    public int FormNo { get; set; } = 0;
     /// <summary>
     /// 权限模块名称
     /// </summary>
@@ -24,11 +30,19 @@ public class CodeFormCopyRes
     /// 字段设置
     /// </summary>
     public string Content { get; set; }
+    /// <summary>
+    /// 表单默认设置
+    /// </summary>
+    public string DefaultContent { get; set; }
 
     /// <summary>
-    /// 中文视图名
+    /// 复制字段集合
     /// </summary>
-    public string ColumnView { get; set; }
+    public string CopyFields { get; set; }
+    ///// <summary>
+    ///// 中文视图名
+    ///// </summary>
+    //public string ColumnView { get; set; }
     /// <summary>
     /// 模板名称
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs

@@ -21,11 +21,11 @@ public class CodeFormCopy : BaseOrgModel<long>
     [SugarColumn(ColumnDescription = "权限模块名称", IsNullable = false,Length = 50)]
     public string PermissionName { get; set; }
 
-    /// <summary>
+    ///// <summary>
-    /// 中文视图名
+    ///// 中文视图名
-    /// </summary>
+    ///// </summary>
-    [SugarColumn(ColumnDescription = "中文视图名", IsNullable = false, Length = 100)]
+    //[SugarColumn(ColumnDescription = "中文视图名", IsNullable = false, Length = 100)]
-    public string ColumnView { get; set; }
+    //public string ColumnView { get; set; }
     /// <summary>
     /// 模板名称
     /// </summary>
@@ -37,12 +37,26 @@ public class CodeFormCopy : BaseOrgModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "是否公共标识", IsNullable = false,DefaultValue = "0")]
     public bool IsPublic { get; set; } = false;
-
+    /// <summary>
+    /// 表单默认设置
+    /// </summary>
+    [SugarColumn(ColumnDescription = "表单默认设置", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string DefaultContent { get; set; }
     /// <summary>
     /// 表单字段复制设置
     /// </summary>
     [SugarColumn(ColumnDescription = "表单字段复制设置", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
     public string Content { get; set; }
+    /// <summary>
+    /// 复制字段集合
+    /// </summary>
+    [SugarColumn(ColumnDescription = "复制字段集合", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string CopyFields { get; set; }
+    /// <summary>
+    /// 表单序号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "表单序号", IsNullable = false, DefaultValue = "0")]
+    public int FormNo { get; set; } = 0;
 
     /// <summary>
     /// 排序号

ds-wms-service/DS.WMS.Core/Code/Method/CodeFormCopyService.cs

@@ -69,6 +69,7 @@ public class CodeFormCopyService : IFormCopyService
             }
 
             var data = req.Adapt<CodeFormCopy>();
+            data.DefaultContent = req.Content;
 
             var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
 

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs

@@ -1034,6 +1034,6 @@ public class SeaExportRes
     /// <summary>
     /// Desc:整票提交状态
     /// </summary>
-    public int BillSubmitStatus  { get; set; }
+    public AuditStatusEnum BillSubmitStatus  { get; set; }
      
 }

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

@@ -1,3 +1,4 @@
+using DS.Module.Core;
 using DS.Module.Core.Data;
 using SqlSugar;
 
@@ -1243,8 +1244,6 @@ public class SeaExport : BaseOrgModel<long>
     /// <summary>
     /// Desc:整票提交状态
     /// </summary>
-    [SugarColumn(ColumnDescription = "整票提交状态", IsNullable = true, DefaultValue = "0")]
+    [SugarColumn(ColumnDescription = "整票提交状态", IsNullable = true, DefaultValue = "-1")]
-    public int BillSubmitStatus  { get; set; }
+    public AuditStatusEnum BillSubmitStatus  { get; set; } 
-     
-
 }