From 504eb4e5d48557eac2bcf233452e44964f0e0640 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:06:51 +0800
Subject: [PATCH] 冲突
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
index 20ae282..64fea4b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
@@ -5,7 +6,7 @@
/// <summary>
/// WmsPlace鏌ヨ鍙傛暟瀵硅薄
/// </summary>
-public class GetWmsPlacesInput : ExtensiblePagedAndSortedResultRequestDto
+public class GetWmsMaterialInfoInput : ExtensiblePagedAndSortedResultRequestDto
{
/// <summary>
/// Gets or sets the filter.
@@ -16,4 +17,54 @@
/// Gets or sets the name.
/// </summary>
public string Name { get; set; }
+
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public virtual string PlaceNo { get; set; }
+
+ /// <summary>
+ /// 璐т綅绫诲瀷
+ /// </summary>
+ public PlaceTypeEnum? StorageTypeNo { get; set; }
+
+ /// <summary>
+ /// 璐т綅鐘舵��
+ /// </summary>
+ public PlaceStatusEnum? PlaceStatus { get; set; }
+
+ /// <summary>
+ /// 鎵�鍦ㄥ簱鍖�
+ /// </summary>
+ public string AreaCode { get; set; }
+
+ /// <summary>
+ /// 宸烽亾
+ /// </summary>
+ public int? Aisle { get; set; }
+
+ /// <summary>
+ /// 鎺�
+ /// </summary>
+ public int? RowNo { get; set; }
+
+ /// <summary>
+ /// 鍒�
+ /// </summary>
+ public int? ColumnNo { get; set; }
+
+ /// <summary>
+ /// 灞�
+ /// </summary>
+ public int? LayerNo { get; set; }
+
+ /// <summary>
+ /// 鏄惁閿佸畾
+ /// </summary>
+ public YesNoEnum? Islock { get; set; }
+
+ /// <summary>
+ /// 鏄惁绌烘墭
+ /// </summary>
+ public YesNoEnum? EmptyContainer { get; set; }
}
--
Gitblit v1.9.3