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

1.解决TCP添加失败问题

Browse Source 
2.所有搜索记录倒叙排
3.优化：出入记录、库存记录增加货架类型分类查询
4.权限
5.优化下载app二维码
This commit is contained in:
hehaibing-1996
2024-07-02 09:05:21 +08:00
parent c9e25a1f85
commit adb0367a83
28 changed files with 785 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
货架标准上位机/Models/AuthEnum.cs
View File

@ -13,11 +13,21 @@ namespace 货架标准上位机
/// </summary>
public enum AuthEnum
{
查询 = 1000,
权限 = 2000,
设置 = 3000,
调试 = 4000,
主页 = 5000,
//主页 = 1000,
物料入库 = 2000,
出库单据 = 3000,
物料出库 = 4000,
盘点单据 = 5000,
物料盘点 = 6000,
库存查询 = 7000,
出入记录 = 8000,
库位管理 = 9000,
物料维护 = 10000,
物料明细 = 11000,
接口记录 = 12000,
权限 = 13000,
调试 = 14000,
设置 = 15000,
}
public class EnumTreeAttribute : Attribute

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

@ -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,

43
货架标准上位机/ViewModels/MatBaseInoScanGenarateMatInfoViewModel.cs
View File

@ -275,6 +275,8 @@ namespace 货架标准上位机.ViewModel
//string secondField = Regex.Match(input, @"{[1-9][0]{2,5}[ ]{").Value;
string secondField = Regex.Match(input, LocalFile.Config.RegexMatQty).Value;
MatQty = Convert.ToInt32(secondField.Replace("{", "").Replace(" ", ""));
input = input.Replace(secondField, string.Empty);
}
catch
{
@ -326,28 +328,35 @@ namespace 货架标准上位机.ViewModel
public void UpdateMatSN()
{
if (MatSNs != null && totalPan > 1)
try
{
MatSNs.Clear();
for (int i = 0; i < TotalPan; i++)
if (MatSNs != null && MatSNs.Count > 0 && totalPan >= 1)
{
var newMatSn = ChangelessCode + MatCode + ReservedCode + MatBatch + (MatBaseInfo.SerialNumber + i).ToString("000");
MatSNs.Add(newMatSn);
}
MatSNs.Clear();
for (int i = 0; i < TotalPan; i++)
{
var newMatSn = ChangelessCode + MatCode + ReservedCode + MatBatch + (MatBaseInfo.SerialNumber + i).ToString("000");
MatSNs.Add(newMatSn);
}
if (MatSNs == null || MatSNs.Count == 0)
{
MatSNsStr = string.Empty;
}
else if (MatSNs.Count == 1)
{
MatSNsStr = MatSNs[0].ToString();
}
else
{
MatSNsStr = MatSNs[0].ToString() + "\r\n~" + MatSNs[MatSNs.Count - 1].ToString();
if (MatSNs == null || MatSNs.Count == 0)
{
MatSNsStr = string.Empty;
}
else if (MatSNs.Count == 1)
{
MatSNsStr = MatSNs[0].ToString();
}
else
{
MatSNsStr = MatSNs[0].ToString() + "~\r\n" + MatSNs[MatSNs.Count - 1].ToString();
}
}
}
catch
{
}
}
public void GenerateMatSN()

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

@ -26,6 +26,7 @@ using WCS.Model.ApiModel.MatBaseInfo;
using WCS.Model.ApiModel.MatInventoryDetail;
using HandyControl.Tools.Extension;
using WCS.Model.ApiModel.Stocktaking;
using WCS.Model.ApiModel.Home;
namespace 货架标准上位机.ViewModel
{
@ -33,7 +34,7 @@ namespace 货架标准上位机.ViewModel
{
public MatInventoryDetailViewModel()
{
InitShelfTypeItems();
}
public void InitMatCode()
@ -171,6 +172,44 @@ namespace 货架标准上位机.ViewModel
SetProperty(ref matSN, value);
}
}
private List<ShelfTypeModel> shelfTypeItems;
public List<ShelfTypeModel> ShelfTypeItems
{
get { return shelfTypeItems; }
set
{
SetProperty(ref shelfTypeItems, 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;
}
});
}
private ShelfTypeModel selectedShelfTypeItem;
public ShelfTypeModel SelectedShelfTypeItem
{
get { return selectedShelfTypeItem; }
set
{
SetProperty(ref selectedShelfTypeItem, value);
}
}
#endregion
#region Command
@ -208,6 +247,7 @@ namespace 货架标准上位机.ViewModel
MatCode = MatCode,
StoreCode = StoreCode,
ShelfTypeId = SelectedShelfTypeItem == null ? 0 : SelectedShelfTypeItem.Id,
ShelfCode = ShelfCode,
UserName = LocalStatic.CurrentUser,

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

@ -117,6 +117,8 @@ namespace 货架标准上位机.ViewModels
}
var window = new OutInventoryAddMatView(SelectedShelfTypeItem.Id);
window.Owner = Application.Current.MainWindow;
window.Topmost = true;
var result = window.ShowDialog();
if (result == true)
{

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

@ -145,6 +145,7 @@ namespace 货架标准上位机.ViewModels
{
var window = new OutInventoryAddDucumentView();
window.Owner = Application.Current.MainWindow;
window.Topmost = true;
var result = window.ShowDialog();
if (result == true)
BtnSearch(true);

33
货架标准上位机/ViewModels/SetViewModel.cs
View File

@ -10,6 +10,7 @@ using System.Drawing.Imaging;
using System.IO;
using System.IO.Ports;
using System.Linq;
using System.Net;
using System.Reflection.Emit;
using System.Text;
using System.Threading.Tasks;
@ -26,6 +27,20 @@ namespace 货架标准上位机.ViewModel
{
public class SetViewModel : BindableBase
{
public SetViewModel()
{
IPHostEntry host = Dns.GetHostEntry(Dns.GetHostName());
IPList = host.AddressList
.Where(ipAddress => ipAddress.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork && !IPAddress.IsLoopback(ipAddress))
.Select(t => t.ToString()).ToList();
if (IPList != null && IPList.Count > 0)
{
SelectedIP = IPList[0];
}
}
private List<int> SaveLoginCountData_ = new List<int> { 3, 5, 7, 10 };
//记忆最大数量下拉框
public List<int> SaveLoginCountData { get => SaveLoginCountData_; set { SetProperty(ref SaveLoginCountData_, value); } }
@ -39,6 +54,22 @@ namespace 货架标准上位机.ViewModel
#region 页面输入信息
private List<string> ipList;
public List<string> IPList
{
get => ipList;
set { SetProperty(ref ipList, value); }
}
private string selectedIP;
public string SelectedIP
{
get => selectedIP;
set { SetProperty(ref selectedIP, value); }
}
private List<string> scannerComList;
public List<string> ScannerComList
{
@ -238,7 +269,7 @@ namespace 货架标准上位机.ViewModel
if (Result != null && Result.Code == 200)
{
//拼凑url
var downLoadUrl = LocalFile.Config.ApiIpHost + $"fileDownload/downloadApp?fileName={Result.Data}";
var downLoadUrl = $"http://{SelectedIP}:8888/" + $"fileDownload/downloadApp?fileName={Result.Data}";
//生成二维码
var qrCodeImage = GenerateQRCode(downLoadUrl);
//展示二维码

2
货架标准上位机/Views/InOutRecordView.xaml
View File

@ -45,7 +45,7 @@
SelectedItem="{Binding SelectedShelfTypeItem}"
FontSize="18"
Height="20"
IsEditable="True"/>
IsEditable="False"/>
<TextBlock Grid.Row="1" Grid.Column="0" Margin="5"
VerticalAlignment="Center" HorizontalAlignment="Right"

24
货架标准上位机/Views/MXWindows/MXMainWindow.xaml
View File

@ -87,7 +87,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料入库},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe681;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -99,7 +99,7 @@
</hc:TransitioningContentControl>
</TabItem>
<!--<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<!--<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.出库单据},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe67d;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -110,8 +110,8 @@
<View:OutInventoryDocumentView/>
</hc:TransitioningContentControl>
</TabItem>-->
<TabItem IsSelected="{Binding GoToOutVentoryView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem IsSelected="{Binding GoToOutVentoryView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料出库},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe67d;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -123,7 +123,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.盘点单据},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe65f;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -135,7 +135,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem IsSelected="{Binding GoToStockTakingView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem IsSelected="{Binding GoToStockTakingView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料盘点},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe65f;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -147,7 +147,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料盘点},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe65f;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -159,7 +159,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.库存查询},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe63a;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -171,7 +171,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.出入记录},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe60b;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -183,7 +183,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.库位管理},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe63a;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -233,7 +233,7 @@
</hc:TransitioningContentControl>
</TabItem>-->
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.接口记录},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe600;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -245,7 +245,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" >
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe63f;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>

26
货架标准上位机/Views/MainWindows/MainWindow1.xaml
View File

@ -88,7 +88,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料入库},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe681;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -100,7 +100,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.出库单据},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe67d;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -111,8 +111,8 @@
<View:OutInventoryDocumentView/>
</hc:TransitioningContentControl>
</TabItem>
<TabItem IsSelected="{Binding GoToOutVentoryView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem IsSelected="{Binding GoToOutVentoryView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料出库},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe67d;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -124,7 +124,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.盘点单据},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe65f;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -136,7 +136,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem IsSelected="{Binding GoToStockTakingView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem IsSelected="{Binding GoToStockTakingView}" Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料盘点},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe65f;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -148,7 +148,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.库存查询},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe63a;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -160,7 +160,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.出入记录},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe60b;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -172,7 +172,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.库位管理},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe63a;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -198,7 +198,7 @@
</TabControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料维护},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe662;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -210,7 +210,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.物料明细},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe662;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -222,7 +222,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.查询},Converter={StaticResource AuthVisConverter}}">
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.接口记录},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe600;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -234,7 +234,7 @@
</hc:TransitioningContentControl>
</TabItem>
<TabItem Padding="10,10,40,10" >
<TabItem Padding="10,10,40,10" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xe63f;" FontSize="20" FontFamily="{StaticResource IconFont}"></TextBlock>

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

@ -36,12 +36,11 @@
<TextBlock Grid.Row="0" Grid.Column="0" Margin="5"
VerticalAlignment="Center" HorizontalAlignment="Right"
Text="货架类型：" FontSize="18" ></TextBlock>
<ComboBox Grid.Row="0" Grid.Column="1"
<ComboBox Grid.Row="0" Grid.Column="1" IsEditable="False"
DisplayMemberPath="ShelfTypeName"
ItemsSource="{Binding ShelfTypeItems}"
SelectedItem="{Binding SelectedShelfTypeItem}"
FontSize="18"
IsEditable="True"/>
FontSize="18" />
<TextBlock Grid.Row="0" Grid.Column="2" Margin="5"
VerticalAlignment="Center" HorizontalAlignment="Right"

5
货架标准上位机/Views/SetView.xaml
View File

@ -62,7 +62,10 @@
<GroupBox Header="App" Margin="5" Padding="5" Style="{StaticResource GroupBoxTab}" Background="{x:Null}">
<StackPanel>
<StackPanel Orientation="Horizontal">
<Button Margin="5" Command="{Binding AppQRCodeCommand}">下载二维码</Button>
<ComboBox ItemsSource="{Binding IPList}" SelectedValue="{Binding SelectedIP}">
</ComboBox>
<Button Margin="5" Command="{Binding AppQRCodeCommand}">生成下载二维码</Button>
</StackPanel>
</StackPanel>
</GroupBox>

2
货架标准上位机/Views/StocktakingDocumentView.xaml
View File

@ -89,7 +89,7 @@
Content="&#xec61;开始盘点" FontFamily="{StaticResource IconFont}" Background="CadetBlue" Foreground="White">
</Button>
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnPauseCommand}"
Content="&#xe67e;暂停盘点" FontFamily="{StaticResource IconFont}" Background="CadetBlue" Foreground="White">
Content="&#xe67e;结束盘点" FontFamily="{StaticResource IconFont}" Background="CadetBlue" Foreground="White">
</Button>
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnCommitCommand}"

2
货架标准上位机/WebSocket.cs
View File

@ -142,7 +142,7 @@ namespace 货架标准上位机
}
break;
case WarningTypeEnum.通知自检进度:
TextBoxLog.AddLog(warning.WarningMessage, "selfCheck", DateTime.Now);
TextBoxLog.AddLog(warning.WarningMessage, "selfCheck", warning.CreateTime);
client.Send(e.DataFrame.ToText());
break;
default: break;

2
货架标准上位机/货架标准上位机.csproj
View File

@ -103,7 +103,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\物料条码.btw">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
</ItemGroup>