From 09542900534645e28c23f16caa94aa8a2c20cc5b Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 03 5月 2024 16:10:02 +0800
Subject: [PATCH] 往来单位助记码功能调整为 中文名称输入立即调用接口实现
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
index acf384d..56aa65c 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
@@ -92,11 +92,11 @@
if (@column.EffectType == "datepicker" && @column.QueryType == "between"){
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00") && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59"))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00").AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59").AddSeconds(1))
}
else if (@column.EffectType == "datetimepicker" && @column.QueryType == "between"){
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]) && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]).AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]).AddSeconds(1))
}
else {
@@ -161,11 +161,11 @@
} else if (@column.EffectType == "datepicker"&&@column.QueryType == "between")
{
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00") && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59"))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00").AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59").AddSeconds(1))
} else if (@column.EffectType == "datetimepicker" && @column.QueryType == "between"){
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]) && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]).AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]).AddSeconds(1))
}else if (@column.EffectType == "fk")
{
@:.Where(p@(@column.ColumnName) > 0, u => u.@(@column.ColumnName) @column.QueryType p@(@column.ColumnName))
@@ -362,14 +362,17 @@
/// <returns></returns>
private async Task CheckExisit( @(@Model.ClassName) input,bool isEdit=false)
{
-
-
@{
var columnIndex = 0;
+ string my_message = string.Empty;
}
@foreach (var column in Model.TableField)
{
+ if (@column.WhetherUnionKey == "Y")
+ {
+ my_message += "," + @column.ColumnComment + "[{input." + @column.ColumnName + "}]";
+ }
if (@column.WhetherUnionKey == "Y")
{
columnIndex++;
@@ -423,11 +426,9 @@
@:,false);
@:}
}
-
-
@if(columnIndex>0){
- @:if (isExist) throw Oops.Oh(ErrorCode.E0001);
+ @:if (isExist) throw Oops.Oh($"楠岃瘉澶辫触@(@my_message)宸插瓨鍦�");
}else{
@://娌℃湁閰嶇疆鑱斿悎涓婚敭锛屼笉闇�瑕侀獙閲�
}
--
Gitblit v1.9.3