From 5389229c5ef7ad6b3c390d60914e00e71494e830 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:59:46 +0800
Subject: [PATCH] 界面checkbox如果是 界面必填的话，不主动选则，会报错，提示要选择
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
index 52f7a80..2329610 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
@@ -133,16 +133,7 @@
codeGenConfig.WhetherRequired = tableColumn.IsNullable ? YesOrNot.N.ToString() : YesOrNot.Y.ToString();
codeGenConfig.QueryWhether = YesOrNo;
- //ly-0419 鐢熸垚鏂板缓 缂栬緫椤甸潰 鍒涘缓浜� 淇敼浜哄垱寤烘椂闂� 淇敼鏃堕棿 涔熻嚜鍔ㄧ敓鎴愶紝闇�瑕佸幓鎺�
- if (codeGenConfig.ColumnName == "CreatedTime" || codeGenConfig.ColumnName == "UpdatedTime"
- || codeGenConfig.ColumnName == "CreatedUserName" || codeGenConfig.ColumnName == "UpdatedUserName")
- {
- codeGenConfig.WhetherAddUpdate = YesOrNot.N.ToString();
- }
- else
- {
- codeGenConfig.WhetherAddUpdate = YesOrNo;
- }
+
if (codeGenConfig.WhetherRequired == YesOrNot.Y.ToString())
{//蹇呭～瀛楁蹇呴』閰嶇疆澧炴敼銆�
codeGenConfig.WhetherAddUpdate = YesOrNot.Y.ToString();
@@ -151,11 +142,24 @@
codeGenConfig.WhetherAddUpdate = YesOrNot.N.ToString();
}
}
+ else
+ {//瀛楁涓嶅繀濉�
+ //ly-0419 鐢熸垚鏂板缓 缂栬緫椤甸潰 鍒涘缓浜� 淇敼浜哄垱寤烘椂闂� 淇敼鏃堕棿 涔熻嚜鍔ㄧ敓鎴愶紝闇�瑕佸幓鎺�
+ if (codeGenConfig.ColumnName == "CreatedTime" || codeGenConfig.ColumnName == "UpdatedTime"
+ || codeGenConfig.ColumnName == "CreatedUserName" || codeGenConfig.ColumnName == "UpdatedUserName")
+ {
+ codeGenConfig.WhetherAddUpdate = YesOrNot.N.ToString();
+ }
+ else
+ {
+ codeGenConfig.WhetherAddUpdate = YesOrNo;
+ }
+ }
codeGenConfig.WhetherTable = YesOrNo;
codeGenConfig.WhetherOrderBy = YesOrNo;
//鏄惁鑱斿悎涓婚敭 update by liuwq 20240418
- codeGenConfig.WhetherRequired = YesOrNot.N.ToString();
+ codeGenConfig.WhetherUnionKey = YesOrNot.N.ToString();
codeGenConfig.ColumnKey = tableColumn.ColumnKey;
codeGenConfig.DataType = tableColumn.DataType;
--
Gitblit v1.9.3