From afc28acd440fec723ceb22d55600bbd2754e8e23 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 04 5月 2025 10:57:15 +0800
Subject: [PATCH] 22
---
Weben_CMS专用代码生成器/Code/MainForm.cs | 22 +-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs | 317 +++++++++++++++++++++++++++------------
Weben_CMS专用代码生成器/Code/Generate/Entity/InputModel_Generate.cs | 2
Weben_CMS专用代码生成器/Code/Templete/Entity/InputQueryModel模板.txt | 45 -----
Weben_CMS专用代码生成器/Code/App.config | 2
Weben_CMS专用代码生成器/Code/Model/Enum/DataTypeEnum.cs | 8
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 14 +
Weben_CMS专用代码生成器/Code/Model/SystemCommonVar.cs | 2
Weben_CMS专用代码生成器/Code/Utility/CommonHelper.cs | 18 ++
9 files changed, 274 insertions(+), 156 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config"
index df9319f..a7343bd 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config"
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
<connectionStrings>
- <add name="鏈湴_MySql_CMS" connectionString="Server=localhost;Database=4b25b01c1f7f49d19153de6b0906eafc_project;Uid=root;Pwd=123abc.com;" />
+ <add name="鏈湴_MySql_CMS" connectionString="Server=localhost;Database=07a6b2f4bbb04e8bb23a9f17a4a769c2_project;Uid=root;Pwd=123abc.com;" />
<add name="LA22012_姝︽眽鐗ч噹_鐢熶骇搴揰浼熸湰鐜" connectionString="Data Source=10.10.40.166;Initial Catalog=WHMY_Prod_Test;Persist Security Info=True;User ID=sa;Password=123abc.com" />
<add name="LA22012_姝︽眽鐗ч噹_鐢熶骇搴揰26娴嬭瘯鐜" connectionString="Data Source=172.27.96.26;Initial Catalog=WHMY_Prod_Test;Persist Security Info=True;User ID=sa;Password=MJC!2022@wms" />
<add name="LA22012_姝︽眽鐗ч噹_澶囦欢搴揰浼熸湰鐜" connectionString="Data Source=10.10.40.166;Initial Catalog=WHMY_Admin.NET;Persist Security Info=True;User ID=sa;Password=123abc.com" />
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputModel_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputModel_Generate.cs"
index 350ee04..fd3c332 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputModel_Generate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputModel_Generate.cs"
@@ -18,7 +18,7 @@
var str = TextHelper.ReadText(@"Templete\Entity\InputQueryModel妯℃澘.txt");
CommonReplace(ref str);
-
+ CommonHelper.CommonReplaceStr(param, ref str);
//澶勭悊 鍒嗛〉鏌ヨ閮ㄥ垎
string attrString = "";
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
index 577ca9b..6f5f4e2 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
@@ -27,13 +27,13 @@
this.tb_OrderBy.Text = "ModifyTime";//鎺掑簭瀛楁
this.tb_ProjectNamePrefix.Text = "Test";
- this.tb_TableName.Text = "scms_auditlogs";//琛ㄥ悕
- this.tb_WCF_NameSpacePath.Text = "WIP_";//WCF椤圭洰鍛藉悕绌洪棿
+ this.tb_TableName.Text = "scms_wmsmaterials";//琛ㄥ悕
+ this.tb_WCF_NameSpacePath.Text = "HIAWms";//WCF椤圭洰鍛藉悕绌洪棿
this.tb_FileName.Text = "Xiangzi";//鏂囦欢鍓嶇紑鍚�
- this.tb_ChinaComment.Text = "琛ㄧ殑涓枃娉ㄨВ";//涓枃娉ㄩ噴
+ this.tb_ChinaComment.Text = "鐗╂枡鍩虹淇℃伅琛�";//涓枃娉ㄩ噴
this.tb_CreatePerson.Text = "shaocx";//鍒涘缓浜�
- this.tb_EntityName.Text = "XiangziEntity";//瀹炰綋绫诲悕
- this.tb_EntityProName.Text = "xiangzi";//瀹炰綋绫诲璞″悕
+ this.tb_EntityName.Text = "WmsMaterials";//瀹炰綋绫诲悕
+ this.tb_EntityProName.Text = "_wmsMaterials";//瀹炰綋绫诲璞″悕
this.cmb_DataSource.DropDownStyle = ComboBoxStyle.DropDownList;
List<ListItem> itemList = CommonHelper.GetDataSources();
@@ -144,12 +144,12 @@
}
string groupName = this.tb_GroupName.Text.Trim();
- if (groupName == "")
- {
- MessageBox.Show("璇疯緭鍏ュ垎缁勫悕锛�");
- this.tb_GroupName.Focus();
- return;
- }
+ //if (groupName == "")
+ //{
+ // MessageBox.Show("璇疯緭鍏ュ垎缁勫悕锛�");
+ // this.tb_GroupName.Focus();
+ // return;
+ //}
string addEntityParam = "Add" + modulelogo + "Param";//鏂板鍙傛暟绫诲悕
string str_generate = "";
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/Enum/DataTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/Enum/DataTypeEnum.cs"
index e9583cc..e18a086 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/Enum/DataTypeEnum.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/Enum/DataTypeEnum.cs"
@@ -35,6 +35,12 @@
/// <summary>
/// mysql涓璴ongtext绫诲瀷
/// </summary>
- dt_longtext = 14
+ dt_longtext = 14,
+
+ /// <summary>
+ /// mysql涓� TINYINT 鏄竴绉嶆暣鏁版暟鎹被鍨嬶紝鐢ㄤ簬瀛樺偍闈炲父灏忕殑鏁存暟鍊�,鍗犵敤 鈥嬧��1 瀛楄妭锛�8浣嶏級鈥嬧�� 瀛樺偍绌洪棿銆傚彲浠ュ瓨鍌� -128 鍒� 127锛堟湁绗﹀彿锛夋垨 0 鍒� 255锛堟棤绗﹀彿锛夌殑鏁存暟銆�
+ /// 鎴戣繖杈硅涓烘槸bool
+ /// </summary>
+ dt_tinyint = 15
}
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs"
index 8922f7c..df025e3 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs"
@@ -45,6 +45,8 @@
public const string c_ModifyId = "UpdatedUserId";
+ public const string c_ExtraProperties = "ExtraProperties";
+
}
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/InputQueryModel\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/InputQueryModel\346\250\241\346\235\277.txt"
index 4e29126..15b20c5 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/InputQueryModel\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/InputQueryModel\346\250\241\346\235\277.txt"
@@ -44,47 +44,4 @@
#endregion
$QueryAttributes$
-}
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 分页查询$ChinaComment$输入参数
- /// </summary>
- public class $EntityName$PageInput : PageInputCustomBase
- {
- $QueryAttributes$
- }
-
- /// <summary>
- /// 新增$ChinaComment$输入参数
- /// </summary>
- public class Add$EntityName$Input : BasicsDEntity
- {
- $AddAttributes$
- }
-
- /// <summary>
- /// 更新$ChinaComment$输入参数
- /// </summary>
- public class Update$EntityName$Input : Add$EntityName$Input
- {
- [Required(ErrorMessage = "Id主键不能为空")]
- public virtual new long Id { get; set; }
- }
-
- /// <summary>
- /// 删除$ChinaComment$输入参数
- /// </summary>
- public class Delete$EntityName$Input
- {
- public List<long> Id { get; set; }
- }
-
- /// <summary>
- /// 单个查询$ChinaComment$输入参数
- /// </summary>
- public class Query$EntityName$Input : BaseId
- {
-
- }
-}
+}
\ No newline at end of file
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/CommonHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/CommonHelper.cs"
index 3d358cd..5d6d6b9 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/CommonHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/CommonHelper.cs"
@@ -1,4 +1,5 @@
-锘縰sing GenerateCode_WeiBen_WMS.Model;
+锘縰sing GenerateCode_GEBrilliantFactory.Model;
+using GenerateCode_WeiBen_WMS.Model;
using System;
using System.Collections.Generic;
using System.Configuration;
@@ -14,6 +15,21 @@
/// </summary>
public class CommonHelper
{
+
+ /// <summary>
+ /// 鏄惁蹇界暐璇ュ垪
+ /// </summary>
+ /// <param name="columnName"></param>
+ /// <returns></returns>
+ public static bool IsIgnore(string columnName)
+ {
+ if (columnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper())
+ {
+ return true;
+ }
+ return false;
+ }
+
/// <summary>
/// 閫氱敤鏇挎崲瀛楃涓�
/// </summary>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
index d3075c3..dea907b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
@@ -278,6 +278,10 @@
try
{
string attr = columnModel.ColumnName;
+ if (CommonHelper.IsIgnore(attr))
+ {
+ return "";
+ }
//if (attr.ToUpper() == "DBId".ToUpper())
//{
// var bb = "";
@@ -311,6 +315,10 @@
attrStr += " public int" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
+ case DataTypeEnum.dt_tinyint:
+ attrStr += " public bool" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
default:
attrStr += " public string" + emptyStr + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
@@ -336,6 +344,11 @@
try
{
string attr = columnModel.ColumnName;
+ if (CommonHelper.IsIgnore(attr))
+ {
+ return "";
+ }
+
string attrStr = "";
attrStr += " /// <summary>\n";
attrStr += " /// " + columnModel.Description + "-鏌ヨ鍏崇郴杩愮畻绗� \n";
@@ -352,6 +365,7 @@
return "\n";
case DataTypeEnum.dt_bigint:
case DataTypeEnum.dt_int:
+ case DataTypeEnum.dt_tinyint:
attrStr += " public SearchFilterModeEnum " + attr + highSearchModeSuffix + " { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs"
index 52e7652..d2143d0 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs"
@@ -3,32 +3,32 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
-/// <summary>
-/// 鐗╂枡鍩虹鏌ヨ鍙傛暟
-/// </summary>
+/// <summary>
+/// 鐗╂枡鍩虹淇℃伅琛ㄦ煡璇㈠弬鏁�
+/// </summary>
public class GetWmsMaterialsInput : ExtensiblePagedAndSortedResultRequestDto
{
- #region 鍏抽敭瀛楁煡璇�
+ #region 鍏抽敭瀛楁煡璇�
- /// <summary>
- /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛�
- /// </summary>
+ /// <summary>
+ /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛�
+ /// </summary>
public string searchVal { get; set; }
- /// <summary>
- /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
+ /// <summary>
+ /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級
+ /// </summary>
public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
+ /// <summary>
+ /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
+ /// </summary>
[NoAutoQuery]
public string str_searchFormInputAttrs { get; set; }
- /// <summary>
- /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
+ /// <summary>
+ /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
+ /// </summary>
public List<string> searchFormInputAttrs
{
get
@@ -43,16 +43,15 @@
#endregion
-
- /// <summary>
- /// Gets or sets the name.
- /// </summary>
- public string Name { get; set; }
-
/// <summary>
/// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
/// </summary>
public string MaterialCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialCode_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 鐗╂枡鍚嶇О
@@ -60,9 +59,19 @@
public string MaterialName { get; set; }
/// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級 鏋氫妇绫诲瀷蹇呴』鏄痠nt绫诲瀷
+ /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
/// </summary>
public int? PurchaseType { get; set; }
+
+ /// <summary>
+ /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PurchaseType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
@@ -70,9 +79,19 @@
public int? MaterialType { get; set; }
/// <summary>
+ /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
/// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
/// </summary>
public string PrimaryUnit { get; set; }
+
+ /// <summary>
+ /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
@@ -80,14 +99,29 @@
public string Standard { get; set; }
/// <summary>
+ /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Standard_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
/// 澶栧緞锛堝崟浣嶏細mm锛�
/// </summary>
- public decimal? OuterDiameter { get; set; }
+ public string OuterDiameter { get; set; }
+
+ /// <summary>
+ /// 澶栧緞锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 澹佸帤锛堝崟浣嶏細mm锛�
/// </summary>
- public decimal? WallThickness { get; set; }
+ public string WallThickness { get; set; }
+
+ /// <summary>
+ /// 澹佸帤锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum WallThickness_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 鏉愯川锛堝锛�304涓嶉攬閽級
@@ -95,14 +129,29 @@
public string MaterialQuality { get; set; }
/// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
+ /// 鏉愯川锛堝锛�304涓嶉攬閽級-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public decimal? Length { get; set; }
+ public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�
+ /// 闀垮害锛堝崟浣嶏細m锛�
+ /// </summary>
+ public string Length { get; set; }
+
+ /// <summary>
+ /// 闀垮害锛堝崟浣嶏細m锛�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Length_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鏄惁涓轰富鏀
/// </summary>
public int? IsMainBranch { get; set; }
+
+ /// <summary>
+ /// 鏄惁涓轰富鏀-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 鐢熶骇宸ュ巶
@@ -110,79 +159,153 @@
public string Factory { get; set; }
/// <summary>
- /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級
- /// </summary>
- public string Certification { get; set; }
-
- #region 鏌ヨ绛涢�夋潯浠�
- /// <summary>
- /// Gets or sets the name.
- /// </summary>
- public SearchFilterModeEnum Name_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- public SearchFilterModeEnum MaterialCode_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public SearchFilterModeEnum PurchaseType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public SearchFilterModeEnum MaterialType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
- /// </summary>
- public SearchFilterModeEnum Standard_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�
- /// </summary>
- public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�
- /// </summary>
- public SearchFilterModeEnum WallThickness_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級
- /// </summary>
- public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
- /// </summary>
- public SearchFilterModeEnum Length_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�
- /// </summary>
- public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鐢熶骇宸ュ巶
+ /// 鐢熶骇宸ュ巶-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum Factory_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級
+ /// 璇佷功缂栧彿
+ /// </summary>
+ public string Certification { get; set; }
+
+ /// <summary>
+ /// 璇佷功缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum Certification_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- #endregion
+
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField1 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum RedundantField1_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField2 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum RedundantField2_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField3 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum RedundantField3_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int? Sort { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Sort_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string ConcurrencyStamp { get; set; }
+
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ConcurrencyStamp_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> CreationTime { get; set; }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string CreatorId { get; set; }
+
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> LastModificationTime { get; set; }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string LastModifierId { get; set; }
+
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool? IsDeleted { get; set; }
+
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string DeleterId { get; set; }
+
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> DeletionTime { get; set; }
+
+
+
}
--
Gitblit v1.9.3