From 06a0e112b1b865f8a9a53b0f8e8279774348fcac Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 08 5月 2025 19:29:09 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs | 25
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs | 55 +
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs | 14
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx | 14
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 54 +
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx | 80 ++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts | 25
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 29
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 | 55 +
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508112533_InitialCreate5.Designer.cs | 1031 ++++++++++++++++++++++++++++++++++++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs | 110 ++-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508112533_InitialCreate5.cs | 71 ++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 78 ++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 19
16 files changed, 1,579 insertions(+), 83 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/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 8319228..c9fc6b5 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"
@@ -204,36 +204,6 @@
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>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
@@ -318,6 +288,36 @@
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
/// </summary>
public string ExtraField1 { get; set; }
@@ -347,5 +347,55 @@
/// </summary>
public SearchFilterModeEnum ExtraField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public bool? IsSelfMade { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public bool? IsValid { 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.绮惧噯鏌ヨ;
+
}
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 9dfd47c..398d012 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"
@@ -90,21 +90,6 @@
public string? RedundantField3 { get; set; }
/// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
/// 鍒涘缓浜篒D
/// </summary>
public string? CreatorId { get; set; }
@@ -125,6 +110,21 @@
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; }
@@ -139,6 +139,31 @@
/// </summary>
public string? ExtraField3 { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public bool? IsSelfMade { 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; }
+
/// <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/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 51e0ed7..aaf7279 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"
@@ -123,29 +123,14 @@
public string? RedundantField3 { get; set; }
/// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
-
- /// <summary>
/// 鎵╁睍灞炴��
/// </summary>
public ExtraPropertyDictionary? ExtraProperties { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
/// 骞跺彂鎴�
/// </summary>
public string? ConcurrencyStamp { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -193,6 +178,21 @@
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; }
@@ -207,6 +207,31 @@
/// </summary>
public string? ExtraField3 { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public bool? IsSelfMade { 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; }
+
/// <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/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 0b08f4d..e235e41 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"
@@ -107,6 +107,18 @@
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)]
@@ -125,18 +137,6 @@
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
/// </summary>
[ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 25)]
@@ -154,6 +154,36 @@
[ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 25)]
public string ExtraField3 { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [ExcelColumn(Name = "鏁伴噺", Width = 25)]
+ public bool? IsSelfMade { 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; }
+
public Dictionary<string, object> GetExportData()
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 51058cb..bc35cf1 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"
@@ -159,13 +159,18 @@
updateObj.RedundantField1 = input.RedundantField1;
updateObj.RedundantField2 = input.RedundantField2;
updateObj.RedundantField3 = input.RedundantField3;
- updateObj.Remark = input.Remark;
- updateObj.IsDisabled = input.IsDisabled;
updateObj.CreatorName = input.CreatorName;
updateObj.LastModifierName = input.LastModifierName;
+ updateObj.Remark = input.Remark;
+ updateObj.IsDisabled = input.IsDisabled;
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;
await wmsMaterialRepository.UpdateAsync(updateObj);
@@ -337,13 +342,18 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
-Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
+Remark = impItem.Remark,
+IsDisabled = impItem.IsDisabled,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
+IsSelfMade = impItem.IsSelfMade,
+IsValid = impItem.IsValid,
+NullLength = impItem.NullLength,
+Num = impItem.Num,
+SelfNum = impItem.SelfNum,
};
@@ -369,13 +379,18 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
-Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
+Remark = impItem.Remark,
+IsDisabled = impItem.IsDisabled,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
+IsSelfMade = impItem.IsSelfMade,
+IsValid = impItem.IsValid,
+NullLength = impItem.NullLength,
+Num = impItem.Num,
+SelfNum = impItem.SelfNum,
};
@@ -463,6 +478,8 @@
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.Domain/WmsMaterial/WmsMaterial.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.Domain/WmsMaterial/WmsMaterial.cs"
index 4173e82..2a79795 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.Domain/WmsMaterial/WmsMaterial.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.Domain/WmsMaterial/WmsMaterial.cs"
@@ -18,11 +18,36 @@
public string MaterialCode { get; set; }
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public bool IsValid { get; set; }
+
+ /// <summary>
+ /// 鏄惁鑷骇
+ /// </summary>
+ public bool? IsSelfMade { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int Num { get; set; }
+
+ /// <summary>
+ /// 鑷湁鏁伴噺
+ /// </summary>
+ public int? SelfNum { get; set; }
+
+ /// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
public string MaterialName { get; set; }
/// <summary>
+ /// 鍙┖闀垮害
+ /// </summary>
+ public decimal? NullLength { get; set; }
+
+ /// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
/// </summary>
public PurchaseTypeEnum PurchaseType { 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.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.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.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
index 0bfac11..57f4686 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.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.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.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
@@ -134,6 +134,20 @@
.HasDefaultValue(false)
.HasComment("鏄惁绂佺敤");
+ b.Property(x => x.IsValid)
+ .IsRequired()
+ .HasComment("鏄惁鏈夋晥鐗╂枡");
+ b.Property(x => x.IsSelfMade)
+ .IsRequired(false)
+ .HasComment("鏁伴噺");
+
+ b.Property(x => x.Num)
+ .IsRequired()
+ .HasComment("鏄惁鏈夋晥鐗╂枡");
+ b.Property(x => x.SelfNum)
+ .IsRequired(false)
+ .HasComment("鑷湁鏁伴噺");
+
// 绱㈠紩閰嶇疆
b.HasIndex(x => x.MaterialCode).IsUnique(); // 鐗╂枡缂栫爜鍞竴绱㈠紩
b.HasIndex(x => x.MaterialName); // 鐗╂枡鍚嶇О鏅�氱储寮�
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.MySQL/Migrations/20250508112533_InitialCreate5.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508112533_InitialCreate5.Designer.cs"
new file mode 100644
index 0000000..76554e2
--- /dev/null
+++ "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.MySQL/Migrations/20250508112533_InitialCreate5.Designer.cs"
@@ -0,0 +1,1031 @@
+锘�// <auto-generated />
+using System;
+using CMS.Plugin.HIAWms.MySQL;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ [DbContext(typeof(CMSPluginDbContext))]
+ [Migration("20250508112533_InitialCreate5")]
+ partial class InitialCreate5
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+ .HasAnnotation("ProductVersion", "6.0.16")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsAreas.WmsArea", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("AreaDesc")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鎻忚堪");
+
+ b.Property<string>("AreaName")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("搴撳尯鍚嶇О");
+
+ b.Property<string>("AreaNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("搴撳尯缂栧彿");
+
+ b.Property<int>("AreaStatus")
+ .HasColumnType("int")
+ .HasComment("搴撳尯鐘舵��");
+
+ b.Property<int>("AreaType")
+ .HasColumnType("int")
+ .HasComment("搴撳尯绫诲瀷");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaName");
+
+ b.ToTable("scms_wmsareas", (string)null);
+
+ b.HasComment("搴撳尯琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainers.WmsContainer", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<int>("ContainerStatus")
+ .HasColumnType("int")
+ .HasComment("鎵樼洏鐘舵��");
+
+ b.Property<int>("ContainerType")
+ .HasColumnType("int")
+ .HasComment("鎵樼洏绫诲瀷");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int?>("ExceptionNumber")
+ .HasColumnType("int")
+ .HasComment("寮傚父鏁伴噺");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<decimal?>("LimitHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰珮");
+
+ b.Property<decimal?>("LimitLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰暱");
+
+ b.Property<decimal?>("LimitWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愬");
+
+ b.Property<int?>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鏁伴噺");
+
+ b.Property<decimal?>("MaxWeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("杞介噸涓婇檺");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<decimal?>("SpecHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("楂樺害");
+
+ b.Property<decimal?>("SpecLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害");
+
+ b.Property<decimal?>("SpecWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("瀹藉害");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo")
+ .IsUnique();
+
+ b.HasIndex("ContainerStatus");
+
+ b.HasIndex("ContainerType");
+
+ b.ToTable("scms_wmscontainers", (string)null);
+
+ b.HasComment("鎵樼洏淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷");
+
+ b.Property<string>("MaterialName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠跺彿");
+
+ b.Property<DateTime?>("OperateTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鎿嶄綔鏃堕棿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("SourcePlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("璧峰搴撲綅");
+
+ b.Property<int>("StockType")
+ .HasColumnType("int")
+ .HasComment("鎿嶄綔绫诲瀷");
+
+ b.Property<string>("TaskNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠诲姟鍙�");
+
+ b.Property<string>("ToPlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐩爣搴撲綅");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OperateTime");
+
+ b.HasIndex("OrderNo");
+
+ b.HasIndex("StockType");
+
+ b.HasIndex("TaskNo");
+
+ b.ToTable("scms_wmsinoutstockrecords", (string)null);
+
+ b.HasComment("鍑哄叆搴撹褰曡〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterial.WmsMaterial", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("Certification")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("璇佷功缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp")
+ .HasComment("骞跺彂鎴�");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime")
+ .HasComment("鍒涘缓鏃堕棿");
+
+ b.Property<Guid?>("CreatorId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId")
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property<string>("CreatorName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍒涘缓浜�");
+
+ b.Property<Guid?>("DeleterId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId")
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime")
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property<string>("ExtraField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property<string>("ExtraField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property<string>("ExtraField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁3");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties")
+ .HasComment("鎵╁睍灞炴��");
+
+ b.Property<string>("Factory")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐢熶骇宸ュ巶");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("IsMainBranch")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(2)
+ .HasComment("鏄惁涓轰富鏀");
+
+ b.Property<bool?>("IsSelfMade")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏁伴噺");
+
+ b.Property<bool>("IsValid")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁鏈夋晥鐗╂枡");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
+
+ b.Property<decimal>("Length")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害锛堝崟浣嶏細m锛�");
+
+ b.Property<string>("MaterialCode")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialQuality")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鏉愯川锛堝锛�304涓嶉攬閽級");
+
+ b.Property<int>("MaterialType")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<decimal?>("NullLength")
+ .HasColumnType("decimal(65,30)");
+
+ b.Property<int>("Num")
+ .HasColumnType("int")
+ .HasComment("鏄惁鏈夋晥鐗╂枡");
+
+ b.Property<decimal>("OuterDiameter")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澶栧緞锛堝崟浣嶏細mm锛�");
+
+ b.Property<string>("PrimaryUnit")
+ .HasMaxLength(20)
+ .HasColumnType("varchar(20)")
+ .HasComment("涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�");
+
+ b.Property<int>("PurchaseType")
+ .HasColumnType("int")
+ .HasComment("閲囪喘绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int?>("SelfNum")
+ .HasColumnType("int")
+ .HasComment("鑷湁鏁伴噺");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("Standard")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�");
+
+ b.Property<decimal>("WallThickness")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澹佸帤锛堝崟浣嶏細mm锛�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialCode")
+ .IsUnique();
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialType");
+
+ b.HasIndex("PurchaseType");
+
+ b.ToTable("scms_wmsmaterials", (string)null);
+
+ b.HasComment("鐗╂枡鍩虹淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("Aisle")
+ .HasColumnType("int")
+ .HasComment("宸烽亾");
+
+ b.Property<string>("AreaCode")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵�鍦ㄥ簱鍖�");
+
+ b.Property<int>("ColumnNo")
+ .HasColumnType("int")
+ .HasComment("鍒�");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int>("EmptyContainer")
+ .HasColumnType("int")
+ .HasComment("鏄惁绌烘墭");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("Islock")
+ .HasColumnType("int")
+ .HasComment("鏄惁閿佸畾");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("LayerNo")
+ .HasColumnType("int")
+ .HasComment("灞�");
+
+ b.Property<string>("PlaceNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("缂栧彿");
+
+ b.Property<int>("PlaceStatus")
+ .HasColumnType("int")
+ .HasComment("璐т綅鐘舵��");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("RowNo")
+ .HasColumnType("int")
+ .HasComment("鎺�");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StorageTypeNo")
+ .HasColumnType("int")
+ .HasComment("璐т綅绫诲瀷");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaCode");
+
+ b.HasIndex("PlaceNo")
+ .IsUnique();
+
+ b.HasIndex("PlaceStatus");
+
+ b.HasIndex("StorageTypeNo");
+
+ b.ToTable("scms_wmsplaces", (string)null);
+
+ b.HasComment("搴撲綅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsStores.WmsStore", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("StoreName");
+
+ b.ToTable("scms_wmsstores", (string)null);
+
+ b.HasComment("浠撳簱淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int?>("Aisle")
+ .HasColumnType("int")
+ .HasComment("宸烽亾");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int?>("DodeviceId")
+ .HasColumnType("int")
+ .HasComment("鍫嗗灈鏈篒D");
+
+ b.Property<int>("Dodevicetype")
+ .HasColumnType("int")
+ .HasComment("璁惧绫诲瀷");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int?>("IsNextTask")
+ .HasColumnType("int")
+ .HasComment("涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛");
+
+ b.Property<bool>("IsRead")
+ .HasColumnType("tinyint(1)")
+ .HasComment("WCS鏄惁鍙互璇诲彇");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MutableParam1")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺1");
+
+ b.Property<string>("MutableParam2")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺2");
+
+ b.Property<string>("MutableParam3")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺3");
+
+ b.Property<int?>("SonTaskType")
+ .HasColumnType("int")
+ .HasComment("瀛愪换鍔＄被鍨�");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("SourceOrderNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏉ユ簮鍗曟嵁鍙�");
+
+ b.Property<string>("SourcePlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("璧峰搴撲綅");
+
+ b.Property<int>("TaskDodeviceStatus")
+ .HasColumnType("int")
+ .HasComment("璁惧浠诲姟鐘舵��");
+
+ b.Property<int>("TaskLevel")
+ .HasColumnType("int")
+ .HasComment("浠诲姟绛夌骇");
+
+ b.Property<string>("TaskNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠诲姟鍙�");
+
+ b.Property<int>("TaskStatus")
+ .HasColumnType("int")
+ .HasComment("浠诲姟鐘舵��");
+
+ b.Property<int>("TaskType")
+ .HasColumnType("int")
+ .HasComment("浠诲姟绫诲瀷");
+
+ b.Property<string>("ToPlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐩爣搴撲綅");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("DodeviceId");
+
+ b.HasIndex("IsRead");
+
+ b.HasIndex("Sort");
+
+ b.HasIndex("SourceOrderNo");
+
+ b.HasIndex("SourcePlace");
+
+ b.HasIndex("TaskNo")
+ .IsUnique();
+
+ b.HasIndex("TaskStatus");
+
+ b.HasIndex("TaskType");
+
+ b.HasIndex("ToPlace");
+
+ b.ToTable("scms_wmstasks", (string)null);
+
+ b.HasComment("浠诲姟琛�");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
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.MySQL/Migrations/20250508112533_InitialCreate5.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.MySQL/Migrations/20250508112533_InitialCreate5.cs"
new file mode 100644
index 0000000..950faf7
--- /dev/null
+++ "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.MySQL/Migrations/20250508112533_InitialCreate5.cs"
@@ -0,0 +1,71 @@
+锘縰sing Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ public partial class InitialCreate5 : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn<bool>(
+ name: "IsSelfMade",
+ table: "scms_wmsmaterials",
+ type: "tinyint(1)",
+ nullable: true,
+ comment: "鏁伴噺");
+
+ migrationBuilder.AddColumn<bool>(
+ name: "IsValid",
+ table: "scms_wmsmaterials",
+ type: "tinyint(1)",
+ nullable: false,
+ defaultValue: false,
+ comment: "鏄惁鏈夋晥鐗╂枡");
+
+ migrationBuilder.AddColumn<decimal>(
+ name: "NullLength",
+ table: "scms_wmsmaterials",
+ type: "decimal(65,30)",
+ nullable: true);
+
+ migrationBuilder.AddColumn<int>(
+ name: "Num",
+ table: "scms_wmsmaterials",
+ type: "int",
+ nullable: false,
+ defaultValue: 0,
+ comment: "鏄惁鏈夋晥鐗╂枡");
+
+ migrationBuilder.AddColumn<int>(
+ name: "SelfNum",
+ table: "scms_wmsmaterials",
+ type: "int",
+ nullable: true,
+ comment: "鑷湁鏁伴噺");
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "IsSelfMade",
+ table: "scms_wmsmaterials");
+
+ migrationBuilder.DropColumn(
+ name: "IsValid",
+ table: "scms_wmsmaterials");
+
+ migrationBuilder.DropColumn(
+ name: "NullLength",
+ table: "scms_wmsmaterials");
+
+ migrationBuilder.DropColumn(
+ name: "Num",
+ table: "scms_wmsmaterials");
+
+ migrationBuilder.DropColumn(
+ name: "SelfNum",
+ table: "scms_wmsmaterials");
+ }
+ }
+}
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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs"
index cf7429b..a431838 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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs"
@@ -510,6 +510,14 @@
.HasDefaultValue(2)
.HasComment("鏄惁涓轰富鏀");
+ b.Property<bool?>("IsSelfMade")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏁伴噺");
+
+ b.Property<bool>("IsValid")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁鏈夋晥鐗╂枡");
+
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime")
@@ -551,6 +559,13 @@
.HasColumnType("int")
.HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
+ b.Property<decimal?>("NullLength")
+ .HasColumnType("decimal(65,30)");
+
+ b.Property<int>("Num")
+ .HasColumnType("int")
+ .HasComment("鏄惁鏈夋晥鐗╂枡");
+
b.Property<decimal>("OuterDiameter")
.HasColumnType("decimal(18,2)")
.HasComment("澶栧緞锛堝崟浣嶏細mm锛�");
@@ -584,6 +599,10 @@
.HasColumnType("varchar(500)")
.HasComment("澶囨敞");
+ b.Property<int?>("SelfNum")
+ .HasColumnType("int")
+ .HasComment("鑷湁鏁伴噺");
+
b.Property<int>("Sort")
.ValueGeneratedOnAdd()
.HasColumnType("int")
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.MySQL/Scripts/UpdateMigrations.bat" "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.MySQL/Scripts/UpdateMigrations.bat"
index 5c47039..a036bb7 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.MySQL/Scripts/UpdateMigrations.bat"
+++ "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.MySQL/Scripts/UpdateMigrations.bat"
@@ -1,5 +1,5 @@
cd ../
-dotnet ef migrations add InitialCreate4 -c CMSPluginDbContext -o Migrations
+dotnet ef migrations add InitialCreate5 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update1 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update2 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update3 -c CMSPluginDbContext -o Migrations
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 b928908..1570d8f 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 9c2a023..06079b1 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"
@@ -267,6 +267,72 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3',
+ },
+ {
+ label: '鏁伴噺',
+ prop: 'isSelfMade',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ暟閲�',
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ },
+ {
+ label: '鏄惁鏈夋晥鐗╂枡',
+ prop: 'isValid',
+ el: 'select',
+ //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: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
},
])
/**
@@ -324,7 +390,12 @@
remark: formData.value.remark,
extraField1: formData.value.extraField1,
extraField2: formData.value.extraField2,
-extraField3: formData.value.extraField3,
+extraField3: formData.value.extraField3,
+isSelfMade: formData.value.isSelfMade,
+isValid: formData.value.isValid,
+nullLength: formData.value.nullLength,
+num: formData.value.num,
+selfNum: formData.value.selfNum,
}
if (!current.value) {
await wmsMaterialDrawer.addWmsMaterial(data)
@@ -400,7 +471,12 @@
remark: res.remark,
extraField1: res.extraField1,
extraField2: res.extraField2,
-extraField3: res.extraField3,
+extraField3: res.extraField3,
+isSelfMade: res.isSelfMade,
+isValid: res.isValid,
+nullLength: res.nullLength,
+num: res.num,
+selfNum: res.selfNum,
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 e629cb1..534075e 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"
@@ -283,6 +283,70 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3',
+ },
+ {
+ label: '鏁伴噺',
+ prop: 'isSelfMade',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ暟閲�',
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ },
+ {
+ label: '鏄惁鏈夋晥鐗╂枡',
+ prop: 'isValid',
+ el: 'select',
+ //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: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
},
])
/**
@@ -320,7 +384,12 @@
isDisabled: formData.value.isDisabled || '',
extraField1: formData.value.extraField1 || '',
extraField2: formData.value.extraField2 || '',
-extraField3: formData.value.extraField3 || '',
+extraField3: formData.value.extraField3 || '',
+isSelfMade: formData.value.isSelfMade || '',
+isValid: formData.value.isValid || '',
+nullLength: formData.value.nullLength || '',
+num: formData.value.num || '',
+selfNum: formData.value.selfNum || '',
}
return data;
}
@@ -364,7 +433,12 @@
formData.value.Remark = ''
formData.value.ExtraField1 = ''
formData.value.ExtraField2 = ''
-formData.value.ExtraField3 = ''
+formData.value.ExtraField3 = ''
+formData.value.IsSelfMade = ''
+formData.value.IsValid = ''
+formData.value.NullLength = ''
+formData.value.Num = ''
+formData.value.SelfNum = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
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 fc2084a..1e6b082 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"
@@ -128,5 +128,30 @@
field: 'extraField3',
title: '鎵╁睍瀛楁3',
width:160,
+},
+{
+ field: 'isSelfMade',
+ title: '鏁伴噺',
+ width:80,
+},
+{
+ field: 'isValid',
+ title: '鏄惁鏈夋晥鐗╂枡',
+ width:80,
+},
+{
+ field: 'nullLength',
+ title: '',
+ width:160,
+},
+{
+ field: 'num',
+ title: '鏄惁鏈夋晥鐗╂枡',
+ width:160,
+},
+{
+ field: 'selfNum',
+ 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 b424c28..0dd2315 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"
@@ -247,6 +247,20 @@
{row.isDisabled != null ? (row.isDisabled ? '鏄�' : '鍚�') : '-'}
</div>
)
+},
+isSelfMade: ({ row }: any) => {
+ return (
+ <div>
+ {row.isSelfMade != null ? (row.isSelfMade ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+},
+isValid: ({ row }: any) => {
+ return (
+ <div>
+ {row.isValid != null ? (row.isValid ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
},
name: ({ row }: any) => {
return row?.name ? (
--
Gitblit v1.9.3