From f99638e9d69cce5d0bbb7b99cbaff2f758c3c810 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 10:25:17 +0800
Subject: [PATCH] 物料类型

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs |   81 ++++++++++++++++++++++++++++++----------
 1 files changed, 61 insertions(+), 20 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..2a9b91f 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,13 +1,19 @@
 using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using System;
 using Volo.Abp.Application.Dtos;
 
 namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
 
-/// <summary>
-/// WmsMaterial鍒涘缓鎴栨洿鏂板熀绫�
-/// </summary>
+/// <summary> 
+/// 鐗╂枡鍩虹淇℃伅鍒涘缓鎴栨洿鏂板熀绫� 
+/// </summary> 
 public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto
 {
+    /// <summary>
+    /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
+    /// </summary>
+    public string MaterialCode { get; set; }
+
     /// <summary>
     /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
     /// </summary>
@@ -19,10 +25,6 @@
     public string MaterialName { get; set; }
 
     /// <summary>
-    /// 鍨嬪彿
-    /// </summary>
-    public string MaterialModel { get; set; }
-    /// <summary>
     /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
     /// </summary>
     public PurchaseTypeEnum PurchaseType { get; set; }
@@ -30,17 +32,23 @@
     /// <summary>
     /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
     /// </summary>
-    public MaterialTypeEnum MaterialType { get; set; }
+    public string MaterialTypeCode { get; set; }
+
+
+    /// <summary>
+    /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+    /// </summary>
+    public string MaterialTypeDesc { get; set; }
 
     /// <summary>
     /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
     /// </summary>
-    public string PrimaryUnit { get; set; }
+    public string? PrimaryUnit { get; set; }
 
     /// <summary>
     /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
     /// </summary>
-    public string Standard { get; set; }
+    public string? Standard { get; set; }
 
     /// <summary>
     /// 澶栧緞锛堝崟浣嶏細mm锛�
@@ -55,7 +63,7 @@
     /// <summary>
     /// 鏉愯川锛堝锛�304涓嶉攬閽級
     /// </summary>
-    public string MaterialQuality { get; set; }
+    public string? MaterialQuality { get; set; }
 
     /// <summary>
     /// 闀垮害锛堝崟浣嶏細m锛�
@@ -63,42 +71,75 @@
     public decimal Length { get; set; }
 
     /// <summary>
-    /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�
+    /// 鏄惁涓轰富鏀
     /// </summary>
     public YesNoEnum IsMainBranch { get; set; }
 
     /// <summary>
     /// 鐢熶骇宸ュ巶
     /// </summary>
-    public string Factory { get; set; }
+    public string? Factory { get; set; }
 
     /// <summary>
-    /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級
+    /// 璇佷功缂栧彿
     /// </summary>
-    public string Certification { get; set; }
+    public string? Certification { get; set; }
 
     /// <summary>
     /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
     /// </summary>
-    public string RedundantField1 { get; set; }
+    public string? RedundantField1 { get; set; }
 
     /// <summary>
     /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
     /// </summary>
-    public string RedundantField2 { get; set; }
+    public string? RedundantField2 { get; set; }
 
     /// <summary>
     /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
     /// </summary>
-    public string RedundantField3 { get; set; }
+    public string? RedundantField3 { get; set; }
+
+    /// <summary>
+    /// 鎺掑簭
+    /// </summary>
+    public int Sort { get; set; }
+
     /// <summary>
     /// 澶囨敞
     /// </summary>
-    public virtual string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="WmsMaterialCreateOrUpdateDtoBase"/> class.
+    /// 鏄惁绂佺敤
     /// </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