From 92e586e3ea03f4c70d12f8d5a2d47e4ae3f8f5f6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 14:48:46 +0800
Subject: [PATCH] 物料基础高级查询

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs |  209 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 122 insertions(+), 87 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs
index 4193a03..407c538 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs
@@ -1,105 +1,140 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
+using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
+using System; 
+using Volo.Abp.Application.Dtos; 
+ 
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
+ 
+/// <summary> 
+/// 鐗╂枡鍩虹淇℃伅鍒涘缓鎴栨洿鏂板熀绫� 
+/// </summary> 
+public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto 
+{ 
+            /// <summary>
+        /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
+        /// </summary>
+        public string MaterialCode { get; set; }
 
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
+        /// <summary>
+        /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
+        /// </summary>
+        public string MaterialNo { get; set; }
 
-/// <summary>
-/// WmsMaterial鍒涘缓鎴栨洿鏂板熀绫�
-/// </summary>
-public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
-    /// <summary>
-    /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
-    /// </summary>
-    public string MaterialNo { get; set; }
+        /// <summary>
+        /// 鐗╂枡鍚嶇О
+        /// </summary>
+        public string MaterialName { get; set; }
 
-    /// <summary>
-    /// 鐗╂枡鍚嶇О
-    /// </summary>
-    public string MaterialName { get; set; }
+        /// <summary>
+        /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
+        /// </summary>
+        public PurchaseTypeEnum PurchaseType { get; set; }
 
-    /// <summary>
-    /// 鍨嬪彿
-    /// </summary>
-    public string MaterialModel { get; set; }
-    /// <summary>
-    /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
-    /// </summary>
-    public PurchaseTypeEnum PurchaseType { get; set; }
+        /// <summary>
+        /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+        /// </summary>
+        public MaterialTypeEnum MaterialType { get; set; }
 
-    /// <summary>
-    /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
-    /// </summary>
-    public MaterialTypeEnum MaterialType { get; set; }
+        /// <summary>
+        /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
+        /// </summary>
+        public string? PrimaryUnit { get; set; }
 
-    /// <summary>
-    /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
-    /// </summary>
-    public string PrimaryUnit { get; set; }
+        /// <summary>
+        /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
+        /// </summary>
+        public string? Standard { get; set; }
 
-    /// <summary>
-    /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
-    /// </summary>
-    public string Standard { get; set; }
+        /// <summary>
+        /// 澶栧緞锛堝崟浣嶏細mm锛�
+        /// </summary>
+        public decimal OuterDiameter { get; set; }
 
-    /// <summary>
-    /// 澶栧緞锛堝崟浣嶏細mm锛�
-    /// </summary>
-    public decimal OuterDiameter { get; set; }
+        /// <summary>
+        /// 澹佸帤锛堝崟浣嶏細mm锛�
+        /// </summary>
+        public decimal WallThickness { get; set; }
 
-    /// <summary>
-    /// 澹佸帤锛堝崟浣嶏細mm锛�
-    /// </summary>
-    public decimal WallThickness { get; set; }
+        /// <summary>
+        /// 鏉愯川锛堝锛�304涓嶉攬閽級
+        /// </summary>
+        public string? MaterialQuality { get; set; }
 
-    /// <summary>
-    /// 鏉愯川锛堝锛�304涓嶉攬閽級
-    /// </summary>
-    public string MaterialQuality { get; set; }
+        /// <summary>
+        /// 闀垮害锛堝崟浣嶏細m锛�
+        /// </summary>
+        public decimal Length { get; set; }
 
-    /// <summary>
-    /// 闀垮害锛堝崟浣嶏細m锛�
-    /// </summary>
-    public decimal Length { get; set; }
+        /// <summary>
+        /// 鏄惁涓轰富鏀
+        /// </summary>
+        public YesNoEnum IsMainBranch { get; set; }
 
-    /// <summary>
-    /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�
-    /// </summary>
-    public YesNoEnum IsMainBranch { get; set; }
+        /// <summary>
+        /// 鐢熶骇宸ュ巶
+        /// </summary>
+        public string? Factory { get; set; }
 
-    /// <summary>
-    /// 鐢熶骇宸ュ巶
-    /// </summary>
-    public string Factory { get; set; }
+        /// <summary>
+        /// 璇佷功缂栧彿
+        /// </summary>
+        public string? Certification { get; set; }
 
-    /// <summary>
-    /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級
-    /// </summary>
-    public string Certification { get; set; }
+        /// <summary>
+        /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+        /// </summary>
+        public string? RedundantField1 { get; set; }
 
-    /// <summary>
-    /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
-    /// </summary>
-    public string RedundantField1 { get; set; }
+        /// <summary>
+        /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+        /// </summary>
+        public string? RedundantField2 { get; set; }
 
-    /// <summary>
-    /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
-    /// </summary>
-    public string RedundantField2 { get; set; }
+        /// <summary>
+        /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+        /// </summary>
+        public string? RedundantField3 { get; set; }
 
-    /// <summary>
-    /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
-    /// </summary>
-    public string RedundantField3 { get; set; }
-    /// <summary>
-    /// 澶囨敞
-    /// </summary>
-    public virtual string Remark { get; set; }
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        public int Sort { get; set; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WmsMaterialCreateOrUpdateDtoBase"/> class.
-    /// </summary>
-    public WmsMaterialCreateOrUpdateDtoBase() : base(false)
-    {
-    }
-}
+        /// <summary>
+        /// 澶囨敞
+        /// </summary>
+        public string? Remark { get; set; }
+
+        /// <summary>
+        /// 鏄惁绂佺敤
+        /// </summary>
+        public bool? IsDisabled { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string? CreatorId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string? LastModifierId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? DeletionTime { get; set; }
+
+        /// <summary>
+        /// 鍨嬪彿
+        /// </summary>
+        public string? MaterialModel { get; set; }
+
+ 
+ 
+    /// <summary> 
+    /// Initializes a new instance of the <see cref="WmsMaterialCreateOrUpdateDtoBase"/> class. 
+    /// </summary> 
+    public WmsMaterialCreateOrUpdateDtoBase() : base(false) 
+    { 
+    } 
+} 

--
Gitblit v1.9.3