schangxiang@126.com
2024-04-26 6e6b156bb0100043214c170d7171eb79e0d7e344
时间查询 选完时间再清除掉 接口报错
已重命名1个文件
已修改2个文件
25 ■■■■ 文件已修改
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/SysCommUtil.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/SysCommUtil.cs
ÎļþÃû´Ó iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/Comm.cs ÐÞ¸Ä
@@ -9,7 +9,7 @@
    /// <summary>
    /// å…¬å…±æ–¹æ³•
    /// </summary>
    public static class Comm
    public static class SysCommUtil
    {
        /// <summary>
        /// ç”Ÿæˆå‡ºå…¥åº“单号流水
@@ -42,5 +42,18 @@
                return before + (maxNumber+1).ToString("D4");
            }
        }
        /// <summary>
        /// éªŒè¯æ—¥æœŸæŸ¥è¯¢èŒƒå›´å­—符串数组是否符合查询值
        /// </summary>
        /// <param name="list"></param>
        /// <returns>true:符合查询值,false:不符合查询值</returns>
        public static bool ValidateListForQueryTimeArray(List<string> list)
        {
            if (list == null) return false;
            if (list.Count != 2) return false;
            if (string.IsNullOrEmpty(list[0]) || string.IsNullOrEmpty(list[1])) return false;
            return true;
        }
    }
}
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm
@@ -51,7 +51,7 @@
        @:/// <summary>
        @:/// @column.ColumnComment
        @:/// </summary>
         @:public virtual List<@(@column.NetType)>@(@column.NetTypeIsNullLableForQueryInput) @column.ColumnName { get; set; }
        @:public virtual List<string> @column.ColumnName { get; set; }
        @:
        }
    }
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))