From 14f9c8378bde7d9a8d8f1fcc393e0e8d49eced82 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 09 5月 2025 17:44:29 +0800
Subject: [PATCH] 查找空库位，查找库存
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs
index 11de0a0..e7512b7 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs
@@ -1,4 +1,5 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
@@ -12,7 +13,7 @@
/// <summary>
/// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
/// </summary>
- public string MaterialCode { get; set; }
+ public string MaterialNo { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
@@ -25,9 +26,31 @@
public PurchaseTypeEnum PurchaseType { get; set; }
/// <summary>
+ /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ public string PurchaseTypeDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(PurchaseType);
+ }
+ }
+
+ /// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
/// </summary>
public MaterialTypeEnum MaterialType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ public string MaterialTypeDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(MaterialType);
+ }
+ }
/// <summary>
/// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
@@ -60,11 +83,26 @@
public decimal Length { get; set; }
/// <summary>
- /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�
+ /// 鏄惁涓轰富鏀锛�1: 涓绘敮绠�, 2: 闈炰富鏀锛�
/// </summary>
- public bool IsMainBranch { get; set; }
+ public YesNoEnum IsMainBranch { get; set; }
/// <summary>
+ /// 鏄惁涓轰富鏀
+ /// </summary>
+ public string IsMainBranchDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(IsMainBranch);
+ }
+ }
+
+ /// <summary>
+ /// 鍨嬪彿
+ /// </summary>
+ public string MaterialModel { get; set; }
+ /// <summary>
/// 鐢熶骇宸ュ巶
/// </summary>
public string Factory { get; set; }
--
Gitblit v1.9.3