From e932f6d45453bb0b2b88b749771c6f3c22e55d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZR20090193-=E9=99=88=E6=95=AC=E5=8B=87?= Date: Wed, 24 Apr 2024 11:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=B7=E8=BF=90=E5=87=BA?= =?UTF-8?q?=E5=8F=A3=E5=8F=8A=E8=A1=A8=E5=8D=95=E5=A4=8D=E5=88=B6=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Code/Dtos/CodeFormCopyReq.cs | 13 ++++++++-- .../DS.WMS.Core/Code/Dtos/CodeFormCopyRes.cs | 18 +++++++++++-- .../DS.WMS.Core/Code/Entity/CodeFormCopy.cs | 26 ++++++++++++++----- .../Code/Method/CodeFormCopyService.cs | 1 + .../DS.WMS.Core/Op/Dtos/SeaExportRes.cs | 2 +- .../DS.WMS.Core/Op/Entity/SeaExport.cs | 7 +++-- 6 files changed, 52 insertions(+), 15 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyReq.cs b/ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyReq.cs index 4c3d462c..93efe867 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyReq.cs +++ b/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 /// public string TemplateName { get; set; } /// - /// 中文视图名 + /// 复制字段集合 /// - public string ColumnView { get; set; } + public string CopyFields { get; set; } + /// + /// 表单序号 + /// + public int FormNo { get; set; } = 0; + ///// + ///// 中文视图名 + ///// + //public string ColumnView { get; set; } /// /// 排序 /// diff --git a/ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyRes.cs b/ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyRes.cs index 7d315e85..17e23331 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyRes.cs +++ b/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 /// public long? PermissionId { get; set; } + + /// + /// 表单序号 + /// + public int FormNo { get; set; } = 0; /// /// 权限模块名称 /// @@ -24,11 +30,19 @@ public class CodeFormCopyRes /// 字段设置 /// public string Content { get; set; } + /// + /// 表单默认设置 + /// + public string DefaultContent { get; set; } /// - /// 中文视图名 + /// 复制字段集合 /// - public string ColumnView { get; set; } + public string CopyFields { get; set; } + ///// + ///// 中文视图名 + ///// + //public string ColumnView { get; set; } /// /// 模板名称 /// 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 c113c96e..6be7776b 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs @@ -21,11 +21,11 @@ public class CodeFormCopy : BaseOrgModel [SugarColumn(ColumnDescription = "权限模块名称", IsNullable = false,Length = 50)] public string PermissionName { get; set; } - /// - /// 中文视图名 - /// - [SugarColumn(ColumnDescription = "中文视图名", IsNullable = false, Length = 100)] - public string ColumnView { get; set; } + ///// + ///// 中文视图名 + ///// + //[SugarColumn(ColumnDescription = "中文视图名", IsNullable = false, Length = 100)] + //public string ColumnView { get; set; } /// /// 模板名称 /// @@ -37,12 +37,26 @@ public class CodeFormCopy : BaseOrgModel /// [SugarColumn(ColumnDescription = "是否公共标识", IsNullable = false,DefaultValue = "0")] public bool IsPublic { get; set; } = false; - + /// + /// 表单默认设置 + /// + [SugarColumn(ColumnDescription = "表单默认设置", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + public string DefaultContent { get; set; } /// /// 表单字段复制设置 /// [SugarColumn(ColumnDescription = "表单字段复制设置", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string Content { get; set; } + /// + /// 复制字段集合 + /// + [SugarColumn(ColumnDescription = "复制字段集合", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + public string CopyFields { get; set; } + /// + /// 表单序号 + /// + [SugarColumn(ColumnDescription = "表单序号", IsNullable = false, DefaultValue = "0")] + public int FormNo { get; set; } = 0; /// /// 排序号 diff --git a/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormCopyService.cs b/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormCopyService.cs index 477b08ce..b4cd0c13 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormCopyService.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormCopyService.cs @@ -69,6 +69,7 @@ public class CodeFormCopyService : IFormCopyService } var data = req.Adapt(); + data.DefaultContent = req.Content; var entity = tenantDb.Insertable(data).ExecuteReturnEntity(); diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs index 9580070d..e9eeeea1 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs @@ -1034,6 +1034,6 @@ public class SeaExportRes /// /// Desc:整票提交状态 /// - public int BillSubmitStatus { get; set; } + public AuditStatusEnum BillSubmitStatus { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs index c5dff8f8..de496b3a 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs +++ b/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 /// /// Desc:整票提交状态 /// - [SugarColumn(ColumnDescription = "整票提交状态", IsNullable = true, DefaultValue = "0")] - public int BillSubmitStatus { get; set; } - - + [SugarColumn(ColumnDescription = "整票提交状态", IsNullable = true, DefaultValue = "-1")] + public AuditStatusEnum BillSubmitStatus { get; set; } } \ No newline at end of file