1.解决TCP添加失败问题
2.所有搜索记录倒叙排 3.优化:出入记录、库存记录增加货架类型分类查询 4.权限 5.优化下载app二维码
This commit is contained in:
@ -29,6 +29,7 @@ using WCS.Model.ApiModel.Stocktaking;
|
||||
using WCS.Model.ApiModel.InOutRecord;
|
||||
using System.Collections.ObjectModel;
|
||||
using static 货架标准上位机.ViewModel.InOutRecordViewModel;
|
||||
using WCS.Model.ApiModel.Home;
|
||||
|
||||
namespace 货架标准上位机.ViewModel
|
||||
{
|
||||
@ -36,7 +37,46 @@ namespace 货架标准上位机.ViewModel
|
||||
{
|
||||
public InOutRecordViewModel()
|
||||
{
|
||||
InitShelfTypeItems();
|
||||
}
|
||||
|
||||
private List<ShelfTypeModel> shelfTypeItems;
|
||||
public List<ShelfTypeModel> ShelfTypeItems
|
||||
{
|
||||
get { return shelfTypeItems; }
|
||||
set
|
||||
{
|
||||
SetProperty(ref shelfTypeItems, value);
|
||||
}
|
||||
}
|
||||
|
||||
private ShelfTypeModel selectedShelfTypeItem;
|
||||
public ShelfTypeModel SelectedShelfTypeItem
|
||||
{
|
||||
get { return selectedShelfTypeItem; }
|
||||
set
|
||||
{
|
||||
SetProperty(ref selectedShelfTypeItem, value);
|
||||
}
|
||||
}
|
||||
|
||||
public void InitShelfTypeItems()
|
||||
{
|
||||
//调用接口更新!
|
||||
Task.Run(() =>
|
||||
{
|
||||
var body = new RequestBase()
|
||||
{
|
||||
UserName = LocalStatic.CurrentUser,
|
||||
DeviceType = LocalFile.Config.DeviceType,
|
||||
};
|
||||
|
||||
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<ShelfTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
|
||||
if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0)
|
||||
{
|
||||
ShelfTypeItems = Result.Data.Lists;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void InitMatCode()
|
||||
@ -195,7 +235,7 @@ namespace 货架标准上位机.ViewModel
|
||||
public class DirectionItem
|
||||
{
|
||||
public string Text { get; set; }
|
||||
public object Value { get; set; }
|
||||
public object Value { get; set; }
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
@ -240,6 +280,8 @@ namespace 货架标准上位机.ViewModel
|
||||
StoreCode = StoreCode,
|
||||
Direction = SelectedDirection,
|
||||
|
||||
ShelfTypeId = SelectedShelfTypeItem == null ? 0 : SelectedShelfTypeItem.Id,
|
||||
|
||||
UserName = LocalStatic.CurrentUser,
|
||||
DeviceType = LocalFile.Config.DeviceType,
|
||||
PageNumber = CurrentPage,
|
||||
|
Reference in New Issue
Block a user