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

提交代码

Browse Source
This commit is contained in:
hehaibing-1996
2024-07-22 17:33:52 +08:00
parent 7b8a885669
commit 6933a10119
49 changed files with 847 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
货架标准上位机/ViewModels/InOutRecordViewModel.cs
View File

@ -381,7 +381,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

6
货架标准上位机/ViewModels/InterfaceRecordViewModel.cs
View File

@ -255,7 +255,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

2
货架标准上位机/ViewModels/MXViewModel/MXPDViewModel.cs
View File

@ -185,7 +185,7 @@ namespace 货架标准上位机.ViewModel
var Result = ApiHelp.GetDataFromHttp<ResponseCommon>(LocalFile.Config.ApiIpHost + "outStore/goInOutstore", body, "POST");
if (Result != null && Result.Code == 200)
{
Growl.Warning("已成功开始出库！");
Growl.Warning("已成功开始盘点！");
RefreshDataGridItemSource();
}
else if (Result != null)

6
货架标准上位机/ViewModels/MatBaseInfoViewModel.cs
View File

@ -439,7 +439,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

6
货架标准上位机/ViewModels/MatInfoViewModel.cs
View File

@ -372,7 +372,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

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

@ -78,6 +78,10 @@ namespace 货架标准上位机.ViewModel
set { SetProperty(ref shelfCode, value); }
}
private string totalQtyStr;
public string TotalQtyStr { get => totalQtyStr; set { SetProperty(ref totalQtyStr, value); } }
/// <summary>
/// 物料编码
@ -220,6 +224,8 @@ namespace 货架标准上位机.ViewModel
MatName = string.Empty;
MatSN = string.Empty;
StoreCode = string.Empty;
ShelfCode = string.Empty;
MatBatch = string.Empty;
}
public ICommand BtnSearchCommand { get => new DelegateCommand(BtnSearchReset); }
@ -261,6 +267,11 @@ namespace 货架标准上位机.ViewModel
DataGridItemSource = Result.Data.Lists;
MaxPage = Result.Data.MaxPage;
TotalCount = Result.Data.TotalCount;
TotalQtyStr = "物料总数量" + Result.Message;
}
else
{
TotalQtyStr = string.Empty;
}
}
catch (Exception ex)
@ -331,6 +342,9 @@ namespace 货架标准上位机.ViewModel
MatCode = MatCode,
StoreCode = StoreCode,
ShelfTypeId = SelectedShelfTypeItem == null ? 0 : SelectedShelfTypeItem.Id,
ShelfCode = ShelfCode,
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
PageNumber = 1,
@ -429,6 +443,9 @@ namespace 货架标准上位机.ViewModel
MatCode = MatCode,
StoreCode = StoreCode,
ShelfTypeId = SelectedShelfTypeItem == null ? 0 : SelectedShelfTypeItem.Id,
ShelfCode = ShelfCode,
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
PageNumber = CurrentPage,
@ -543,7 +560,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

6
货架标准上位机/ViewModels/ModuleInfoViewModel.cs
View File

@ -279,7 +279,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

6
货架标准上位机/ViewModels/OutInventoryDocumentViewModel.cs
View File

@ -468,7 +468,11 @@ namespace 货架标准上位机.ViewModels
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

3
货架标准上位机/ViewModels/OutInventoryViewModel.cs
View File

@ -277,7 +277,8 @@ namespace 货架标准上位机.ViewModel
{
if (Result.Data.Count > 0)
{
DataGridItemSource = new ObservableCollection<OutOrderMatDetailModel>(Result.Data);
var list = Result.Data.OrderBy(t => t.IsSended).ToList();
DataGridItemSource = new ObservableCollection<OutOrderMatDetailModel>(list);
OrderStatus = Result.Message;
}
else

6
货架标准上位机/ViewModels/ShelfInfoViewModel.cs
View File

@ -254,7 +254,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

7
货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs
View File

@ -292,6 +292,7 @@ namespace 货架标准上位机.ViewModels
{
//成功后直接跳转
MainWindow1.viewModel.GoToStockTakingView = true;
MainWindow2.viewModel.SelectedValue = "物料盘点";
Growl.Success("已跳转到物料盘点页面！");
}
else if (Result != null)
@ -452,7 +453,11 @@ namespace 货架标准上位机.ViewModels
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}

14
货架标准上位机/ViewModels/StocktakingViewModel.cs
View File

@ -254,6 +254,7 @@ namespace 货架标准上位机.ViewModel
if (SelectedOutOrder == null)
{
//选择的单据为空无法进行查询
Logs.Write("选择的单据为空无法进行查询!");
return;
}
#region 调用接口获取盘点单物料明细
@ -261,21 +262,26 @@ namespace 货架标准上位机.ViewModel
{
var body = new GetStockTakingOrderMatDetailRequest()
{
StockTakingOrderId = selectedOutOrder.Id,
StockTakingOrderNumber = selectedOutOrder.StocktakingOrderNumber,
StockTakingOrderId = SelectedOutOrder.Id,
StockTakingOrderNumber = SelectedOutOrder.StocktakingOrderNumber,
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
};
Logs.Write("[刷新盘点明细1]!");
var Result = ApiHelp.GetDataFromHttp<ResponseCommon<List<StockTakingOrderMatDetailModel>>>(LocalFile.Config.ApiIpHost + "stockTaking/getStockTakingOrderMatDetail", body, "POST");
if (Result != null && Result.Code == 200)
{
Logs.Write("[刷新盘点明细]Result != null && Result.Code == 200!");
if (Result.Data.Count > 0)
{
DataGridItemSource = new ObservableCollection<StockTakingOrderMatDetailModel>(Result.Data);
Logs.Write("[刷新盘点明细2]Result.Data.Count>0");
var list = Result.Data.OrderBy(t => t.IsStocktaking).ToList();
DataGridItemSource = new ObservableCollection<StockTakingOrderMatDetailModel>(list);
}
else
{
Logs.Write("[刷新盘点明细2]Result.Data.Count<=0,该单据未查询到盘点明细");
App.Current.Dispatcher.Invoke(() =>
{
DataGridItemSource?.Clear();
@ -286,10 +292,12 @@ namespace 货架标准上位机.ViewModel
}
else if (Result != null)
{
Logs.Write("[刷新盘点明细2]Result != null");
Growl.Warning(Result.Message);
}
else
{
Logs.Write("[刷新盘点明细2]调用接口失败");
Growl.Warning("调用接口失败！");
}
});

6
货架标准上位机/ViewModels/StoreInfoViewModel.cs
View File

@ -263,7 +263,11 @@ namespace 货架标准上位机.ViewModel
public int PageSize
{
get => pageSize;
set { SetProperty(ref pageSize, value); }
set
{
SetProperty(ref pageSize, value);
BtnSearch(true);
}
}