ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/cquni-wcs/wcs

Browse Source
This commit is contained in:
hehaibing-1996
2024-05-13 09:18:59 +08:00
parent 88cbe5d052 37d58e54d9
commit 65bb836721
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WCS.BLL/Services/Service/MatInventoryDetailService.cs
View File

@ -36,6 +36,7 @@ namespace WCS.BLL.Services.Service
.WhereIF(request.StoreId != 0, (id, si) => id.StoreId == request.StoreId) .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.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(); 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(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.StoreCode), (id, si) => id.StoreCode.Contains(request.StoreCode))
.WhereIF(!string.IsNullOrEmpty(request.ShelfCode), (id, si) => si.ShelfCode.Contains(request.ShelfCode))
; ;
var records = await recordsQueryable var records = await recordsQueryable
.Skip((request.PageNumber - 1) * request.PageSize).Take(request.PageSize) .Skip((request.PageNumber - 1) * request.PageSize).Take(request.PageSize)

1
WCS.Model/ApiModel/MatInventoryDetail/GetMatInventoryDetailRequest.cs
View File

@ -25,6 +25,7 @@ namespace WCS.Model.ApiModel.MatInventoryDetail
#region 库位属性 #region 库位属性
public List<int> ShelfTypeId { get; set; } public List<int> ShelfTypeId { get; set; }
public List<int> ShelfId { get; set; } public List<int> ShelfId { get; set; }
public string ShelfCode { get; set; }
public int StoreId { get; set; } public int StoreId { get; set; }
public string StoreCode { get; set; } public string StoreCode { get; set; }
#endregion #endregion

10
货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs
View File

@ -77,6 +77,14 @@ namespace 货架标准上位机.ViewModel
} }
} }
private string shelfCode;
public string ShelfCode
{
get => shelfCode;
set { SetProperty(ref shelfCode, value); }
}
/// <summary> /// <summary>
/// 物料编码 /// 物料编码
/// </summary> /// </summary>
@ -207,6 +215,8 @@ namespace 货架标准上位机.ViewModel
MatCode = MatCode, MatCode = MatCode,
StoreCode = StoreCode, StoreCode = StoreCode,
ShelfCode = ShelfCode,
UserName = LocalStatic.CurrentUser, UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType, DeviceType = LocalFile.Config.DeviceType,
PageNumber = CurrentPage, PageNumber = CurrentPage,

7
货架标准上位机/Views/MatInventoryDetailView.xaml
View File

@ -43,6 +43,13 @@
FontSize="18" FontSize="18"
IsEditable="True"/> 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" <TextBlock Grid.Row="1" Grid.Column="0" Margin="5"
VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right"
Text="物料编码：" FontSize="18" ></TextBlock> Text="物料编码：" FontSize="18" ></TextBlock>