From 37d58e54d96a6840db299b6178872462b925f552 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Mon, 13 May 2024 09:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=A2=9E=E5=8A=A0=E8=B4=A7=E6=9E=B6=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WCS.BLL/Services/Service/MatInventoryDetailService.cs  |  2 ++
 .../MatInventoryDetail/GetMatInventoryDetailRequest.cs |  1 +
 .../ViewModels/MatInventoryDetailViewModel.cs          | 10 ++++++++++
 货架标准上位机/Views/MatInventoryDetailView.xaml       |  7 +++++++
 4 files changed, 20 insertions(+)

diff --git a/WCS.BLL/Services/Service/MatInventoryDetailService.cs b/WCS.BLL/Services/Service/MatInventoryDetailService.cs
index 126c1b1..c5e0ace 100644
--- a/WCS.BLL/Services/Service/MatInventoryDetailService.cs
+++ b/WCS.BLL/Services/Service/MatInventoryDetailService.cs
@@ -36,6 +36,7 @@ namespace WCS.BLL.Services.Service
 
                                                    .WhereIF(request.StoreId != 0, (id, si) => id.StoreId == request.StoreId)
                                                    .WhereIF(!string.IsNullOrEmpty(request.StoreCode), (id, si) => id.StoreCode.Contains(request.StoreCode))
+                                                   .WhereIF(!string.IsNullOrEmpty(request.ShelfCode), (id, si) => si.ShelfCode.Contains(request.ShelfCode))
                                                    ;
 
                 var totalCount = await recordsQueryable.CountAsync();
@@ -90,6 +91,7 @@ namespace WCS.BLL.Services.Service
 
                                          .WhereIF(request.StoreId != 0, (id, si) => id.StoreId == request.StoreId)
                                          .WhereIF(!string.IsNullOrEmpty(request.StoreCode), (id, si) => id.StoreCode.Contains(request.StoreCode))
+                                         .WhereIF(!string.IsNullOrEmpty(request.ShelfCode), (id, si) => si.ShelfCode.Contains(request.ShelfCode))
                                          ;
                 var records = await recordsQueryable
                                     .Skip((request.PageNumber - 1) * request.PageSize).Take(request.PageSize)
diff --git a/WCS.Model/ApiModel/MatInventoryDetail/GetMatInventoryDetailRequest.cs b/WCS.Model/ApiModel/MatInventoryDetail/GetMatInventoryDetailRequest.cs
index eed4b9b..47d85e4 100644
--- a/WCS.Model/ApiModel/MatInventoryDetail/GetMatInventoryDetailRequest.cs
+++ b/WCS.Model/ApiModel/MatInventoryDetail/GetMatInventoryDetailRequest.cs
@@ -25,6 +25,7 @@ namespace WCS.Model.ApiModel.MatInventoryDetail
         #region 库位属性
         public List<int> ShelfTypeId { get; set; }
         public List<int> ShelfId { get; set; }
+        public string ShelfCode { get; set; }
         public int StoreId { get; set; }
         public string StoreCode { get; set; }
         #endregion
diff --git a/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs b/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs
index 8d133b6..4c280c2 100644
--- a/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs
+++ b/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs
@@ -77,6 +77,14 @@ namespace 货架标准上位机.ViewModel
             }
         }
 
+        private string shelfCode;
+        public string ShelfCode
+        {
+            get => shelfCode;
+            set { SetProperty(ref shelfCode, value); }
+        }
+
+
         /// <summary>
         /// 物料编码
         /// </summary>
@@ -207,6 +215,8 @@ namespace 货架标准上位机.ViewModel
                     MatCode = MatCode,
                     StoreCode = StoreCode,
 
+                    ShelfCode = ShelfCode,
+
                     UserName = LocalStatic.CurrentUser,
                     DeviceType = LocalFile.Config.DeviceType,
                     PageNumber = CurrentPage,
diff --git a/货架标准上位机/Views/MatInventoryDetailView.xaml b/货架标准上位机/Views/MatInventoryDetailView.xaml
index db90403..7138400 100644
--- a/货架标准上位机/Views/MatInventoryDetailView.xaml
+++ b/货架标准上位机/Views/MatInventoryDetailView.xaml
@@ -43,6 +43,13 @@
                               FontSize="18" 
                               IsEditable="True"/>
 
+                    <TextBlock  Grid.Row="0" Grid.Column="2" Margin="5"
+                             VerticalAlignment="Center" HorizontalAlignment="Right" 
+                             Text="货架编码：" FontSize="18" ></TextBlock>
+                    <TextBox  Grid.Row="0" Grid.Column="3" Text="{Binding ShelfCode}"
+                             VerticalAlignment="Center" HorizontalAlignment="Left" 
+                             FontSize="18" MinWidth="120" ></TextBox>
+
                     <TextBlock Grid.Row="1" Grid.Column="0" Margin="5"
                         VerticalAlignment="Center" HorizontalAlignment="Right" 
                         Text="物料编码：" FontSize="18" ></TextBlock>