From becbbb4135880b054e20153e889a3932bae679b9 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 16:59:55 +0800
Subject: [PATCH] 库存查询
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStockDto.cs | 146 +++++++++++++++++++++++++++++++++---------------
1 files changed, 100 insertions(+), 46 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStockDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStockDto.cs
index 6694562..0f61b6a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStockDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStockDto.cs
@@ -1,30 +1,31 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CmsQueryExtensions;
-using System.Runtime.CompilerServices;
using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
+
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
-/// <summary>
-/// WmsMaterialStock鏁版嵁鍙傛暟瀵硅薄
-/// </summary>
+/// <summary>
+/// 鍑哄叆搴撳崟鎹鎯呮暟鎹弬鏁板璞�
+/// </summary>
public class WmsMaterialStockDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
{
/// <summary>
- /// 缂栧彿
+ /// 鐗╂枡ID
/// </summary>
- public virtual string MaterialId { get; set; }
+ public string MaterialId { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 鐗╂枡鍚嶇О
/// </summary>
- public virtual string MaterialName { get; set; }
+ public string MaterialName { get; set; }
/// <summary>
/// 瀹瑰櫒缂栧彿
/// </summary>
- public string ContainerNo { get; set; }
+ public string? ContainerNo { get; set; }
/// <summary>
/// 瀹瑰櫒鐘舵��
@@ -32,7 +33,7 @@
public ContainerStatusEnum ContainerStatus { get; set; }
/// <summary>
- /// 鎵樼洏鐘舵��
+ /// 瀹瑰櫒鐘舵��
/// </summary>
public string ContainerStatusDesc
{
@@ -41,14 +42,13 @@
return GetEnumDescriptionUtil.GetEnumDescription(ContainerStatus);
}
}
-
/// <summary>
/// 瀹瑰櫒绫诲瀷
/// </summary>
public ContainerTypeEnum ContainerType { get; set; }
/// <summary>
- /// 鎵樼洏绫诲瀷
+ /// 瀹瑰櫒绫诲瀷
/// </summary>
public string ContainerTypeDesc
{
@@ -57,8 +57,6 @@
return GetEnumDescriptionUtil.GetEnumDescription(ContainerType);
}
}
-
-
/// <summary>
/// 鐗╂枡缂栧彿
/// </summary>
@@ -72,30 +70,30 @@
/// <summary>
/// 鐗╂枡鎵规
/// </summary>
- public string MaterialBatch { get; set; }
+ public string? MaterialBatch { get; set; }
/// <summary>
/// 渚涘簲鍟嗙紪鍙�
/// </summary>
- public string SupplierCode { get; set; }
+ public string? SupplierCode { get; set; }
/// <summary>
- /// 鏈哄瀷
+ /// 鏈哄瀷/瑙勬牸
/// </summary>
- public string MaterialModel { get; set; }
+ public string? MaterialModel { get; set; }
/// <summary>
/// 搴撲綅缂栧彿
/// </summary>
- public string PlaceNo { get; set; }
+ public string? PlaceNo { get; set; }
/// <summary>
- /// 搴撲綅鐘舵��
+ /// 搴撲綅鐘舵��;
/// </summary>
public PlaceStatusEnum PlaceStatus { get; set; }
/// <summary>
- /// 璐т綅鐘舵��
+ /// 搴撲綅鐘舵��;
/// </summary>
public string PlaceStatusDesc
{
@@ -104,15 +102,13 @@
return GetEnumDescriptionUtil.GetEnumDescription(PlaceStatus);
}
}
-
-
/// <summary>
- /// 搴撲綅绫诲瀷缂栧彿
+ /// 搴撲綅绫诲瀷
/// </summary>
public PlaceTypeEnum StorageTypeNo { get; set; }
/// <summary>
- /// 璐т綅绫诲瀷
+ /// 搴撲綅绫诲瀷
/// </summary>
public string StorageTypeNoDesc
{
@@ -121,40 +117,39 @@
return GetEnumDescriptionUtil.GetEnumDescription(StorageTypeNo);
}
}
-
/// <summary>
/// 鍖哄煙缂栧彿
/// </summary>
- public string AreaCode { get; set; }
+ public string? AreaCode { get; set; }
/// <summary>
/// 搴撳尯鍚嶇О
/// </summary>
- public string AreaName { get; set; }
+ public string? AreaName { get; set; }
/// <summary>
- /// 妫�楠岀姸鎬�
+ /// 妫�楠岀姸鎬�(1:鏈楠�,2:妫�楠岄�氳繃,3:妫�楠屼笉閫氳繃)
/// </summary>
public MaterialCheckStatusEnum? CheckStatus { get; set; }
/// <summary>
- /// 妫�楠岀姸鎬�
+ /// 妫�楠岀姸鎬�(1:鏈楠�,2:妫�楠岄�氳繃,3:妫�楠屼笉閫氳繃)
/// </summary>
- public string CheckStatusDesc
+ public string? CheckStatusDesc
{
get
{
+ if (!CheckStatus.HasValue) { return "鏈楠�"; }
return GetEnumDescriptionUtil.GetEnumDescription(CheckStatus);
}
}
-
/// <summary>
- /// 鏄惁閿佸畾
+ /// 鏄惁閿佸畾(2:鏈攣瀹�,1:宸查攣瀹�)
/// </summary>
public YesNoEnum IsLock { get; set; }
/// <summary>
- /// 鏄惁閿佸畾
+ /// 鏄惁閿佸畾(2:鏈攣瀹�,1:宸查攣瀹�)
/// </summary>
public string IsLockDesc
{
@@ -163,14 +158,13 @@
return GetEnumDescriptionUtil.GetEnumDescription(IsLock);
}
}
-
/// <summary>
- /// 鏄惁绌烘墭
+ /// 鏄惁绌烘墭(2:鍚�,1:鏄�)
/// </summary>
- public YesNoEnum EmptyContainer { get; protected set; }
+ public YesNoEnum EmptyContainer { get; set; }
/// <summary>
- /// 鏄惁绌烘墭
+ /// 鏄惁绌烘墭(2:鍚�,1:鏄�)
/// </summary>
public string EmptyContainerDesc
{
@@ -179,7 +173,6 @@
return GetEnumDescriptionUtil.GetEnumDescription(EmptyContainer);
}
}
-
/// <summary>
/// 鍏ュ簱鏃堕棿
/// </summary>
@@ -188,27 +181,88 @@
/// <summary>
/// 鎺掑簭
/// </summary>
- public virtual int Sort { get; set; }
+ public int Sort { get; set; }
+ /// <summary>
+ /// 搴撳瓨娆″簭
+ /// </summary>
+ public int OrderInPlace { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
- public virtual string Remark { get; set; }
+ public string? Remark { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string? RedundantField1 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string? RedundantField2 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string? RedundantField3 { get; set; }
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
- public virtual bool? IsDisabled { get; set; }
+ public bool? IsDisabled { get; set; }
/// <summary>
- /// 骞跺彂鎴�
+ ///
/// </summary>
- public string ConcurrencyStamp { get; set; }
+ public ExtraPropertyDictionary? ExtraProperties { get; set; }
/// <summary>
- /// Gets the export data.
+ ///
/// </summary>
- /// <returns></returns>
+ public string? ConcurrencyStamp { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string? CreatorId { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime? LastModificationTime { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string? LastModifierId { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsDeleted { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string? DeleterId { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime? DeletionTime { get; set; }
+
+
+
+ /// <summary>
+ /// Gets the export data.
+ /// </summary>
+ /// <returns></returns>
public Dictionary<string, object> GetExportData()
{
var exportData = new Dictionary<string, object>();
--
Gitblit v1.9.3