From 01b99769af32e7de2d5f3ded5ce2f2bd3df526a5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 08:16:39 +0800
Subject: [PATCH] 前端文件夹名称可配置
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs | 78 ++--
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库单据详情.txt | 3
Weben_CMS专用代码生成器/Code/Model/GenerateCodeConfigParam.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx | 38 +-
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/物料容器关系.txt | 3
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的物料信息表配置文本.txt | 3
Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 84 ++--
Weben_CMS专用代码生成器/Code/MainForm.cs | 17
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx | 176 +++++----
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts | 68 ++-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 52 +-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs | 68 ++-
Weben_CMS专用代码生成器/Code/MainForm.Designer.cs | 24
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs | 156 +++++----
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库单据.txt | 3
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 188 ++++++-----
18 files changed, 540 insertions(+), 425 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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt"
index daec1d0..2a1eefd 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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt"
@@ -9,4 +9,5 @@
[妯＄硦鏌ヨ瀛楁]:'OrderNo', 'MaterialNo', 'MaterialBatch'
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鎵规
[椤圭洰鍛藉悕绌洪棿]:HIAWms
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderStatus|OrderStatusEnum|OrderStatusDesc,OrderType|OrderTypeEnum|OrderTypeDesc,StockType|StockTypeEnum|StockTypeDesc
\ No newline at end of file
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderStatus|OrderStatusEnum|OrderStatusDesc,OrderType|OrderTypeEnum|OrderTypeDesc,StockType|StockTypeEnum|StockTypeDesc
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
\ 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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt"
index 86c02c3..b21976e 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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt"
@@ -9,4 +9,5 @@
[妯＄硦鏌ヨ瀛楁]:'OrderNo', 'MaterialNo', 'MaterialId'
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鐗╂枡ID
[椤圭洰鍛藉悕绌洪棿]:HIAWms
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderType|OrderTypeEnum|OrderTypeDesc
\ No newline at end of file
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderType|OrderTypeEnum|OrderTypeDesc
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
\ 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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.txt"
index 7d4e86b..1630a4d 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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.txt"
@@ -9,4 +9,5 @@
[妯＄硦鏌ヨ瀛楁]:'MaterialId'
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ョ墿鏂橧d
[椤圭洰鍛藉悕绌洪棿]:HIAWms
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:
\ No newline at end of file
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
\ 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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
similarity index 93%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
index 329cf9e..cfe1170 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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
@@ -9,4 +9,5 @@
[妯＄硦鏌ヨ瀛楁]:'MaterialCode', 'MaterialName', 'Remark'
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞
[椤圭洰鍛藉悕绌洪棿]:HIAWms
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc
\ No newline at end of file
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc
+[鍓嶇鏍规枃浠跺す鍚嶇О]:templatedemo_web
\ 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/GenerateCode_WeiBen_CMS.csproj" "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/GenerateCode_WeiBen_CMS.csproj"
index 0c9b4e0..efb04e5 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/GenerateCode_WeiBen_CMS.csproj"
+++ "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/GenerateCode_WeiBen_CMS.csproj"
@@ -476,7 +476,7 @@
<Content Include="Templete\Web\Views\Pages\EntityNameClass\EntityNameClass妯℃澘.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="File\GenerateCodeConfigParamFiles\鐗╂枡淇℃伅琛ㄩ厤缃枃鏈�.txt">
+ <Content Include="File\GenerateCodeConfigParamFiles\绁ュ瓙鐨勭墿鏂欎俊鎭〃閰嶇疆鏂囨湰.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="甯哥敤.txt" />
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.Designer.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.Designer.cs"
index 94dc57c..ea9c18d 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.Designer.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.Designer.cs"
@@ -56,7 +56,7 @@
this.tb_Modulelogo = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.btn_InsertSql = new System.Windows.Forms.Button();
- this.tb_RoutePrefix = new System.Windows.Forms.TextBox();
+ this.tb_VueRootFolerName = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label17 = new System.Windows.Forms.Label();
@@ -336,22 +336,22 @@
this.btn_InsertSql.Visible = false;
this.btn_InsertSql.Click += new System.EventHandler(this.btn_InsertSql_Click);
//
- // tb_RoutePrefix
+ // tb_VueRootFolerName
//
- this.tb_RoutePrefix.Location = new System.Drawing.Point(737, 316);
- this.tb_RoutePrefix.Name = "tb_RoutePrefix";
- this.tb_RoutePrefix.Size = new System.Drawing.Size(145, 21);
- this.tb_RoutePrefix.TabIndex = 44;
- this.tb_RoutePrefix.Text = "1111";
+ this.tb_VueRootFolerName.Location = new System.Drawing.Point(737, 316);
+ this.tb_VueRootFolerName.Name = "tb_VueRootFolerName";
+ this.tb_VueRootFolerName.Size = new System.Drawing.Size(145, 21);
+ this.tb_VueRootFolerName.TabIndex = 44;
+ this.tb_VueRootFolerName.Text = "1111";
//
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(646, 318);
+ this.label13.Location = new System.Drawing.Point(622, 319);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(77, 12);
+ this.label13.Size = new System.Drawing.Size(107, 12);
this.label13.TabIndex = 43;
- this.label13.Text = "WCF璺敱鍓嶇紑:";
+ this.label13.Text = "鍓嶇鏍规枃浠跺す鍚嶇О:";
this.label13.Click += new System.EventHandler(this.label13_Click);
//
// groupBox1
@@ -427,7 +427,7 @@
this.groupBox2.Controls.Add(this.groupBox3);
this.groupBox2.Controls.Add(this.tb_FileName);
this.groupBox2.Controls.Add(this.lblds);
- this.groupBox2.Controls.Add(this.tb_RoutePrefix);
+ this.groupBox2.Controls.Add(this.tb_VueRootFolerName);
this.groupBox2.Controls.Add(this.tb_TableName);
this.groupBox2.Controls.Add(this.label13);
this.groupBox2.Controls.Add(this.label1);
@@ -762,7 +762,7 @@
private System.Windows.Forms.TextBox tb_Modulelogo;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btn_InsertSql;
- private System.Windows.Forms.TextBox tb_RoutePrefix;
+ private System.Windows.Forms.TextBox tb_VueRootFolerName;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label lbl_DataSource;
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 8f187c0..a5b72b7 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"
@@ -165,7 +165,7 @@
string entityName = this.tb_EntityName.Text.Trim();//瀹炰綋绫诲悕
string tableAlias = this.tb_EntityProName.Text.Trim();//瀹炰綋绫诲璞″悕/琛ㄥ埆鍚�
string orderByName = this.tb_OrderBy.Text.Trim();//鎺掑簭瀛楁鍚嶇О
- string routePrefix = this.tb_RoutePrefix.Text.Trim();//WCF璺敱鍓嶇紑
+ string _tb_VueRootFolerName = this.tb_VueRootFolerName.Text.Trim();//WCF璺敱鍓嶇紑
string connStr = this.lbl_DataSource.Text.Trim();//鏁版嵁搴撹繛鎺ュ瓧绗︿覆
if (connStr == "")
{
@@ -185,10 +185,10 @@
this.tb_Primary.Focus();
return;
}
- if (routePrefix == "")
+ if (_tb_VueRootFolerName == "")
{
- MessageBox.Show("璇疯緭鍏CF璺敱鍓嶇紑锛�");
- this.tb_RoutePrefix.Focus();
+ MessageBox.Show("璇疯緭鍏� 鍓嶇鏍规枃浠跺す鍚嶇О锛�");
+ this.tb_VueRootFolerName.Focus();
return;
}
if (wcf_NameSpacePath == "")
@@ -273,7 +273,8 @@
//CreateModelFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
//CreateModelParamFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
genCodeRootPath = tbPath.Text + @"\" + tb_WCF_NameSpacePath.Text.Trim();
- var webFolerPath = (tb_WCF_NameSpacePath.Text.Trim() + "_Web").ToLower();
+ //var webFolerPath = (tb_WCF_NameSpacePath.Text.Trim() + "_Web").ToLower();
+ var webFolerPath = _tb_VueRootFolerName;
#region 瀹炰綋绫�
var entityFilePath = genCodeRootPath + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim();
//1銆佺敓鎴� 鍒嗛〉鏌ヨ瀹炰綋 鏂囦欢
@@ -636,7 +637,7 @@
tb_FileName.Enabled = false;
tb_Modulelogo.Enabled = false;
tb_WCF_NameSpacePath.Enabled = true;
- tb_RoutePrefix.Enabled = false;
+ tb_VueRootFolerName.Enabled = false;
}
private void cmb_DataSource_SelectedIndexChanged(object sender, EventArgs e)
@@ -759,6 +760,9 @@
case "鏋氫妇绫诲瀷瀛楁闆嗗悎":
entity.鏋氫妇绫诲瀷瀛楁闆嗗悎 = propertyValue;
break;
+ case "鍓嶇鏍规枃浠跺す鍚嶇О":
+ entity.鍓嶇鏍规枃浠跺す鍚嶇О = propertyValue;
+ break;
}
}
}
@@ -793,6 +797,7 @@
this.tb_EnumList.Text = entity.鏋氫妇绫诲瀷瀛楁闆嗗悎;
this.tb_ValidateRepeatName.Text = entity.閲嶅鎬ф牎楠屽瓧娈�;
this.tb_DeleteAlertAttr.Text = entity.鍒犻櫎鎻愮ず瀛楁;
+ this.tb_VueRootFolerName.Text = entity.鍓嶇鏍规枃浠跺す鍚嶇О;
}
catch (FileNotFoundException)
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/GenerateCodeConfigParam.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/GenerateCodeConfigParam.cs"
index 572a0b7..445e9e2 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/GenerateCodeConfigParam.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/GenerateCodeConfigParam.cs"
@@ -21,5 +21,7 @@
public string 椤圭洰鍛藉悕绌洪棿 { get; set; }
public string 鏋氫妇绫诲瀷瀛楁闆嗗悎 { get; set; }
+
+ public string 鍓嶇鏍规枃浠跺す鍚嶇О { get; set; }
}
}
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/WmsMaterial/GetWmsMaterialInput.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/WmsMaterial/GetWmsMaterialInput.cs"
index c9fc6b5..a4963ae 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/WmsMaterial/GetWmsMaterialInput.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/WmsMaterial/GetWmsMaterialInput.cs"
@@ -54,6 +54,16 @@
public SearchFilterModeEnum MaterialCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public bool? IsValid { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsValid_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
public string MaterialName { get; set; }
@@ -62,6 +72,16 @@
/// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public bool? IsSelfMade { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
@@ -74,6 +94,16 @@
public SearchFilterModeEnum PurchaseType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public int? Num { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
/// </summary>
public int? MaterialType { get; set; }
@@ -82,6 +112,16 @@
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum MaterialType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鑷湁鏁伴噺
+ /// </summary>
+ public int? SelfNum { get; set; }
+
+ /// <summary>
+ /// 鑷湁鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
@@ -102,6 +142,16 @@
/// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum Standard_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ public decimal? NullLength { get; set; }
+
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 澶栧緞锛堝崟浣嶏細mm锛�
@@ -240,6 +290,16 @@
public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int? Sort { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
/// 鏄惁鍒犻櫎
/// </summary>
public bool? IsDeleted { get; set; }
@@ -250,6 +310,16 @@
public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
/// 鍒犻櫎浜篒D
/// </summary>
public string DeleterId { get; set; }
@@ -258,6 +328,16 @@
/// 鍒犻櫎浜篒D-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 鍒犻櫎鏃堕棿
@@ -286,36 +366,6 @@
/// 淇敼浜�-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum LastModifierName_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>
/// 鎵╁睍瀛楁1
@@ -348,54 +398,24 @@
public SearchFilterModeEnum ExtraField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 鏁伴噺
+ /// 鎿嶄綔澶囨敞
/// </summary>
- public bool? IsSelfMade { get; set; }
+ public string OperationRemark { get; set; }
/// <summary>
- /// 鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鎿嶄綔澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
+ /// 鍒犻櫎澶囨敞
/// </summary>
- public bool? IsValid { get; set; }
+ public string DeleteRemark { get; set; }
/// <summary>
- /// 鏄惁鏈夋晥鐗╂枡-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鍒犻櫎澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum IsValid_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- public decimal? NullLength { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
- /// </summary>
- public int? Num { get; set; }
-
- /// <summary>
- /// 鏄惁鏈夋晥鐗╂枡-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鑷湁鏁伴噺
- /// </summary>
- public int? SelfNum { get; set; }
-
- /// <summary>
- /// 鑷湁鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
}
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/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.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/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
index 398d012..0f25a99 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/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.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/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
@@ -15,9 +15,19 @@
public string MaterialCode { get; set; }
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public bool IsValid { get; set; }
+
+ /// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public bool? IsSelfMade { get; set; }
/// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
@@ -25,9 +35,19 @@
public PurchaseTypeEnum PurchaseType { get; set; }
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public int Num { get; set; }
+
+ /// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
/// </summary>
public MaterialTypeEnum MaterialType { get; set; }
+
+ /// <summary>
+ /// 鑷湁鏁伴噺
+ /// </summary>
+ public int? SelfNum { get; set; }
/// <summary>
/// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
@@ -38,6 +58,11 @@
/// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
/// </summary>
public string? Standard { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public decimal? NullLength { get; set; }
/// <summary>
/// 澶栧緞锛堝崟浣嶏細mm锛�
@@ -100,16 +125,6 @@
public string? LastModifierId { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string? CreatorName { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- public string? LastModifierName { get; set; }
-
- /// <summary>
/// 鎺掑簭
/// </summary>
public int Sort { get; set; }
@@ -123,6 +138,16 @@
/// 鏄惁绂佺敤
/// </summary>
public bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string? LastModifierName { get; set; }
/// <summary>
/// 鎵╁睍瀛楁1
@@ -140,29 +165,14 @@
public string? ExtraField3 { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 鎿嶄綔澶囨敞
/// </summary>
- public bool? IsSelfMade { get; set; }
+ public string? OperationRemark { get; set; }
/// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
+ /// 鍒犻櫎澶囨敞
/// </summary>
- public bool IsValid { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public decimal? NullLength { get; set; }
-
- /// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
- /// </summary>
- public int Num { get; set; }
-
- /// <summary>
- /// 鑷湁鏁伴噺
- /// </summary>
- public int? SelfNum { get; set; }
+ public string? DeleteRemark { get; set; }
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/WmsMaterial/WmsMaterialDto.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/WmsMaterial/WmsMaterialDto.cs"
index aaf7279..4e7d82d 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/WmsMaterial/WmsMaterialDto.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/WmsMaterial/WmsMaterialDto.cs"
@@ -18,9 +18,19 @@
public string MaterialCode { get; set; }
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public bool IsValid { get; set; }
+
+ /// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public bool? IsSelfMade { get; set; }
/// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
@@ -38,6 +48,11 @@
}
}
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public int Num { get; set; }
+
+ /// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
/// </summary>
public MaterialTypeEnum MaterialType { get; set; }
@@ -53,6 +68,11 @@
}
}
/// <summary>
+ /// 鑷湁鏁伴噺
+ /// </summary>
+ public int? SelfNum { get; set; }
+
+ /// <summary>
/// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
/// </summary>
public string? PrimaryUnit { get; set; }
@@ -61,6 +81,11 @@
/// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
/// </summary>
public string? Standard { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public decimal? NullLength { get; set; }
/// <summary>
/// 澶栧緞锛堝崟浣嶏細mm锛�
@@ -153,14 +178,29 @@
public string? LastModifierId { get; set; }
/// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int Sort { get; set; }
+
+ /// <summary>
/// 鏄惁鍒犻櫎
/// </summary>
public bool IsDeleted { get; set; }
/// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string? Remark { get; set; }
+
+ /// <summary>
/// 鍒犻櫎浜篒D
/// </summary>
public string? DeleterId { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
/// <summary>
/// 鍒犻櫎鏃堕棿
@@ -178,21 +218,6 @@
public string? LastModifierName { get; set; }
/// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
/// 鎵╁睍瀛楁1
/// </summary>
public string? ExtraField1 { get; set; }
@@ -208,29 +233,14 @@
public string? ExtraField3 { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 鎿嶄綔澶囨敞
/// </summary>
- public bool? IsSelfMade { get; set; }
+ public string? OperationRemark { get; set; }
/// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
+ /// 鍒犻櫎澶囨敞
/// </summary>
- public bool IsValid { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public decimal? NullLength { get; set; }
-
- /// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
- /// </summary>
- public int Num { get; set; }
-
- /// <summary>
- /// 鑷湁鏁伴噺
- /// </summary>
- public int? SelfNum { get; set; }
+ public string? DeleteRemark { get; set; }
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/WmsMaterial/WmsMaterialExportModel.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/WmsMaterial/WmsMaterialExportModel.cs"
index e235e41..05c5269 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/WmsMaterial/WmsMaterialExportModel.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/WmsMaterial/WmsMaterialExportModel.cs"
@@ -17,10 +17,22 @@
public string MaterialCode { get; set; }
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ [ExcelColumn(Name = "鏄惁鏈夋晥鐗╂枡", Width = 25)]
+ public bool IsValid { get; set; }
+
+ /// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
[ExcelColumn(Name = "鐗╂枡鍚嶇О", Width = 25)]
public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [ExcelColumn(Name = "鏁伴噺", Width = 25)]
+ public bool? IsSelfMade { get; set; }
/// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
@@ -29,10 +41,22 @@
public PurchaseTypeEnum PurchaseType { get; set; }
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ [ExcelColumn(Name = "鏄惁鏈夋晥鐗╂枡", Width = 25)]
+ public int Num { get; set; }
+
+ /// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
/// </summary>
[ExcelColumn(Name = "鐗╂枡绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
public MaterialTypeEnum MaterialType { get; set; }
+
+ /// <summary>
+ /// 鑷湁鏁伴噺
+ /// </summary>
+ [ExcelColumn(Name = "鑷湁鏁伴噺", Width = 25)]
+ public int? SelfNum { get; set; }
/// <summary>
/// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
@@ -45,6 +69,12 @@
/// </summary>
[ExcelColumn(Name = "瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�", Width = 25)]
public string Standard { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [ExcelColumn(Name = "", Width = 25)]
+ public decimal? NullLength { get; set; }
/// <summary>
/// 澶栧緞锛堝崟浣嶏細mm锛�
@@ -107,18 +137,6 @@
public string RedundantField3 { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [ExcelColumn(Name = "鍒涘缓浜�", Width = 25)]
- public string CreatorName { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- [ExcelColumn(Name = "淇敼浜�", Width = 25)]
- public string LastModifierName { get; set; }
-
- /// <summary>
/// 鎺掑簭
/// </summary>
[ExcelColumn(Name = "鎺掑簭", Width = 25)]
@@ -135,6 +153,18 @@
/// </summary>
[ExcelColumn(Name = "鏄惁绂佺敤", Width = 25)]
public bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [ExcelColumn(Name = "鍒涘缓浜�", Width = 25)]
+ public string CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ [ExcelColumn(Name = "淇敼浜�", Width = 25)]
+ public string LastModifierName { get; set; }
/// <summary>
/// 鎵╁睍瀛楁1
@@ -155,34 +185,16 @@
public string ExtraField3 { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 鎿嶄綔澶囨敞
/// </summary>
- [ExcelColumn(Name = "鏁伴噺", Width = 25)]
- public bool? IsSelfMade { get; set; }
+ [ExcelColumn(Name = "鎿嶄綔澶囨敞", Width = 25)]
+ public string OperationRemark { get; set; }
/// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
+ /// 鍒犻櫎澶囨敞
/// </summary>
- [ExcelColumn(Name = "鏄惁鏈夋晥鐗╂枡", Width = 25)]
- public bool IsValid { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [ExcelColumn(Name = "", Width = 25)]
- public decimal? NullLength { get; set; }
-
- /// <summary>
- /// 鏄惁鏈夋晥鐗╂枡
- /// </summary>
- [ExcelColumn(Name = "鏄惁鏈夋晥鐗╂枡", Width = 25)]
- public int Num { get; set; }
-
- /// <summary>
- /// 鑷湁鏁伴噺
- /// </summary>
- [ExcelColumn(Name = "鑷湁鏁伴噺", Width = 25)]
- public int? SelfNum { get; set; }
+ [ExcelColumn(Name = "鍒犻櫎澶囨敞", Width = 25)]
+ public string DeleteRemark { get; set; }
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/Implements/WmsMaterialAppService.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/Implements/WmsMaterialAppService.cs"
index bc35cf1..2d97a0b 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/Implements/WmsMaterialAppService.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/Implements/WmsMaterialAppService.cs"
@@ -144,11 +144,16 @@
input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
updateObj.MaterialCode = input.MaterialCode;
+ updateObj.IsValid = input.IsValid;
updateObj.MaterialName = input.MaterialName;
+ updateObj.IsSelfMade = input.IsSelfMade;
updateObj.PurchaseType = input.PurchaseType;
+ updateObj.Num = input.Num;
updateObj.MaterialType = input.MaterialType;
+ updateObj.SelfNum = input.SelfNum;
updateObj.PrimaryUnit = input.PrimaryUnit;
updateObj.Standard = input.Standard;
+ updateObj.NullLength = input.NullLength;
updateObj.OuterDiameter = input.OuterDiameter;
updateObj.WallThickness = input.WallThickness;
updateObj.MaterialQuality = input.MaterialQuality;
@@ -159,18 +164,15 @@
updateObj.RedundantField1 = input.RedundantField1;
updateObj.RedundantField2 = input.RedundantField2;
updateObj.RedundantField3 = input.RedundantField3;
- updateObj.CreatorName = input.CreatorName;
- updateObj.LastModifierName = input.LastModifierName;
updateObj.Remark = input.Remark;
updateObj.IsDisabled = input.IsDisabled;
+ updateObj.CreatorName = input.CreatorName;
+ updateObj.LastModifierName = input.LastModifierName;
updateObj.ExtraField1 = input.ExtraField1;
updateObj.ExtraField2 = input.ExtraField2;
updateObj.ExtraField3 = input.ExtraField3;
- updateObj.IsSelfMade = input.IsSelfMade;
- updateObj.IsValid = input.IsValid;
- updateObj.NullLength = input.NullLength;
- updateObj.Num = input.Num;
- updateObj.SelfNum = input.SelfNum;
+ updateObj.OperationRemark = input.OperationRemark;
+ updateObj.DeleteRemark = input.DeleteRemark;
await wmsMaterialRepository.UpdateAsync(updateObj);
@@ -327,11 +329,16 @@
var wmsMaterialUpdateDto = new WmsMaterialUpdateDto
{
MaterialCode = impItem.MaterialCode,
+IsValid = impItem.IsValid,
MaterialName = impItem.MaterialName,
+IsSelfMade = impItem.IsSelfMade,
PurchaseType = impItem.PurchaseType,
+Num = impItem.Num,
MaterialType = impItem.MaterialType,
+SelfNum = impItem.SelfNum,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
+NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -342,18 +349,15 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
+CreatorName = impItem.CreatorName,
+LastModifierName = impItem.LastModifierName,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
-IsSelfMade = impItem.IsSelfMade,
-IsValid = impItem.IsValid,
-NullLength = impItem.NullLength,
-Num = impItem.Num,
-SelfNum = impItem.SelfNum,
+OperationRemark = impItem.OperationRemark,
+DeleteRemark = impItem.DeleteRemark,
};
@@ -364,11 +368,16 @@
var wmsMaterialCreateDto = new WmsMaterialCreateDto
{
MaterialCode = impItem.MaterialCode,
+IsValid = impItem.IsValid,
MaterialName = impItem.MaterialName,
+IsSelfMade = impItem.IsSelfMade,
PurchaseType = impItem.PurchaseType,
+Num = impItem.Num,
MaterialType = impItem.MaterialType,
+SelfNum = impItem.SelfNum,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
+NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -379,18 +388,15 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
+CreatorName = impItem.CreatorName,
+LastModifierName = impItem.LastModifierName,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
-IsSelfMade = impItem.IsSelfMade,
-IsValid = impItem.IsValid,
-NullLength = impItem.NullLength,
-Num = impItem.Num,
-SelfNum = impItem.SelfNum,
+OperationRemark = impItem.OperationRemark,
+DeleteRemark = impItem.DeleteRemark,
};
@@ -471,15 +477,15 @@
{
Check.NotNull(input, nameof(input));
Check.NotNullOrWhiteSpace(input.MaterialCode, "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", 64);
+ Check.NotNull(input.IsValid, "鏄惁鏈夋晥鐗╂枡");
Check.NotNullOrWhiteSpace(input.MaterialName, "鐗╂枡鍚嶇О", 128);
Check.NotNull(input.PurchaseType, "閲囪喘绫诲瀷锛堟灇涓惧�硷級");
+ Check.NotNull(input.Num, "鏄惁鏈夋晥鐗╂枡");
Check.NotNull(input.MaterialType, "鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
Check.NotNull(input.OuterDiameter, "澶栧緞锛堝崟浣嶏細mm锛�");
Check.NotNull(input.WallThickness, "澹佸帤锛堝崟浣嶏細mm锛�");
Check.NotNull(input.Length, "闀垮害锛堝崟浣嶏細m锛�");
Check.NotNull(input.IsMainBranch, "鏄惁涓轰富鏀");
- Check.NotNull(input.IsValid, "鏄惁鏈夋晥鐗╂枡");
- Check.NotNull(input.Num, "鏄惁鏈夋晥鐗╂枡");
return Task.CompletedTask;
}
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/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "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/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index 1570d8f..9bca345 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/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "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/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx" "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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
index 06079b1..6776fa5 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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
+++ "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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
@@ -85,12 +85,29 @@
rules: [{required: true, message: '鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛変笉鑳戒负绌�', trigger: 'blur' }],
},
{
+ label: '鏄惁鏈夋晥鐗╂枡',
+ prop: 'isValid',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
+ rules: [{required: true, message: '鏄惁鏈夋晥鐗╂枡涓嶈兘涓虹┖', trigger: 'blur' }],
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ },
+ {
label: '鐗╂枡鍚嶇О',
prop: 'materialName',
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
rules: [{required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
+ },
+ {
+ label: '鏁伴噺',
+ prop: 'isSelfMade',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ暟閲�',
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
},
{
label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
@@ -102,6 +119,23 @@
rules: [{required: true, message: '閲囪喘绫诲瀷锛堟灇涓惧�硷級涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
+ label: '鏄惁鏈夋晥鐗╂枡',
+ prop: 'num',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 1,
+ precision: 0,
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
+ rules: [{required: true, message: '鏄惁鏈夋晥鐗╂枡涓嶈兘涓虹┖', trigger: 'blur' }],
+ },
+ {
label: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級',
prop: 'materialType',
el: 'select',
@@ -109,6 +143,22 @@
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑被鍨嬶紙鏋氫妇鍊硷級',
rules: [{required: true, message: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級涓嶈兘涓虹┖', trigger: 'blur' }],
+ },
+ {
+ label: '鑷湁鏁伴噺',
+ prop: 'selfNum',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 1,
+ precision: 0,
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
},
{
label: '涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�',
@@ -123,6 +173,22 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
+ },
+ {
+ label: '',
+ prop: 'nullLength',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 0.01,
+ precision: 2,
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏�',
},
{
label: '澶栧緞锛堝崟浣嶏細mm锛�',
@@ -227,6 +293,13 @@
placeholder: '璇疯緭鍏ュ啑浣欏瓧娈�3 - 棰勭暀鎵╁睍鐢ㄩ��',
},
{
+ label: '澶囨敞',
+ prop: 'remark',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ娉�',
+ },
+ {
label: '鍒涘缓浜�',
prop: 'creatorName',
el: 'input',
@@ -239,13 +312,6 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
- },
- {
- label: '澶囨敞',
- prop: 'remark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ娉�',
},
{
label: '鎵╁睍瀛楁1',
@@ -269,70 +335,18 @@
placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3',
},
{
- label: '鏁伴噺',
- prop: 'isSelfMade',
- el: 'select',
+ label: '鎿嶄綔澶囨敞',
+ prop: 'operationRemark',
+ el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ユ暟閲�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ placeholder: '璇疯緭鍏ユ搷浣滃娉�',
},
{
- label: '鏄惁鏈夋晥鐗╂枡',
- prop: 'isValid',
- el: 'select',
+ label: '鍒犻櫎澶囨敞',
+ prop: 'deleteRemark',
+ el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- rules: [{required: true, message: '鏄惁鏈夋晥鐗╂枡涓嶈兘涓虹┖', trigger: 'blur' }],
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
- },
- {
- label: '',
- prop: 'nullLength',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 0.01,
- precision: 2,
- //disabled: disabled,
- placeholder: '璇疯緭鍏�',
- },
- {
- label: '鏄惁鏈夋晥鐗╂枡',
- prop: 'num',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- rules: [{required: true, message: '鏄惁鏈夋晥鐗╂枡涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '鑷湁鏁伴噺',
- prop: 'selfNum',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
+ placeholder: '璇疯緭鍏ュ垹闄ゅ娉�',
},
])
/**
@@ -370,11 +384,16 @@
await formRef.value?.validate()
const data = {
materialCode: formData.value.materialCode,
+isValid: formData.value.isValid,
materialName: formData.value.materialName,
+isSelfMade: formData.value.isSelfMade,
purchaseType: formData.value.purchaseType,
+num: formData.value.num,
materialType: formData.value.materialType,
+selfNum: formData.value.selfNum,
primaryUnit: formData.value.primaryUnit,
standard: formData.value.standard,
+nullLength: formData.value.nullLength,
outerDiameter: formData.value.outerDiameter,
wallThickness: formData.value.wallThickness,
materialQuality: formData.value.materialQuality,
@@ -385,17 +404,14 @@
redundantField1: formData.value.redundantField1,
redundantField2: formData.value.redundantField2,
redundantField3: formData.value.redundantField3,
+remark: formData.value.remark,
creatorName: formData.value.creatorName,
lastModifierName: formData.value.lastModifierName,
-remark: formData.value.remark,
extraField1: formData.value.extraField1,
extraField2: formData.value.extraField2,
extraField3: formData.value.extraField3,
-isSelfMade: formData.value.isSelfMade,
-isValid: formData.value.isValid,
-nullLength: formData.value.nullLength,
-num: formData.value.num,
-selfNum: formData.value.selfNum,
+operationRemark: formData.value.operationRemark,
+deleteRemark: formData.value.deleteRemark,
}
if (!current.value) {
await wmsMaterialDrawer.addWmsMaterial(data)
@@ -451,11 +467,16 @@
formData.value = {
materialCode: res.materialCode,
+isValid: res.isValid,
materialName: res.materialName,
+isSelfMade: res.isSelfMade,
purchaseType: res.purchaseType,
+num: res.num,
materialType: res.materialType,
+selfNum: res.selfNum,
primaryUnit: res.primaryUnit,
standard: res.standard,
+nullLength: res.nullLength,
outerDiameter: res.outerDiameter,
wallThickness: res.wallThickness,
materialQuality: res.materialQuality,
@@ -466,17 +487,14 @@
redundantField1: res.redundantField1,
redundantField2: res.redundantField2,
redundantField3: res.redundantField3,
+remark: res.remark,
creatorName: res.creatorName,
lastModifierName: res.lastModifierName,
-remark: res.remark,
extraField1: res.extraField1,
extraField2: res.extraField2,
extraField3: res.extraField3,
-isSelfMade: res.isSelfMade,
-isValid: res.isValid,
-nullLength: res.nullLength,
-num: res.num,
-selfNum: res.selfNum,
+operationRemark: res.operationRemark,
+deleteRemark: res.deleteRemark,
id: res.id,
}
disabled.value = true
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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx" "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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
index 534075e..342b6c5 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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
+++ "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/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
@@ -86,11 +86,27 @@
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�',
},
{
+ label: '鏄惁鏈夋晥鐗╂枡',
+ prop: 'isValid',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ },
+ {
label: '鐗╂枡鍚嶇О',
prop: 'materialName',
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ },
+ {
+ label: '鏁伴噺',
+ prop: 'isSelfMade',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ暟閲�',
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
},
{
label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
@@ -101,12 +117,44 @@
placeholder: '璇疯緭鍏ラ噰璐被鍨嬶紙鏋氫妇鍊硷級',
},
{
+ label: '鏄惁鏈夋晥鐗╂枡',
+ prop: 'num',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 1,
+ precision: 0,
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
+ },
+ {
label: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級',
prop: 'materialType',
el: 'select',
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑被鍨嬶紙鏋氫妇鍊硷級',
+ },
+ {
+ label: '鑷湁鏁伴噺',
+ prop: 'selfNum',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 1,
+ precision: 0,
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
},
{
label: '涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�',
@@ -121,6 +169,22 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
+ },
+ {
+ label: '',
+ prop: 'nullLength',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 0.01,
+ precision: 2,
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏�',
},
{
label: '澶栧緞锛堝崟浣嶏細mm锛�',
@@ -235,20 +299,6 @@
placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
},
{
- label: '鍒涘缓浜�',
- prop: 'creatorName',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ垱寤轰汉',
- },
- {
- label: '淇敼浜�',
- prop: 'lastModifierName',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
- },
- {
label: '澶囨敞',
prop: 'remark',
el: 'input',
@@ -262,6 +312,20 @@
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ },
+ {
+ label: '鍒涘缓浜�',
+ prop: 'creatorName',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ垱寤轰汉',
+ },
+ {
+ label: '淇敼浜�',
+ prop: 'lastModifierName',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
},
{
label: '鎵╁睍瀛楁1',
@@ -285,68 +349,18 @@
placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3',
},
{
- label: '鏁伴噺',
- prop: 'isSelfMade',
- el: 'select',
+ label: '鎿嶄綔澶囨敞',
+ prop: 'operationRemark',
+ el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ユ暟閲�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ placeholder: '璇疯緭鍏ユ搷浣滃娉�',
},
{
- label: '鏄惁鏈夋晥鐗╂枡',
- prop: 'isValid',
- el: 'select',
+ label: '鍒犻櫎澶囨敞',
+ prop: 'deleteRemark',
+ el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
- },
- {
- label: '',
- prop: 'nullLength',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 0.01,
- precision: 2,
- //disabled: disabled,
- placeholder: '璇疯緭鍏�',
- },
- {
- label: '鏄惁鏈夋晥鐗╂枡',
- prop: 'num',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- },
- {
- label: '鑷湁鏁伴噺',
- prop: 'selfNum',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
+ placeholder: '璇疯緭鍏ュ垹闄ゅ娉�',
},
])
/**
@@ -362,11 +376,16 @@
const commonGetFormData=()=>{
const data = {
materialCode: formData.value.materialCode || '',
+isValid: formData.value.isValid || '',
materialName: formData.value.materialName || '',
+isSelfMade: formData.value.isSelfMade || '',
purchaseType: formData.value.purchaseType || '',
+num: formData.value.num || '',
materialType: formData.value.materialType || '',
+selfNum: formData.value.selfNum || '',
primaryUnit: formData.value.primaryUnit || '',
standard: formData.value.standard || '',
+nullLength: formData.value.nullLength || '',
outerDiameter: formData.value.outerDiameter || '',
wallThickness: formData.value.wallThickness || '',
materialQuality: formData.value.materialQuality || '',
@@ -378,18 +397,15 @@
redundantField2: formData.value.redundantField2 || '',
redundantField3: formData.value.redundantField3 || '',
creationTime: formData.value.creationTime || '',
-creatorName: formData.value.creatorName || '',
-lastModifierName: formData.value.lastModifierName || '',
remark: formData.value.remark || '',
isDisabled: formData.value.isDisabled || '',
+creatorName: formData.value.creatorName || '',
+lastModifierName: formData.value.lastModifierName || '',
extraField1: formData.value.extraField1 || '',
extraField2: formData.value.extraField2 || '',
extraField3: formData.value.extraField3 || '',
-isSelfMade: formData.value.isSelfMade || '',
-isValid: formData.value.isValid || '',
-nullLength: formData.value.nullLength || '',
-num: formData.value.num || '',
-selfNum: formData.value.selfNum || '',
+operationRemark: formData.value.operationRemark || '',
+deleteRemark: formData.value.deleteRemark || '',
}
return data;
}
@@ -413,11 +429,16 @@
const onReset = async () => {
formData.value = {}
formData.value.MaterialCode = ''
+formData.value.IsValid = ''
formData.value.MaterialName = ''
+formData.value.IsSelfMade = ''
formData.value.PurchaseType = ''
+formData.value.Num = ''
formData.value.MaterialType = ''
+formData.value.SelfNum = ''
formData.value.PrimaryUnit = ''
formData.value.Standard = ''
+formData.value.NullLength = ''
formData.value.OuterDiameter = ''
formData.value.WallThickness = ''
formData.value.MaterialQuality = ''
@@ -428,17 +449,14 @@
formData.value.RedundantField1 = ''
formData.value.RedundantField2 = ''
formData.value.RedundantField3 = ''
+formData.value.Remark = ''
formData.value.CreatorName = ''
formData.value.LastModifierName = ''
-formData.value.Remark = ''
formData.value.ExtraField1 = ''
formData.value.ExtraField2 = ''
formData.value.ExtraField3 = ''
-formData.value.IsSelfMade = ''
-formData.value.IsValid = ''
-formData.value.NullLength = ''
-formData.value.Num = ''
-formData.value.SelfNum = ''
+formData.value.OperationRemark = ''
+formData.value.DeleteRemark = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery');
}
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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts" "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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
index 1e6b082..e2b4abf 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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
+++ "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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
@@ -10,9 +10,19 @@
width:160,
},
{
+ field: 'isValid',
+ title: '鏄惁鏈夋晥鐗╂枡',
+ width:80,
+},
+{
field: 'materialName',
title: '鐗╂枡鍚嶇О',
width:160,
+},
+{
+ field: 'isSelfMade',
+ title: '鏁伴噺',
+ width:80,
},
{
field: 'purchaseTypeDesc',
@@ -20,8 +30,18 @@
width:160,
},
{
+ field: 'num',
+ title: '鏄惁鏈夋晥鐗╂枡',
+ width:160,
+},
+{
field: 'materialTypeDesc',
title: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級',
+ width:160,
+},
+{
+ field: 'selfNum',
+ title: '鑷湁鏁伴噺',
width:160,
},
{
@@ -32,6 +52,11 @@
{
field: 'standard',
title: '瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
+ width:160,
+},
+{
+ field: 'nullLength',
+ title: '',
width:160,
},
{
@@ -90,6 +115,16 @@
width:180,
},
{
+ field: 'sort',
+ title: '鎺掑簭',
+ width:160,
+},
+{
+ field: 'remark',
+ title: '澶囨敞',
+ width:160,
+},
+{
field: 'deletionTime',
title: '鍒犻櫎鏃堕棿',
width:180,
@@ -102,16 +137,6 @@
{
field: 'lastModifierName',
title: '淇敼浜�',
- width:160,
-},
-{
- field: 'sort',
- title: '鎺掑簭',
- width:160,
-},
-{
- field: 'remark',
- title: '澶囨敞',
width:160,
},
{
@@ -130,28 +155,13 @@
width:160,
},
{
- field: 'isSelfMade',
- title: '鏁伴噺',
- width:80,
-},
-{
- field: 'isValid',
- title: '鏄惁鏈夋晥鐗╂枡',
- width:80,
-},
-{
- field: 'nullLength',
- title: '',
+ field: 'operationRemark',
+ title: '鎿嶄綔澶囨敞',
width:160,
},
{
- field: 'num',
- title: '鏄惁鏈夋晥鐗╂枡',
- width:160,
-},
-{
- field: 'selfNum',
- title: '鑷湁鏁伴噺',
+ field: 'deleteRemark',
+ title: '鍒犻櫎澶囨敞',
width:160,
},
]
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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx" "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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
index 0dd2315..a810d2e 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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
+++ "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/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
@@ -207,7 +207,21 @@
isHidePagination={isHidePagination}
pageSize={20}
v-slots={{
- creationTime: ({ row }: any) => {
+ isValid: ({ row }: any) => {
+ return (
+ <div>
+ {row.isValid != null ? (row.isValid ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+},
+isSelfMade: ({ row }: any) => {
+ return (
+ <div>
+ {row.isSelfMade != null ? (row.isSelfMade ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+},
+creationTime: ({ row }: any) => {
return (
<div>
{row.creationTime != null
@@ -232,15 +246,6 @@
</div>
)
},
-deletionTime: ({ row }: any) => {
- return (
- <div>
- {row.deletionTime != null
- ? dayjs(row.deletionTime).format('YYYY-MM-DD HH:mm:ss')
- : '-'}
- </div>
- )
-},
isDisabled: ({ row }: any) => {
return (
<div>
@@ -248,17 +253,12 @@
</div>
)
},
-isSelfMade: ({ row }: any) => {
+deletionTime: ({ row }: any) => {
return (
<div>
- {row.isSelfMade != null ? (row.isSelfMade ? '鏄�' : '鍚�') : '-'}
- </div>
- )
-},
-isValid: ({ row }: any) => {
- return (
- <div>
- {row.isValid != null ? (row.isValid ? '鏄�' : '鍚�') : '-'}
+ {row.deletionTime != null
+ ? dayjs(row.deletionTime).format('YYYY-MM-DD HH:mm:ss')
+ : '-'}
</div>
)
},
--
Gitblit v1.9.3