From 1acfd0dc4f695165dab633b5f45acc48047eb1b6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 11:22:01 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 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/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 82b2e91..d8190e5 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"
@@ -1,4 +1,5 @@
-锘縰sing CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
@@ -17,9 +18,34 @@
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>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
@@ -137,50 +163,85 @@
public bool? IsDisabled { get; set; }
/// <summary>
- ///
+ /// 鎵╁睍灞炴��
/// </summary>
public ExtraPropertyDictionary? ExtraProperties { get; set; }
/// <summary>
- ///
+ /// 骞跺彂鎴�
/// </summary>
public string? ConcurrencyStamp { get; set; }
/// <summary>
- ///
+ /// 鍒涘缓鏃堕棿
/// </summary>
public DateTime CreationTime { get; set; }
/// <summary>
- ///
+ /// 鍒涘缓浜篒D
/// </summary>
public string? CreatorId { get; set; }
/// <summary>
- ///
+ /// 淇敼鏃堕棿
/// </summary>
public DateTime? LastModificationTime { get; set; }
/// <summary>
- ///
+ /// 淇敼浜篒D
/// </summary>
public string? LastModifierId { get; set; }
/// <summary>
- ///
+ /// 鏄惁鍒犻櫎
/// </summary>
public bool IsDeleted { get; set; }
/// <summary>
- ///
+ /// 鍒犻櫎浜篒D
/// </summary>
public string? DeleterId { get; set; }
/// <summary>
- ///
+ /// 鍒犻櫎鏃堕棿
/// </summary>
public DateTime? DeletionTime { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string? LastModifierName { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔澶囨敞
+ /// </summary>
+ public string? OperationRemark { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞
+ /// </summary>
+ public string? DeleteRemark { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ public string? ExtraField1 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ public string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public string? ExtraField3 { get; set; }
+
/// <summary>
--
Gitblit v1.9.3