提交代码
@ -25,7 +25,7 @@ namespace 货架标准上位机
|
||||
}
|
||||
else
|
||||
{
|
||||
MainWindow = new MainWindow1();
|
||||
MainWindow = new MainWindow2();
|
||||
}
|
||||
MainWindow.ShowDialog();
|
||||
|
||||
|
@ -95,6 +95,8 @@ namespace 货架标准上位机
|
||||
/// 登录历史
|
||||
/// </summary>
|
||||
public List<string> SaveLogin { get; set; }
|
||||
|
||||
public string LastSaveLoginPassword { get; set; }
|
||||
/// <summary>
|
||||
/// 登录历史数量
|
||||
/// </summary>
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
BIN
货架标准上位机/Resources/入库.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
货架标准上位机/Resources/出库.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.3 KiB |
BIN
货架标准上位机/Resources/查询.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 610 B |
BIN
货架标准上位机/Resources/物料.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
BIN
货架标准上位机/Resources/盘点.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 3.1 KiB |
BIN
货架标准上位机/Resources/调试.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
货架标准上位机/Resources/货架.png
Normal file
After Width: | Height: | Size: 839 B |
@ -381,7 +381,11 @@ namespace 货架标准上位机.ViewModel
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -255,7 +255,11 @@ namespace 货架标准上位机.ViewModel
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -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)
|
||||
|
@ -439,7 +439,11 @@ namespace 货架标准上位机.ViewModel
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -372,7 +372,11 @@ namespace 货架标准上位机.ViewModel
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -279,7 +279,11 @@ namespace 货架标准上位机.ViewModel
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -468,7 +468,11 @@ namespace 货架标准上位机.ViewModels
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -254,7 +254,11 @@ namespace 货架标准上位机.ViewModel
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -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("调用接口失败!");
|
||||
}
|
||||
});
|
||||
|
@ -263,7 +263,11 @@ namespace 货架标准上位机.ViewModel
|
||||
public int PageSize
|
||||
{
|
||||
get => pageSize;
|
||||
set { SetProperty(ref pageSize, value); }
|
||||
set
|
||||
{
|
||||
SetProperty(ref pageSize, value);
|
||||
BtnSearch(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -10,10 +10,10 @@
|
||||
xmlns:pi="https://github.com/ping9719/wpfex"
|
||||
d:DesignHeight="737" d:DesignWidth="1192" LoadedVisibleFirst="loadFir" IsVisibleChanged="vis">
|
||||
<Border Margin="0" Background="AliceBlue" CornerRadius="3" Padding="0">
|
||||
<Grid Height="737" VerticalAlignment="Top">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="7*"/>
|
||||
<RowDefinition Height="4*"/>
|
||||
<RowDefinition Height="2*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
|
||||
</Grid.RowDefinitions>
|
||||
<!--内容区-->
|
||||
@ -27,12 +27,12 @@
|
||||
</Border>
|
||||
<!--</Grid>-->
|
||||
<!--消息区-->
|
||||
<Border Grid.Row="1" Margin="5,5,5,5" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3">
|
||||
<Grid>
|
||||
<Border Grid.Row="1" Margin="5" Height="auto" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3">
|
||||
<!--<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<!--<ColumnDefinition Width="4*"/>-->
|
||||
--><!--<ColumnDefinition Width="4*"/>--><!--
|
||||
<ColumnDefinition Width="6*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
</Grid.ColumnDefinitions>-->
|
||||
<!--报警--><!--
|
||||
<GroupBox Grid.Column="0" Background="White" Padding="0" Style="{StaticResource GroupBoxTab}" Margin="5,5,5,5">
|
||||
<GroupBox.Header>
|
||||
@ -54,7 +54,7 @@
|
||||
</GroupBox.Header>
|
||||
<pi:TextBoxLog Token="selfCheck" Style="{StaticResource TextBoxExtend.Multi}" Margin="-1" hc:InfoElement.Placeholder="没有日志信息" Foreground="CornflowerBlue"></pi:TextBoxLog>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
<!--</Grid>-->
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
|
@ -112,11 +112,9 @@
|
||||
<Setter Property="Background" Value="CadetBlue"/>
|
||||
</MultiTrigger>
|
||||
<DataTrigger Binding="{Binding IsOuting}" Value="True">
|
||||
<!--<Setter Property="Background" Value="Green"/>-->
|
||||
<Setter Property="Foreground" Value="Red" />
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding IsOuting}" Value="False">
|
||||
<!--<Setter Property="Background" Value="White"/>-->
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
|
@ -97,107 +97,260 @@
|
||||
</ResourceDictionary>
|
||||
</hc:SideMenu.Resources>
|
||||
<!--列表-->
|
||||
<hc:SideMenuItem Header="主页" Tag="主页" IsSelected="True" MinWidth="140">
|
||||
<!--<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/主页.png"/>
|
||||
</hc:SideMenuItem.Icon>-->
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="设备" Tag="设备" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem Header="主页" IsSelected="True" MinWidth="140">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/模式.png"/>
|
||||
<Image Source="/Resources/主页.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="PLC手动" Tag="PLC">
|
||||
<hc:SideMenuItem Header="主页" Tag="主页">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="扫码枪" Tag="扫码枪">
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="入库" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/入库.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="物料入库" Tag="物料入库">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
|
||||
<hc:SideMenuItem Header="出库" >
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/出库.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="出库单据" Tag="出库单据">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="物料出库" Tag="物料出库">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
|
||||
<hc:SideMenuItem Header="盘点" >
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/盘点.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="盘点单据" Tag="盘点单据">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="物料盘点" Tag="物料盘点">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
|
||||
<hc:SideMenuItem Header="查询" Tag="查询" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/查询.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="库存查询" Tag="库存查询" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="出入记录" Tag="出入记录" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
|
||||
<hc:SideMenuItem Header="库位" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/货架.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="货架管理" Tag="货架管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="模组管理" Tag="模组管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="库位管理" Tag="库位管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
|
||||
<hc:SideMenuItem Header="物料" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/物料.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
|
||||
<hc:SideMenuItem Header="物料维护" Tag="物料维护" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
|
||||
<hc:SideMenuItem Header="物料明细" Tag="物料明细" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="数据" Tag="数据" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/数据.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="统计信息" Tag="统计">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="详情信息" Tag="详情">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="权限" Tag="权限" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
|
||||
|
||||
<hc:SideMenuItem Header="权限" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/权限.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="用户" Tag="用户" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
|
||||
<hc:SideMenuItem Header="角色管理" Tag="角色管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="角色" Tag="角色" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
|
||||
<hc:SideMenuItem Header="用户管理" Tag="用户管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="设置" Tag="设置" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.设置},Converter={StaticResource AuthVisConverter}}">
|
||||
|
||||
<hc:SideMenuItem Header="调试" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<Image Source="/Resources/设置.png"/>
|
||||
<Image Source="/Resources/调试.png"/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
<hc:SideMenuItem Header="调试" Tag="调试" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="设置" Tag="设置" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
<hc:SideMenuItem Header="接口记录" Tag="接口记录" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
|
||||
<hc:SideMenuItem.Icon>
|
||||
<TextBlock Text=""/>
|
||||
</hc:SideMenuItem.Icon>
|
||||
</hc:SideMenuItem>
|
||||
</hc:SideMenuItem>
|
||||
|
||||
</hc:SideMenu>
|
||||
</hc:TransitioningContentControl>
|
||||
</Border>
|
||||
<!--内容-->
|
||||
<Border Margin="0,3,5,3" Grid.Column="1" Style="{StaticResource BorderRegion}" Padding="0" BorderThickness="1">
|
||||
<TabControl Style="{x:Null}" Margin="1,-3,1,1" BorderThickness="0" SelectedValue="{Binding SelectedValue}" SelectedValuePath="Header" PreviewKeyDown="tabControl_PreviewKeyDown">
|
||||
<TabItem Header="主页" IsSelected="True" Height="{Binding TabItemHeight}">
|
||||
<TabItem Header="主页" IsSelected="True" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:HomeView />
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="PLC" Height="{Binding TabItemHeight}">
|
||||
|
||||
<TabItem Header="物料入库" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:DeviceView />
|
||||
<View:InInventoryView />
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="扫码枪" Height="{Binding TabItemHeight}">
|
||||
|
||||
<TabItem Header="出库单据" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<pi:TextBoxScanner Style="{StaticResource TextBoxExtend}" hc:InfoElement.Placeholder="鼠标点击此处激活" hc:InfoElement.Title="码信息" hc:InfoElement.TitlePlacement="Top" AutoClear="NextClear" IsAutoFocus="True" VerticalAlignment="Top"></pi:TextBoxScanner>
|
||||
<View:OutInventoryDocumentView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="统计" Height="{Binding TabItemHeight}">
|
||||
<TabItem Header="物料出库" IsSelected="{Binding GoToOutVentoryView}" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:DataChartView/>
|
||||
<View:OutVentoryView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="详情" Height="{Binding TabItemHeight}">
|
||||
|
||||
<TabItem Header="盘点单据" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:DataListView/>
|
||||
<View:StocktakingDocumentView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="用户" Height="{Binding TabItemHeight}">
|
||||
<TabItem Header="物料盘点" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:UserView/>
|
||||
<View:StockTakingView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="角色" Height="{Binding TabItemHeight}">
|
||||
|
||||
<TabItem Header="库存查询" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:MatInventoryDetailView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="出入记录" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:InOutRecordView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
|
||||
|
||||
<TabItem Header="货架管理" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:ShelfInfoView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="模组管理" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:ModuleInfoView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="库位管理" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:StoreInfoView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
|
||||
<TabItem Header="物料维护" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:MatBaseInfoView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="物料明细" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:MatInfoView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
|
||||
<TabItem Header="角色管理" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:RoleView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="设置" Height="{Binding TabItemHeight}">
|
||||
<TabItem Header="用户管理" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:SetView />
|
||||
<View:UserView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
|
||||
|
||||
<TabItem Header="接口记录" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:InterfaceRecordView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="调试" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:DeviceView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="设置" Height="{Binding TabItemHeight}">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<View:SetView/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
|
||||
</TabControl>
|
||||
</Border>
|
||||
</Grid>
|
||||
@ -206,11 +359,6 @@
|
||||
<hc:TransitioningContentControl TransitionMode="Top2Bottom">
|
||||
<Grid>
|
||||
<StackPanel Margin="5" Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<pi:IotState Content="PLC" IsOk="False" Height="auto" Width="auto" InteriorHeight="13" Foreground="Gray" Background="Transparent"></pi:IotState>
|
||||
<pi:IotState Content="机器人" IsOk="False" Height="auto" Width="auto" InteriorHeight="13" Foreground="Gray" Background="Transparent"></pi:IotState>
|
||||
<pi:IotState Content="数据库" IsOk="False" Height="auto" Width="auto" InteriorHeight="13" Foreground="Gray" Background="Transparent"></pi:IotState>
|
||||
<pi:IotState Content="错误" IsOk="False" Height="auto" Width="auto" InteriorHeight="13" Foreground="Gray" OkBrush="PaleVioletRed" Background="Transparent"></pi:IotState>
|
||||
<pi:SyncProgressBar SyncState="OkVisible" Margin="4,0,0,0" Width="130"></pi:SyncProgressBar>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="5" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||
<TextBlock Margin="0,0" Text="{Binding Time,StringFormat=yyyy-MM-dd HH:mm:ss,FallbackValue=2000-01-01 00:00:00}" Foreground="#FF3A90C1" VerticalAlignment="Center"></TextBlock>
|
||||
|
@ -58,7 +58,7 @@
|
||||
ItemsSource="{Binding Items}"
|
||||
Text="{Binding MatCode}"
|
||||
DisplayMemberPath="MatCode"/>
|
||||
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" Margin="5"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Right"
|
||||
Text="物料名称:" FontSize="18" ></TextBlock>
|
||||
@ -126,7 +126,7 @@
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<DataGrid Grid.Row="1"
|
||||
@ -210,6 +210,9 @@
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Column="2">
|
||||
<TextBlock FontSize="14" VerticalAlignment="Center" Text="{Binding TotalQtyStr}"></TextBlock>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
@ -126,7 +126,7 @@
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel>
|
||||
<Ellipse Width="20" Height="20" Fill="LightGreen" Visibility="{Binding IsStocktaking,Converter={StaticResource Boolean2VisibilityConverter}}"></Ellipse>
|
||||
<Ellipse Width="20" Height="20" Fill="Green" Visibility="{Binding IsStocktaking,Converter={StaticResource Boolean2VisibilityConverter}}"></Ellipse>
|
||||
<Ellipse Width="20" Height="20" Fill="Gray" Visibility="{Binding IsStocktaking,Converter={StaticResource Boolean2VisibilityReConverter}}"></Ellipse>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
|
@ -42,6 +42,8 @@ namespace 货架标准上位机
|
||||
{
|
||||
ComboBoxId.ItemsSource = LocalFile.Config.Sys.SaveLogin;
|
||||
ComboBoxId.SelectedIndex = 0;
|
||||
|
||||
PasswordBoxPass.Password = LocalFile.Config.Sys.LastSaveLoginPassword;
|
||||
}
|
||||
}
|
||||
|
||||
@ -74,8 +76,8 @@ namespace 货架标准上位机
|
||||
PassWord = pass,
|
||||
IsNoLogin = false,
|
||||
};
|
||||
if (LocalFile.Config.IsMx)
|
||||
body.IsNoLogin = true;
|
||||
//if (LocalFile.Config.IsMx)
|
||||
// body.IsNoLogin = true;
|
||||
var Result = ApiHelp.GetDataFromHttp<ResponseBase<UserModel>>(LocalFile.Config.ApiIpHost + "user/userLogin",
|
||||
body, "POST");
|
||||
if (Result != null && Result.Code != 200)
|
||||
@ -99,6 +101,7 @@ namespace 货架标准上位机
|
||||
{
|
||||
LocalFile.Config.Sys.SaveLogin.RemoveAll(t => t == loginName);
|
||||
LocalFile.Config.Sys.SaveLogin.Insert(0, loginName);
|
||||
LocalFile.Config.Sys.LastSaveLoginPassword = pass;
|
||||
LocalFile.Config.Sys.SaveLogin = LocalFile.Config.Sys.SaveLogin.Take(LocalFile.Config.Sys.SaveLoginCount).ToList();
|
||||
LocalFile.SaveConfig();
|
||||
}
|
||||
|
@ -2,9 +2,9 @@
|
||||
//连接不上加:SslMode=none;
|
||||
"MySql": "server=localhost;Database=db1;Uid=root;Pwd=123456;Convert Zero Datetime=True",
|
||||
//货架服务器的IP和端口号
|
||||
"ApiIpHost": "http://192.168.9.21:8888/",
|
||||
"ApiIpHost": "http://127.0.0.1:8888/",
|
||||
//WebSocket的地址
|
||||
"WebSocketUrl": "ws://192.168.9.21:7789/ws",
|
||||
"WebSocketUrl": "ws://127.0.0.1:7789/ws",
|
||||
//货架分区
|
||||
"GroupName": [ "A0-2" ],
|
||||
//设备类型 可以配置为每个电脑不一样
|
||||
|
141
货架标准上位机/货架标准上位机 - Backup.csproj
Normal file
@ -0,0 +1,141 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<UseWPF>true</UseWPF>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<Company>重庆盟讯电子科技有限公司</Company>
|
||||
<Copyright>Copyright © 2024</Copyright>
|
||||
<AssemblyVersion>1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0</FileVersion>
|
||||
<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
|
||||
<Authors>重庆盟讯电子科技有限公司</Authors>
|
||||
<Product>货架标准上位机</Product>
|
||||
<AssemblyName>货架标准上位机</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<NoWarn>1701;1702;8601;8618;8625</NoWarn>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="Fonts\demo\**" />
|
||||
<EmbeddedResource Remove="Fonts\demo\**" />
|
||||
<None Remove="Fonts\demo\**" />
|
||||
<Page Remove="Fonts\demo\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="Fonts\iconfont.ttf" />
|
||||
<None Remove="Resources\cloud.png" />
|
||||
<None Remove="Resources\goOutInstore.png" />
|
||||
<None Remove="Resources\Logo.ico" />
|
||||
<None Remove="Resources\Logo.png" />
|
||||
<None Remove="Resources\LogoAll.zip" />
|
||||
<None Remove="Resources\LogoJd.ico" />
|
||||
<None Remove="Resources\LogoJd.png" />
|
||||
<None Remove="Resources\LogoJd2.ico" />
|
||||
<None Remove="Resources\LogoJd2.png" />
|
||||
<None Remove="Resources\主页.png" />
|
||||
<None Remove="Resources\入库.png" />
|
||||
<None Remove="Resources\权限.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="HandyControl" Version="3.5.1" />
|
||||
<PackageReference Include="LiveCharts.Wpf.Core" Version="0.9.8" />
|
||||
<PackageReference Include="MiniExcel" Version="1.31.3" />
|
||||
<PackageReference Include="MySqlConnector" Version="2.3.5" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Ping9719.WpfEx" Version="0.8.0" />
|
||||
<PackageReference Include="QRCoder" Version="1.5.1" />
|
||||
<PackageReference Include="SqlSugar" Version="5.1.4.149" />
|
||||
<PackageReference Include="SqlSugar.MySqlConnector" Version="5.1.3.42" />
|
||||
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
|
||||
<PackageReference Include="TouchSocket.Http" Version="2.0.3" />
|
||||
<PackageReference Include="TouchSocket.SerialPorts" Version="2.0.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Interop.BarTender">
|
||||
<HintPath>..\..\..\..\..\Windows\assembly\GAC_MSIL\Interop.BarTender\10.1.4.1__109ff779a1b4cbc7\Interop.BarTender.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Printing" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Resource Include="Fonts\iconfont.ttf">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
<Resource Include="Resources\cloud.png" />
|
||||
<Resource Include="Resources\goOutInstore.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
<Resource Include="Resources\Logo.ico" />
|
||||
<Resource Include="Resources\Logo.png" />
|
||||
<Resource Include="Resources\主页.png" />
|
||||
<Resource Include="Resources\入库.png" />
|
||||
<Resource Include="Resources\权限.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="data\jsconfig.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="data\操作说明书.docx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Excel\出库单据导入模板.xlsx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Excel\物料管理导入模板.xlsx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Resources\Interop.BarTender.dll">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Resources\入库.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Resources\物料条码.btw">
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Excel\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\WCS.Model\WCS.Model.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="Models\JsConfig.cs">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ScannerDisplayControl.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ProcessDialog.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ImageDialog.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Page Update="Views\MatBaseInoScanGenarateMatInfoView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="Views\ShelfInfoAddOrUpdateView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
@ -1,142 +1,150 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<UseWPF>true</UseWPF>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<Company>重庆盟讯电子科技有限公司</Company>
|
||||
<Copyright>Copyright © 2024</Copyright>
|
||||
<AssemblyVersion>1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0</FileVersion>
|
||||
<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
|
||||
<Authors>重庆盟讯电子科技有限公司</Authors>
|
||||
<Product>货架标准上位机</Product>
|
||||
<AssemblyName>货架标准上位机</AssemblyName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<UseWPF>true</UseWPF>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<Company>重庆盟讯电子科技有限公司</Company>
|
||||
<Copyright>Copyright © 2024</Copyright>
|
||||
<AssemblyVersion>1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0</FileVersion>
|
||||
<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
|
||||
<Authors>重庆盟讯电子科技有限公司</Authors>
|
||||
<Product>货架标准上位机</Product>
|
||||
<AssemblyName>货架标准上位机</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<NoWarn>1701;1702;8601;8618;8625</NoWarn>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<NoWarn>1701;1702;8601;8618;8625</NoWarn>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="Fonts\demo\**" />
|
||||
<EmbeddedResource Remove="Fonts\demo\**" />
|
||||
<None Remove="Fonts\demo\**" />
|
||||
<Page Remove="Fonts\demo\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Remove="Fonts\demo\**" />
|
||||
<EmbeddedResource Remove="Fonts\demo\**" />
|
||||
<None Remove="Fonts\demo\**" />
|
||||
<Page Remove="Fonts\demo\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="Fonts\iconfont.ttf" />
|
||||
<None Remove="Resources\cloud.png" />
|
||||
<None Remove="Resources\goOutInstore.png" />
|
||||
<None Remove="Resources\Logo.ico" />
|
||||
<None Remove="Resources\Logo.png" />
|
||||
<None Remove="Resources\LogoAll.zip" />
|
||||
<None Remove="Resources\LogoJd.ico" />
|
||||
<None Remove="Resources\LogoJd.png" />
|
||||
<None Remove="Resources\LogoJd2.ico" />
|
||||
<None Remove="Resources\LogoJd2.png" />
|
||||
<None Remove="Resources\主页.png" />
|
||||
<None Remove="Resources\数据.png" />
|
||||
<None Remove="Resources\权限.png" />
|
||||
<None Remove="Resources\模式.png" />
|
||||
<None Remove="Resources\设置.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Remove="Fonts\iconfont.ttf" />
|
||||
<None Remove="Resources\cloud.png" />
|
||||
<None Remove="Resources\goOutInstore.png" />
|
||||
<None Remove="Resources\Logo.ico" />
|
||||
<None Remove="Resources\Logo.png" />
|
||||
<None Remove="Resources\LogoAll.zip" />
|
||||
<None Remove="Resources\LogoJd.ico" />
|
||||
<None Remove="Resources\LogoJd.png" />
|
||||
<None Remove="Resources\LogoJd2.ico" />
|
||||
<None Remove="Resources\LogoJd2.png" />
|
||||
<None Remove="Resources\主页.png" />
|
||||
<None Remove="Resources\入库.png" />
|
||||
<None Remove="Resources\出库.png" />
|
||||
<None Remove="Resources\盘点.png" />
|
||||
<None Remove="Resources\查询.png" />
|
||||
<None Remove="Resources\货架.png" />
|
||||
<None Remove="Resources\物料.png" />
|
||||
<None Remove="Resources\权限.png" />
|
||||
<None Remove="Resources\调试.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="HandyControl" Version="3.5.1" />
|
||||
<PackageReference Include="LiveCharts.Wpf.Core" Version="0.9.8" />
|
||||
<PackageReference Include="MiniExcel" Version="1.31.3" />
|
||||
<PackageReference Include="MySqlConnector" Version="2.3.5" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Ping9719.WpfEx" Version="0.8.0" />
|
||||
<PackageReference Include="QRCoder" Version="1.5.1" />
|
||||
<PackageReference Include="SqlSugar" Version="5.1.4.149" />
|
||||
<PackageReference Include="SqlSugar.MySqlConnector" Version="5.1.3.42" />
|
||||
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
|
||||
<PackageReference Include="TouchSocket.Http" Version="2.0.3" />
|
||||
<PackageReference Include="TouchSocket.SerialPorts" Version="2.0.2" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="HandyControl" Version="3.5.1" />
|
||||
<PackageReference Include="LiveCharts.Wpf.Core" Version="0.9.8" />
|
||||
<PackageReference Include="MiniExcel" Version="1.31.3" />
|
||||
<PackageReference Include="MySqlConnector" Version="2.3.5" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Ping9719.WpfEx" Version="0.8.0" />
|
||||
<PackageReference Include="QRCoder" Version="1.5.1" />
|
||||
<PackageReference Include="SqlSugar" Version="5.1.4.149" />
|
||||
<PackageReference Include="SqlSugar.MySqlConnector" Version="5.1.3.42" />
|
||||
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
|
||||
<PackageReference Include="TouchSocket.Http" Version="2.0.3" />
|
||||
<PackageReference Include="TouchSocket.SerialPorts" Version="2.0.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Interop.BarTender">
|
||||
<HintPath>..\..\..\..\..\Windows\assembly\GAC_MSIL\Interop.BarTender\10.1.4.1__109ff779a1b4cbc7\Interop.BarTender.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Printing" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Interop.BarTender">
|
||||
<HintPath>..\..\..\..\..\Windows\assembly\GAC_MSIL\Interop.BarTender\10.1.4.1__109ff779a1b4cbc7\Interop.BarTender.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Printing" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Resource Include="Fonts\iconfont.ttf">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
<Resource Include="Resources\cloud.png" />
|
||||
<Resource Include="Resources\goOutInstore.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
<Resource Include="Resources\Logo.ico" />
|
||||
<Resource Include="Resources\Logo.png" />
|
||||
<Resource Include="Resources\主页.png" />
|
||||
<Resource Include="Resources\数据.png" />
|
||||
<Resource Include="Resources\权限.png" />
|
||||
<Resource Include="Resources\模式.png" />
|
||||
<Resource Include="Resources\设置.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Fonts\iconfont.ttf">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
<Resource Include="Resources\cloud.png" />
|
||||
<Resource Include="Resources\goOutInstore.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Resource>
|
||||
<Resource Include="Resources\Logo.ico" />
|
||||
<Resource Include="Resources\Logo.png" />
|
||||
<Resource Include="Resources\主页.png" />
|
||||
<Resource Include="Resources\入库.png"/>
|
||||
<Resource Include="Resources\出库.png"/>
|
||||
<Resource Include="Resources\盘点.png"/>
|
||||
<Resource Include="Resources\查询.png"/>
|
||||
<Resource Include="Resources\货架.png"/>
|
||||
<Resource Include="Resources\物料.png"/>
|
||||
<Resource Include="Resources\权限.png" />
|
||||
<Resource Include="Resources\调试.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="data\jsconfig.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="data\操作说明书.docx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Excel\出库单据导入模板.xlsx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Excel\物料管理导入模板.xlsx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Resources\Interop.BarTender.dll">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Resources\物料条码.btw">
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Update="data\jsconfig.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="data\操作说明书.docx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Excel\出库单据导入模板.xlsx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Excel\物料管理导入模板.xlsx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Resources\Interop.BarTender.dll">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Resources\物料条码.btw">
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Excel\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Excel\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\WCS.Model\WCS.Model.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\WCS.Model\WCS.Model.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="Models\JsConfig.cs">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ScannerDisplayControl.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ProcessDialog.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ImageDialog.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="Models\JsConfig.cs">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ScannerDisplayControl.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ProcessDialog.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="Views\Controls\ImageDialog.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Page Update="Views\MatBaseInoScanGenarateMatInfoView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="Views\ShelfInfoAddOrUpdateView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Update="Views\MatBaseInoScanGenarateMatInfoView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="Views\ShelfInfoAddOrUpdateView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|