Skip to content

J
JmpZbChannel
Commit 32cf4833 by zxw
Options

1

parent 16e7ab72
正在显示 包含 676 行增加 和 164 行删除
JmpServiceMgr/FrmMgr.cs
......@@ -331,15 +331,19 @@ namespace JmpServiceMgr
SetLogs($"通道程序启动{(_stu ? "成功" : "失败")}");
XfVioceMsc.Text2Voice($"通道程序启动{(_stu ? "成功" : "失败")}");
try
{
new DevService().OnStart(MyCache.SysConfig.DomainUrl);
Log.WorkLog("除湿机启动成功");
}
catch (Exception e)
{
Log.ErrorLog("除湿机异常：" + e.ToString());
}
//Task.Run(() =>
//{
// try
// {
// new DevService().OnStart(MyCache.SysConfig.DomainUrl);
// Log.WorkLog("除湿机启动成功");
// }
// catch (Exception e)
// {
// Log.ErrorLog("除湿机异常：" + e.ToString());
// }
//});
if (_stu)
{
......
JmpServiceMgr/Helper/DevService.cs
......@@ -38,13 +38,6 @@ namespace JmpServiceMgr.Helper
this.URL = URL;
devCode = GetMacAddress().ToUpper();
#region 开启一个线程
ThreadSend = new Thread(new ThreadStart(ContorlDev));
ThreadSend.IsBackground = true;
ThreadSend.Start();
#endregion
if (!"unknow".Equals(devCode))
{
//先根据用户请求的uri构造请求地址
......@@ -91,6 +84,12 @@ namespace JmpServiceMgr.Helper
{
//mac地址获取失败
}
#region 开启一个线程
ThreadSend = new Thread(new ThreadStart(ContorlDev));
ThreadSend.IsBackground = true;
ThreadSend.Start();
#endregion
}
catch (Exception ex)
{
......
JmpServiceMgr/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.17.10190")]
[assembly: AssemblyFileVersion("1.2.17.10190")]
[assembly: AssemblyVersion("1.2.18.10240")]
[assembly: AssemblyFileVersion("1.2.18.10240")]
LiteChannel/AddInvWindow.xaml 0 → 100644
<pu:WindowX x:Class="LiteChannel.AddInvWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:pu="clr-namespace:Panuon.UI.Silver;assembly=Panuon.UI.Silver"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:LiteChannel"
mc:Ignorable="d" Icon="1.ico"
Title="添加装备" Height="300" Width="400" WindowState="Normal" FontSize="24"
WindowStartupLocation="CenterScreen"
ResizeMode="NoResize" Loaded="OnWindow_Loaded" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.2*"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="0.2*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="8*"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="1" Grid.Column="1" Text="装备名称：" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<ComboBox Grid.Row="1" Grid.Column="1" x:Name="cbo_inv"
Width="200" Height="40" Margin="5,0,5,0" FontSize="24"
HorizontalAlignment="Right" VerticalAlignment="Center"
pu:ComboBoxHelper.HoverBackground="#1EB5B5B5"
pu:ComboBoxHelper.SelectedBackground="#32B5B5B5"
pu:ComboBoxHelper.IsSearchTextBoxVisible="True"
pu:ComboBoxHelper.Watermark="请选择装备名称"
pu:ComboBoxHelper.SearchTextChanged="cbo_police_SearchTextChanged"
pu:ComboBoxHelper.SearchTextBoxWatermark="在此搜索装备名称..." SelectionChanged="cbo_police_SelectionChanged"></ComboBox>
<TextBlock Grid.Row="2" Grid.Column="1" Text="在库数量：" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24"/>
<TextBlock Grid.Row="2" Grid.Column="1" Name="tb_count" Margin="120,0,5,0" Text="0" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Grid.Row="3" Grid.Column="1" Text="申请数量：" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBox Grid.Row="3" Grid.Column="1" Height="40" Text="1" InputMethod.IsInputMethodEnabled="False" PreviewTextInput="TextBox_PreviewTextInput" x:Name="txt_count" Width="auto" Margin="110,0,5,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" MaxLength="5" FontSize="24"/>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="4" Grid.ColumnSpan="2" HorizontalAlignment="Right" Width="90" Height="35" Margin="0,0,150,0" Click="OnSave_Click" FontSize="24">添加</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="4" Grid.ColumnSpan="2" HorizontalAlignment="Right" Background="#C8FF7F00" Click="OnExit_Click" pu:ButtonHelper.HoverBrush="#FF7F00" Width="90" Height="35" Margin="0,0,50,0" FontSize="24">取消</Button>
</Grid>
</pu:WindowX>
LiteChannel/AddInvWindow.xaml.cs 0 → 100644
using JmpRfidLp;
using LiteChannel.Commons;
using LiteChannel.Models;
using Panuon.UI.Silver;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using System.Windows.Threading;
using Panuon.UI.Silver.Core;
namespace LiteChannel
{
/// <summary>
/// StoreWindow.xaml 的交互逻辑
/// </summary>
public partial class AddInvWindow : WindowX, IComponentConnector
{
private List<inventory_info> InventoryList { get; set; }
private inventory_info inventory = null;
private ObservableCollection<scan_info> RefreshSourcesList;
private bool editFlag = false;
public AddInvWindow(ObservableCollection<scan_info> _RefreshSourcesList, inventory_info info = null)
{
InitializeComponent();
RefreshSourcesList = _RefreshSourcesList;
if (info != null)
{
//编辑模式
inventory = info;
cbo_inv.IsEnabled = false;
txt_count.Text = info.detailCount.ToString();
editFlag = true;
}
}
private void OnWindow_Loaded(object sender, RoutedEventArgs e)
{
InventoryList = HttpHelper.GetAllInventoryList();
if (editFlag)
{
cbo_inv.ItemsSource = InventoryList
.Where(x => x.equipmentDetailId == inventory.equipmentDetailId)
.ToList();
}
else
{
cbo_inv.ItemsSource = InventoryList;
}
cbo_inv.DisplayMemberPath = "equipmentDetailName";
cbo_inv.SelectedValuePath = "equipmentDetailId";
cbo_inv.SelectedIndex = 0;
}
private void OnSave_Click(object sender, RoutedEventArgs e)
{
try
{
if (inventory == null)
{
MessageBox.Show("未选择装备");
return;
}
if (Convert.ToInt32(txt_count.Text) > Convert.ToInt32(tb_count.Text))
{
MessageBox.Show("装备数量大于库存数");
return;
}
var checkItem = RefreshSourcesList.FirstOrDefault(x => x.equCode == inventory.equipmentDetailId);
if (checkItem == null)
{
//新增装备
RefreshSourcesList.Add(new scan_info()
{
equName = inventory.equipmentDetailName,
equCode = inventory.equipmentDetailId,
equCount = Convert.ToInt32(txt_count.Text)
});
}
else
{
if (editFlag)
{
//更新数量
checkItem.equCount = Convert.ToInt32(txt_count.Text);
}
else
{
MessageBox.Show("不允许重复添加装备");
return;
}
}
this.Close();
}
catch (Exception exception)
{
Log.ErrorLog(exception.ToString());
}
}
private void OnExit_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
private void cbo_police_SearchTextChanged(object sender, Panuon.UI.Silver.Core.SearchTextChangedEventArgs e)
{
if (!IsLoaded)
return;
cbo_inv.ItemsSource = InventoryList.Where(t => t.equipmentDetailName.Contains(e.Text));
}
private void cbo_police_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
inventory = cbo_inv.SelectedItem as inventory_info;
tb_count.Text = inventory?.detailCount.ToString();
var checkItem = RefreshSourcesList.FirstOrDefault(x => x.equCode == inventory.equipmentDetailId);
if (checkItem != null)
{
txt_count.Text = checkItem.equCount.ToString();
}
}
private void TextBox_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
{
e.Handled = new Regex("[^0-9]+").IsMatch(e.Text);
}
}
}
LiteChannel/LiteCaChe.cs
......@@ -17,8 +17,10 @@ namespace LiteChannel
{
public static List<sync_police> PoliceList { get; set; }
public static string OrgId { get; set; }
public static string OrgCode { get; set; }
public static string PoliceId { get; set; }
public static string UserId { get; set; }
public static string UserName { get; set; }
public static List<equ_info> EquInfos { get; set; }
public static Config SysConfig { get; set; }
public static Config LoadSystemStep()
......@@ -96,6 +98,9 @@ namespace LiteChannel
public const string GetWarehouseById = "/api/Warehouse/GetWarehouseById";
public const string SetWarehouseState = "/api/Inventory/SetWarehouseState";
public const string GetEpcListByBoxMarkEpc = "/api/EquipmentBoxMark/GetEpcListByBoxMarkEpc";
public const string GetAllInventoryList = "/api/Inventory/GetAllInventoryList";
public const string AddAndApprovalBorrowOrder = "/api/Borrow/AddAndApprovalBorrowOrder";
public const string AddAndApprovalBorrowJYOrder = "/api/Borrow/AddAndApprovalBorrowJYOrder";
public Config()
{
......
LiteChannel/LiteChannel.csproj
......@@ -132,9 +132,6 @@
<Compile Include="AutoClosingMessageBox.xaml.cs">
<DependentUpon>AutoClosingMessageBox.xaml</DependentUpon>
</Compile>
<Compile Include="OutWindow.xaml.cs">
<DependentUpon>OutWindow.xaml</DependentUpon>
</Compile>
<Compile Include="MainWindow2.xaml.cs">
<DependentUpon>MainWindow2.xaml</DependentUpon>
</Compile>
......@@ -142,6 +139,7 @@
<Compile Include="Models\respone_upload.cs" />
<Compile Include="Models\request_sign.cs" />
<Compile Include="Models\response_BoxMarkModel.cs" />
<Compile Include="Models\inventory_info.cs" />
<Compile Include="Models\sync_police.cs" />
<Compile Include="Models\rfid_res.cs" />
<Compile Include="Models\upload_info.cs" />
......@@ -152,9 +150,15 @@
<Compile Include="Models\respone.cs" />
<Compile Include="Models\soft_update.cs" />
<Compile Include="Models\store_info.cs" />
<Compile Include="AddInvWindow.xaml.cs">
<DependentUpon>AddInvWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Setting.xaml.cs">
<DependentUpon>Setting.xaml</DependentUpon>
</Compile>
<Compile Include="QuickCreateOrderWindow.xaml.cs">
<DependentUpon>QuickCreateOrderWindow.xaml</DependentUpon>
</Compile>
<Compile Include="StoreInWindow.xaml.cs">
<DependentUpon>StoreInWindow.xaml</DependentUpon>
</Compile>
......@@ -183,10 +187,6 @@
<Compile Include="LoginWindow.xaml.cs">
<DependentUpon>LoginWindow.xaml</DependentUpon>
</Compile>
<Page Include="OutWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainWindow2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......@@ -199,10 +199,18 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="AddInvWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Setting.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="QuickCreateOrderWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="StoreInWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......@@ -249,7 +257,9 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Resource Include="Resources\1.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="1.ico" />
</ItemGroup>
......@@ -265,6 +275,15 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\3.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\4.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\2.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\MaterialDesignThemes.3.1.3\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.1.3\build\MaterialDesignThemes.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
......
LiteChannel/LoginWindow.xaml.cs
......@@ -77,8 +77,10 @@ namespace LiteChannel
SaveHistory();
handler.UpdateMessage("系统登录成功！");
LiteCaChe.OrgId = lg_res.baseJpOrganization?.id ?? "";
LiteCaChe.OrgCode = lg_res.baseJpOrganization?.code?.Substring(0, 6) ?? "";
LiteCaChe.PoliceId = lg_res.policeman?.id ?? "";
LiteCaChe.UserId = lg_res.id;
LiteCaChe.UserName = lg_res.username;
new MainWindow().Show();
this.ShowInTaskbar = false;
......
LiteChannel/MainWindow.xaml
......@@ -7,25 +7,29 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:LiteChannel"
xmlns:usControl="clr-namespace:LiteChannel.UsControl"
mc:Ignorable="d" Icon="1.ico"
mc:Ignorable="d"
Height="720" Width="1024" Loaded="MainWindowLoaded" ResizeMode="NoResize"
AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterScreen"
WindowState="Maximized" Closing="OnWindow_Closing" pu:WindowXCaption.DisableCloseButton="True">
<pu:WindowX.Background>
<ImageBrush ImageSource="Resources/1.png"/>
</pu:WindowX.Background>
<Grid x:Name="g_main">
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.1*"/>
<RowDefinition Height="0.3*"/>
<RowDefinition Height="0.3*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.18*"/>
<RowDefinition Height="0.06*"/>
<RowDefinition Height="0.02*"/>
<RowDefinition Height="0.46*"/>
<RowDefinition Height="0.28*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="4*"/>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="4*"/>
</Grid.ColumnDefinitions>
<ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" x:Name="cbo_warehouse"
<ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" x:Name="cbo_warehouse"
Width="auto" Height="50" Margin="10,0,10,0"
HorizontalAlignment="Stretch" VerticalAlignment="Center"
FontSize="20"
......@@ -36,9 +40,50 @@
pu:ComboBoxHelper.IsSearchTextBoxVisible="True"
pu:ComboBoxHelper.SearchTextChanged="cbo_warehouse_SearchTextChanged"
pu:ComboBoxHelper.SearchTextBoxWatermark="在此搜索仓库..." SelectionChanged="cbo_warehouse_SelectionChanged"></ComboBox>
<Button Grid.Row="2" Grid.Column="1" Margin="10,10,10,10" Click="OnInStore_Click" pu:ButtonHelper.Icon="&#xf085;" Content="入库" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="30"></Button>
<Button Grid.Row="2" Grid.Column="2" Margin="10,10,10,10" Click="OnOutStore_Click" pu:ButtonHelper.Icon="&#xf085;" Content="出库" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="30"></Button>
<Button Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Click="OnClose_Click" pu:ButtonHelper.Icon="&#xf2d3;" Margin="10,10,10,10" Content="退出系统" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="24" Background="#C8FF0000" pu:ButtonHelper.HoverBrush="#FF0000" ></Button>
<Button Grid.Row="3" Grid.Column="1" Click="OnInStore_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="25,0,25,0">
<!--<Button.BorderBrush>
<ImageBrush ImageSource="Resources/3.png"/>
</Button.BorderBrush>-->
<Button.Background>
<ImageBrush ImageSource="Resources/3.png"/>
</Button.Background>
<pu:ButtonHelper.ButtonStyle>
<pu:ButtonStyle>Link</pu:ButtonStyle>
</pu:ButtonHelper.ButtonStyle>
<pu:ButtonHelper.HoverBrush>
<ImageBrush ImageSource="Resources/3.png"/>
</pu:ButtonHelper.HoverBrush>
</Button>
<Button Grid.Row="3" Grid.Column="2" Click="OnOutStore_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="25,0,25,0">
<Button.BorderBrush>
<ImageBrush ImageSource="Resources/4.png"/>
</Button.BorderBrush>
<Button.Background>
<ImageBrush ImageSource="Resources/4.png"/>
</Button.Background>
<pu:ButtonHelper.ButtonStyle>
<pu:ButtonStyle>Link</pu:ButtonStyle>
</pu:ButtonHelper.ButtonStyle>
<pu:ButtonHelper.HoverBrush>
<ImageBrush ImageSource="Resources/4.png"/>
</pu:ButtonHelper.HoverBrush>
</Button>
<Button Grid.Row="3" Grid.Column="3" Click="OnClose_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="25,0,25,0">
<Button.BorderBrush>
<ImageBrush ImageSource="Resources/2.png"/>
</Button.BorderBrush>
<Button.Background>
<ImageBrush ImageSource="Resources/2.png"/>
</Button.Background>
<pu:ButtonHelper.ButtonStyle>
<pu:ButtonStyle>Link</pu:ButtonStyle>
</pu:ButtonHelper.ButtonStyle>
<pu:ButtonHelper.HoverBrush>
<ImageBrush ImageSource="Resources/2.png"/>
</pu:ButtonHelper.HoverBrush>
</Button>
</Grid>
</pu:WindowX>
LiteChannel/MainWindow.xaml.cs
......@@ -161,7 +161,7 @@ namespace LiteChannel
private void OnOutStore_Click(object sender, RoutedEventArgs e)
{
var from = new OutWindow();
var from = new MainWindow2();
from.Owner = this;
//from.OnApplySuc += LoadData;
from.ShowDialog();
......
LiteChannel/MainWindow2.xaml
......@@ -8,9 +8,9 @@
xmlns:local="clr-namespace:LiteChannel"
xmlns:usControl="clr-namespace:LiteChannel.UsControl"
mc:Ignorable="d" Icon="1.ico"
Height="720" Width="1024" Loaded="MainWindowLoaded" ResizeMode="NoResize"
Height="450" Width="800" Loaded="MainWindowLoaded" ResizeMode="NoResize"
AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterScreen"
WindowState="Maximized" pu:WindowXCaption.DisableCloseButton="True">
WindowState="Maximized" Closing="OnWindow_Closing" pu:WindowXCaption.DisableCloseButton="True">
<Grid x:Name="g_main">
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
......@@ -18,18 +18,18 @@
<RowDefinition Height="80"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="0.6*"/>
<ColumnDefinition Width="0.4*"/>
<ColumnDefinition Width="0.4*"/>
<ColumnDefinition Width="0.05*"/>
<ColumnDefinition Width="0.3*"/>
<ColumnDefinition Width="0.3*"/>
</Grid.ColumnDefinitions>
<Label x:Name="lb_type" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" FontFamily="{StaticResource FontAwesome}" FontWeight="Bold" >当前业务：借用</Label>
<Button Grid.Row="0" Margin="0,0,10,0" Click="OnInStore_Click" pu:ButtonHelper.Icon="&#xf085;" Content="快捷创建单据" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="22"></Button>
<Button Grid.Column="1" Margin="0,0,10,0" Click="OnOutStoreNoOrder_Click" pu:ButtonHelper.Icon="&#xf085;" Content="本仓库借用出库" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="22"></Button>
<Button Grid.Row="0" Grid.Column="2" Click="OnRefresh_Click" pu:ButtonHelper.Icon="&#xf202;" Margin="10,0,10,0" Content="刷新单据" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="22"></Button>
<Button Grid.Row="0" Grid.Column="3" Click="OnClose_Click" pu:ButtonHelper.Icon="&#xf2d3;" Margin="10,0,10,0" Content="返回上级" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="22" Background="#C8FF0000" pu:ButtonHelper.HoverBrush="#FF0000" ></Button>
<Button Grid.Row="0" Grid.Column="3" Click="OnClose_Click" pu:ButtonHelper.Icon="&#xf2d3;" Margin="10,0,10,0" Content="返回主页" FontFamily="{StaticResource FontAwesome}" pu:ButtonHelper.CornerRadius="5" FontSize="22" Background="#C8FF0000" pu:ButtonHelper.HoverBrush="#FF0000" ></Button>
<DataGrid Grid.Column="0" Grid.Row="1" RowHeight="49" ScrollViewer.HorizontalScrollBarVisibility="Visible" ScrollViewer.VerticalScrollBarVisibility="Visible" EnableRowVirtualization="False" Margin="3 5 -1 0" HeadersVisibility="Column"
pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" Grid.ColumnSpan="3"
<DataGrid Grid.Row="1" ScrollViewer.HorizontalScrollBarVisibility="Visible" ScrollViewer.VerticalScrollBarVisibility="Visible" EnableRowVirtualization="False" Margin="3 5 3 0" HeadersVisibility="Column"
pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" Grid.ColumnSpan="4"
AutoGenerateColumns="False" LoadingRow="OnDataGridLoadingRow" SelectionMode="Single" Name="dg_order" pu:DataGridHelper.ColumnHorizontalContentAlignment="Center" CanUserSortColumns="True" >
<DataGrid.Columns>
<DataGridTemplateColumn Header="序号" MinWidth="80" >
......@@ -39,21 +39,14 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTextColumn IsReadOnly="True" Header="单据编号" MinWidth="180" FontSize="18" Binding="{Binding orderCode}" />-->
<!--<DataGridTextColumn IsReadOnly="True" Header="单据类型" Width="1*" MinWidth="100" FontSize="18" Binding="{Binding orderType}" />-->
<DataGridTextColumn x:Name="dgtc_BorrowPolice" Visibility="Collapsed" IsReadOnly="True" Header="借用警员(借用)" MinWidth="120" FontSize="18" Binding="{Binding borrowPolice}" />
<DataGridTextColumn x:Name="dgtc_ReceiveWarehouseName" Visibility="Collapsed" IsReadOnly="True" Header="目标仓库(调拨)" MinWidth="150" FontSize="18" Binding="{Binding receiveWarehouseName}" />
<DataGridTextColumn IsReadOnly="True" Header="申请日期" MinWidth="150" FontSize="18" Binding="{Binding createTime}"/>
<DataGridTextColumn IsReadOnly="True" Header="装备信息" Width="3*" MinWidth="300" FontSize="18" Binding="{Binding equNames}"/>
</DataGrid.Columns>
</DataGrid>
<DataGrid Grid.Column="3" Grid.Row="1" Grid.ColumnSpan="2" RowHeight="49" ScrollViewer.HorizontalScrollBarVisibility="Visible" ScrollViewer.VerticalScrollBarVisibility="Visible" EnableRowVirtualization="False" Margin="-1 5 3 0" HeadersVisibility="Column"
pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False"
AutoGenerateColumns="False" LoadingRow="OnDataGridLoadingRow" SelectionMode="Single" Name="dg_order2" pu:DataGridHelper.ColumnHorizontalContentAlignment="Center" CanUserSortColumns="True" >
<DataGrid.Columns>
<DataGridTemplateColumn Header="操作" Width="*" IsReadOnly="True">
<DataGridTextColumn IsReadOnly="True" Header="单据编号" Width="1.5*" MinWidth="100" FontSize="18" Binding="{Binding orderCode}" />
<DataGridTextColumn IsReadOnly="True" Header="单据类型" Width="100" MinWidth="100" FontSize="18" Binding="{Binding orderType}" />
<DataGridTextColumn IsReadOnly="True" Header="借用警员(借用)" Width="100" MinWidth="120" FontSize="18" Binding="{Binding borrowPolice}" />
<DataGridTextColumn IsReadOnly="True" Header="目标仓库(调拨)" Width="100" MinWidth="200" FontSize="18" Binding="{Binding receiveWarehouseName}" />
<DataGridTextColumn IsReadOnly="True" Header="申请日期" Width="1.5*" MinWidth="100" FontSize="18" Binding="{Binding createTime}"/>
<DataGridTextColumn IsReadOnly="True" Header="装备信息" Width="3*" MinWidth="100" FontSize="18" Binding="{Binding equNames}"/>
<!--<DataGridTextColumn IsReadOnly="True" Header="单据数量" Width="100" MinWidth="100" FontSize="18" Binding="{Binding orderQuantity}"/>-->
<DataGridTemplateColumn Header="操作" Width="280" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
......@@ -68,7 +61,7 @@
</DataGrid.Columns>
</DataGrid>
<usControl:PageControl IsEnabled="{Binding BindButton}" x:Name="d_pager" Margin="0,0,0,0" Grid.Row="2" TotalRecord="{Binding TotalRecord,Mode=TwoWay}" TotalPage="{Binding PageTotal,Mode=TwoWay}" PageSize="{Binding PageSize,Mode=TwoWay}" PageIndex="{Binding PageIndex,Mode=TwoWay}" Grid.ColumnSpan="5"
<usControl:PageControl IsEnabled="{Binding BindButton}" x:Name="d_pager" Margin="0,0,0,0" Grid.Row="2" TotalRecord="{Binding TotalRecord,Mode=TwoWay}" TotalPage="{Binding PageTotal,Mode=TwoWay}" PageSize="{Binding PageSize,Mode=TwoWay}" PageIndex="{Binding PageIndex,Mode=TwoWay}" Grid.ColumnSpan="4"
Grid.Column="0">
<i:Interaction.Triggers>
<i:EventTrigger EventName="OnPageChanged">
......
LiteChannel/MainWindow2.xaml.cs
......@@ -32,44 +32,12 @@ namespace LiteChannel
/// </summary>
public partial class MainWindow2 : WindowX, IComponentConnector
{
private PageControl2Model model;
private readonly string _type = "";
public MainWindow2(string type)
private PageControlModel model;
public MainWindow2()
{
InitializeComponent();
model = new PageControl2Model(this);
switch (type)
{
case "借用":
{
_type = "借用";
dgtc_BorrowPolice.Visibility = Visibility.Visible;
break;
}
case "领用":
{
_type = "领用";
break;
}
case "调拨":
{
_type = "库存调拨";
dgtc_ReceiveWarehouseName.Visibility = Visibility.Visible;
break;
}
case "跨库":
{
_type = "跨库";
break;
}
default:
{
MessageBox.Show("无效类型");
this.Close();
break;
}
}
lb_type.Content = "当前模式：" + _type;
model = new PageControlModel(this);
}
private void MainWindowLoaded(object sender, RoutedEventArgs e)
......@@ -81,11 +49,10 @@ namespace LiteChannel
}
public void LoadData()
{
var tmp = HttpHelper.GetOrderInfos(model.PageIndex, model.PageSize, _type);
var tmp = HttpHelper.GetOrderInfos(model.PageIndex, model.PageSize);
model.TotalRecord = tmp?.totalElements ?? 0;
model.PageTotal = model.TotalRecord == 0 ? 0 : (model.TotalRecord + model.PageSize - 1) / model.PageSize;
dg_order.ItemsSource = tmp?.content;
dg_order2.ItemsSource = tmp?.content;
}
private void OnDataGridLoadingRow(object sender, DataGridRowEventArgs e)
......@@ -94,9 +61,9 @@ namespace LiteChannel
}
private void OnOutStore_Click(object sender, RoutedEventArgs e)
{
if (dg_order2.SelectedItem != null)
if (dg_order.SelectedItem != null)
{
var item = dg_order2.SelectedItem as order_info;
var item = dg_order.SelectedItem as order_info;
var from = new StoreOutWindow(item.id, item.orderType, item);
from.Owner = this;
from.OnApplySuc += LoadData;
......@@ -112,21 +79,24 @@ namespace LiteChannel
}
private void OnShowDetail_Click(object sender, RoutedEventArgs e)
{
if (dg_order2.SelectedItem != null)
if (dg_order.SelectedItem != null)
{
var item = dg_order2.SelectedItem as order_info;
var item = dg_order.SelectedItem as order_info;
var from = new OrderInfoWindows(item.id, item.orderType);
from.Owner = this;
from.OnApplySuc += LoadData;
from.ShowDialog();
}
}
private void OnWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
}
private void OnInStore_Click(object sender, RoutedEventArgs e)
{
var from = new StoreInWindow();
var from = new QuickCreateOrderWindow();
from.Owner = this;
from.OnApplySuc += LoadData;
from.ShowDialog();
OnRefresh_Click(null, null);
}
private void OnRefresh_Click(object sender, RoutedEventArgs e)
......@@ -138,11 +108,12 @@ namespace LiteChannel
private void OnClose_Click(object sender, RoutedEventArgs e)
{
this.Close();
//Application.Current.Shutdown();
//Process.GetCurrentProcess().Kill();
}
}
public class PageControl2Model : INotifyPropertyChanged
public class PageControlModel : INotifyPropertyChanged
{
private bool _bindButton = true;
public bool BindButton
......@@ -205,7 +176,7 @@ namespace LiteChannel
private readonly MainWindow2 _mainWindow;
public RelayCommand OnPageChangeCmd { get; set; }
public PageControl2Model(MainWindow2 mainWindow)
public PageControlModel(MainWindow2 mainWindow)
{
_mainWindow = mainWindow;
......
LiteChannel/Models/inventory_info.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LiteChannel.Models
{
public class inventory_info
{
public int detailCount { get; set; }
public string equipmentDetailId { get; set; }
public string equipmentDetailName { get; set; }
}
}
LiteChannel/OrderInfoWindows.xaml
......@@ -5,18 +5,18 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:LiteChannel"
mc:Ignorable="d" Icon="1.ico"
mc:Ignorable="d" Icon="1.ico" FontSize="24"
Title="单据明细" Height="350" Width="550" Loaded="OnWindow_Loaded" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="280"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<DataGrid Grid.Row="0" pu:DataGridHelper.ColumnHorizontalContentAlignment="Center" x:Name="dg_detail" HorizontalAlignment="Stretch" BorderThickness="0,0,0,0" VerticalAlignment="Stretch" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" >
<DataGrid Grid.Row="0" FontSize="24" ColumnHeaderHeight="60" RowHeight="60" pu:DataGridHelper.ColumnHorizontalContentAlignment="Center" x:Name="dg_detail" HorizontalAlignment="Stretch" BorderThickness="0,0,0,0" VerticalAlignment="Stretch" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" >
<DataGrid.Columns>
<DataGridTextColumn IsReadOnly="True" Header="装备名称" Binding="{Binding equName}" Width="*" ></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="申请数量" Binding="{Binding equCount}" Width="100"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="已出库数量" Binding="{Binding equUsed}" Width="100"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="申请数量" Binding="{Binding equCount}" Width="150"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="已出库数量" Binding="{Binding equUsed}" Width="150"></DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
<Button x:Name="bt_CloseOrder" Visibility="Collapsed" Grid.Row="1" Click="OnCloseOrder_Click" pu:ButtonHelper.Icon="&#xf2d3;" Margin="0,0,0,0" Content="中止单据" FontFamily="{StaticResource FontAwesome}" FontSize="18" Background="#C8FF0000" pu:ButtonHelper.HoverBrush="#FF0000" ></Button>
......
LiteChannel/Properties/AssemblyInfo.cs
......@@ -51,5 +51,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.4.06280")]
[assembly: AssemblyFileVersion("1.2.4.06280")]
[assembly: AssemblyVersion("1.2.6.10240")]
[assembly: AssemblyFileVersion("1.2.6.10240")]
LiteChannel/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: 4.0.30319.42000
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace LiteChannel.Properties {
using System;
namespace LiteChannel.Properties
{
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
internal Resources() {
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LiteChannel.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
......@@ -55,16 +51,53 @@ namespace LiteChannel.Properties
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set
{
set {
resourceCulture = value;
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap _1 {
get {
object obj = ResourceManager.GetObject("_1", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap _2 {
get {
object obj = ResourceManager.GetObject("_2", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap _3 {
get {
object obj = ResourceManager.GetObject("_3", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap _4 {
get {
object obj = ResourceManager.GetObject("_4", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}
LiteChannel/Properties/Resources.resx
......@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
......@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
......@@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
......@@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
......@@ -109,9 +112,22 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_4" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
LiteChannel/QuickCreateOrderWindow.xaml 0 → 100644
<pu:WindowX x:Class="LiteChannel.QuickCreateOrderWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:pu="clr-namespace:Panuon.UI.Silver;assembly=Panuon.UI.Silver"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:LiteChannel"
mc:Ignorable="d" Icon="1.ico"
Title="快捷创建单据" Height="500" Width="750" WindowState="Normal" FontSize="24"
WindowStartupLocation="CenterScreen"
ResizeMode="NoResize" Loaded="OnWindow_Loaded" Closing="OnWindow_Closing">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="0"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions>
<DataGrid FontSize="24" ColumnHeaderHeight="60" RowHeight="60" Grid.Row="0" Grid.ColumnSpan="2" x:Name="dg_epc" HorizontalAlignment="Stretch" BorderThickness="0,0,0,1" VerticalAlignment="Stretch" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" >
<DataGrid.Columns>
<DataGridTextColumn IsReadOnly="True" Header="装备名称" Binding="{Binding equName}" Width="*"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="装备数量" Binding="{Binding equCount,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Width="150"></DataGridTextColumn>
<DataGridTemplateColumn Header="操作" Width="150" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
<Button Content="编辑" FontSize="24" pu:ButtonHelper.CornerRadius="5" Click="EditItem_Click" Padding="4" Margin="0,5,2,5" >
</Button>
<Button Content="删除" FontSize="24" pu:ButtonHelper.CornerRadius="5" Click="DeleteItem_Click" Padding="4" Margin="2,5,0,5" >
</Button>
</StackPanel>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
<ComboBox Name="cbo_type" FontSize="24" Grid.Row="2" Grid.Column="0" pu:ComboBoxHelper.Watermark="单据类型" Height="40" Width="100" Margin="5,0,5,0" HorizontalAlignment="Left">
<ComboBoxItem FontSize="24">借用</ComboBoxItem>
<ComboBoxItem FontSize="24">领用</ComboBoxItem>
</ComboBox>
<ComboBox Grid.Row="2" Grid.Column="0" x:Name="cbo_police" FontSize="24"
Width="200" Height="40" Margin="110,0,5,0"
HorizontalAlignment="Left" VerticalAlignment="Center"
pu:ComboBoxHelper.HoverBackground="#1EB5B5B5"
pu:ComboBoxHelper.SelectedBackground="#32B5B5B5"
pu:ComboBoxHelper.IsSearchTextBoxVisible="True"
pu:ComboBoxHelper.Watermark="请选择警员"
pu:ComboBoxHelper.SearchTextChanged="cbo_police_SearchTextChanged"
pu:ComboBoxHelper.SearchTextBoxWatermark="在此搜索警员..." SelectionChanged="cbo_police_SelectionChanged"></ComboBox>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Background="Red" pu:ButtonHelper.HoverBrush="Red" Width="120" Height="35" Margin="0,0,270,0" Click="AddInv_Click" FontSize="24">添加装备</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Width="120" Height="35" Margin="0,0,140,0" Click="OnSave_Click" FontSize="24">创建单据</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Background="#C8FF7F00" Click="OnExit_Click" pu:ButtonHelper.HoverBrush="#FF7F00" Width="120" Height="35" Margin="0,0,10,0" FontSize="24">返回</Button>
</Grid>
</pu:WindowX>
LiteChannel/QuickCreateOrderWindow.xaml.cs 0 → 100644
using JmpRfidLp;
using LiteChannel.Commons;
using LiteChannel.Models;
using Panuon.UI.Silver;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using System.Windows.Threading;
using Panuon.UI.Silver.Core;
namespace LiteChannel
{
/// <summary>
/// StoreWindow.xaml 的交互逻辑
/// </summary>
public partial class QuickCreateOrderWindow : WindowX, IComponentConnector
{
private ObservableCollection<scan_info> RefreshSourcesList = new ObservableCollection<scan_info>();
private List<sync_police> PoliceList { get; set; }
private sync_police police = null;
public QuickCreateOrderWindow()
{
InitializeComponent();
dg_epc.AutoGenerateColumns = false;
}
private void OnWindow_Loaded(object sender, RoutedEventArgs e)
{
PoliceList = HttpHelper.GetPoliceInfo();
cbo_police.ItemsSource = PoliceList;
cbo_police.DisplayMemberPath = "name";
cbo_police.SelectedValuePath = "id";
cbo_police.SelectedIndex = 0;
cbo_type.SelectedIndex = 0;
dg_epc.ItemsSource = RefreshSourcesList;
}
private void OnExit_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
private void OnWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
}
private void OnSave_Click(object sender, RoutedEventArgs e)
{
//上报数据
if (police == null)
{
MessageBox.Show("未选择警员");
return;
}
if (RefreshSourcesList.Count == 0)
{
MessageBox.Show("未选择装备");
return;
}
if (cbo_type.SelectedIndex == 0)
{
//借用
if (HttpHelper.CreateBorrowJYOrder( police.id, RefreshSourcesList.ToList(), out string msg))
{
MessageBox.Show("借用单创建成功");
this.Close();
}
else
{
MessageBox.Show(msg);
return;
}
}
else
{
//领用
if (HttpHelper.CreateBorrowLYOrder( police.id, RefreshSourcesList.ToList(), out string msg))
{
MessageBox.Show("领用单创建成功");
this.Close();
}
else
{
MessageBox.Show(msg);
return;
}
}
}
private void cbo_police_SearchTextChanged(object sender, Panuon.UI.Silver.Core.SearchTextChangedEventArgs e)
{
if (!IsLoaded)
return;
cbo_police.ItemsSource = PoliceList.Where(t => t.name.Contains(e.Text));
}
private void cbo_police_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
police = cbo_police.SelectedItem as sync_police;
}
private void AddInv_Click(object sender, RoutedEventArgs e)
{
var from = new AddInvWindow(RefreshSourcesList);
from.Owner = this;
from.ShowDialog();
RefreshSourcesList = new ObservableCollection<scan_info>(RefreshSourcesList);
dg_epc.ItemsSource = RefreshSourcesList;
}
private void EditItem_Click(object sender, RoutedEventArgs e)
{
if (dg_epc.SelectedItem != null)
{
var item = dg_epc.SelectedItem as scan_info;
var from = new AddInvWindow(RefreshSourcesList, new inventory_info
{
detailCount = item.equCount,
equipmentDetailId = item.equCode,
equipmentDetailName = item.equName
});
from.Owner = this;
from.ShowDialog();
RefreshSourcesList = new ObservableCollection<scan_info>(RefreshSourcesList);
dg_epc.ItemsSource = RefreshSourcesList;
}
}
private void DeleteItem_Click(object sender, RoutedEventArgs e)
{
if (dg_epc.SelectedItem != null)
{
var item = dg_epc.SelectedItem as scan_info;
RefreshSourcesList.Remove(item);
RefreshSourcesList = new ObservableCollection<scan_info>(RefreshSourcesList);
dg_epc.ItemsSource = RefreshSourcesList;
}
}
}
}
LiteChannel/StoreInWindow.xaml
......@@ -6,7 +6,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:LiteChannel"
mc:Ignorable="d" Icon="1.ico"
Title="盘点入库" Height="400" Width="650" WindowState="Normal"
Title="盘点入库" Height="400" Width="650" WindowState="Maximized" FontSize="24"
WindowStartupLocation="CenterScreen"
ResizeMode="NoResize" Loaded="OnWindow_Loaded" Closing="OnWindow_Closing">
<Grid>
......@@ -15,10 +15,10 @@
<RowDefinition Height="0"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions>
<DataGrid Grid.Row="0" Grid.ColumnSpan="2" x:Name="dg_epc" HorizontalAlignment="Stretch" BorderThickness="0,0,0,1" VerticalAlignment="Stretch" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" >
<DataGrid FontSize="24" ColumnHeaderHeight="60" RowHeight="60" Grid.Row="0" Grid.ColumnSpan="2" x:Name="dg_epc" HorizontalAlignment="Stretch" BorderThickness="0,0,0,1" VerticalAlignment="Stretch" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" >
<DataGrid.Columns>
<DataGridTextColumn IsReadOnly="True" Header="装备名称" Binding="{Binding equName}" Width="*"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="识别数量" Binding="{Binding scanQty,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Width="100"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="识别数量" Binding="{Binding scanQty,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Width="150"></DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
<!--<ComboBox Name="cbo_type" Grid.Row="1" Grid.Column="1" pu:ComboBoxHelper.Watermark="请选择入库类型..." Height="40" Margin="5,0,5,0">
......@@ -29,10 +29,10 @@
<ComboBoxItem>维修</ComboBoxItem>
<ComboBoxItem>跨库归还</ComboBoxItem>
</ComboBox>-->
<TextBlock Grid.Row="2" Grid.ColumnSpan="2" Margin="0,0,220,0" Foreground="Red" Name="txt_stat" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="20">状态：读写器启动失败</TextBlock>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" IsEnabled="false" Name="btn_inv" HorizontalAlignment="Right" Click="OnInv_Click" Width="90" Height="35" Margin="0,0,213,0">开始读取</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Width="90" Height="35" Margin="0,0,110,0" Click="OnSave_Click">提交入库</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Background="#C8FF7F00" Click="OnExit_Click" pu:ButtonHelper.HoverBrush="#FF7F00" Width="90" Height="35" Margin="0,0,10,0">退出</Button>
<TextBlock Grid.Row="2" Grid.ColumnSpan="2" Margin="0,0,220,0" Foreground="Red" Name="txt_stat" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24">状态：读写器启动失败</TextBlock>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" IsEnabled="false" Name="btn_inv" HorizontalAlignment="Right" Click="OnInv_Click" Width="120" Height="35" Margin="0,0,273,0" FontSize="24">开始读取</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Width="120" Height="35" Margin="0,0,140,0" Click="OnSave_Click" FontSize="24">提交入库</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Background="#C8FF7F00" Click="OnExit_Click" pu:ButtonHelper.HoverBrush="#FF7F00" Width="120" Height="35" Margin="0,0,10,0" FontSize="24">退出</Button>
</Grid>
</pu:WindowX>
LiteChannel/StoreOutWindow.xaml
......@@ -6,7 +6,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:LiteChannel"
mc:Ignorable="d" Icon="1.ico"
Title="盘点出库" Height="350" Width="650" WindowState="Normal"
Title="盘点出库" Height="350" Width="650" WindowState="Normal" FontSize="24"
WindowStartupLocation="CenterScreen"
ResizeMode="NoResize" Loaded="OnWindow_Loaded" Closing="OnWindow_Closing">
<Grid>
......@@ -14,17 +14,17 @@
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions>
<DataGrid Grid.Row="0" x:Name="dg_epc" HorizontalAlignment="Stretch" BorderThickness="0,0,0,1" VerticalAlignment="Stretch" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" >
<DataGrid Grid.Row="0" FontSize="24" ColumnHeaderHeight="60" RowHeight="60" x:Name="dg_epc" HorizontalAlignment="Stretch" BorderThickness="0,0,0,1" VerticalAlignment="Stretch" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" >
<DataGrid.Columns>
<DataGridTextColumn IsReadOnly="True" Header="装备名称" Binding="{Binding equName}" Width="*"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="申领数量" Binding="{Binding equCount}" Width="150" x:Name="equCountGridTextColumn"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="剩余数量" Binding="{Binding equRem}" Width="150" x:Name="equRemGridTextColumn"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="识别数量" Binding="{Binding scanQty,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Width="100"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="识别数量" Binding="{Binding scanQty,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Width="150"></DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
<TextBlock Grid.Row="1" Margin="0,0,220,0" Foreground="Red" Name="txt_stat" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="20">状态：读写器启动失败</TextBlock>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="1" IsEnabled="false" Name="btn_inv" HorizontalAlignment="Right" Click="OnInv_Click" Width="90" Height="35" Margin="0,0,213,0">开始读取</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="1" HorizontalAlignment="Right" Width="90" Height="35" Margin="0,0,110,0" Click="OnSave_Click">提交出库</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="1" HorizontalAlignment="Right" Background="#C8FF7F00" Click="OnExit_Click" pu:ButtonHelper.HoverBrush="#FF7F00" Width="90" Height="35" Margin="0,0,10,0">退出</Button>
<TextBlock Grid.Row="1" Margin="0,0,220,0" Foreground="Red" Name="txt_stat" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24">状态：读写器启动失败</TextBlock>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="1" IsEnabled="false" Name="btn_inv" HorizontalAlignment="Right" Click="OnInv_Click" Width="120" Height="35" Margin="0,0,270,0" FontSize="24">开始读取</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="1" HorizontalAlignment="Right" Width="120" Height="35" Margin="0,0,140,0" Click="OnSave_Click" FontSize="24">提交出库</Button>
<Button pu:ButtonHelper.CornerRadius="4" Grid.Row="1" HorizontalAlignment="Right" Background="#C8FF7F00" Click="OnExit_Click" pu:ButtonHelper.HoverBrush="#FF7F00" Width="120" Height="35" Margin="0,0,10,0" FontSize="24">退出</Button>
</Grid>
</pu:WindowX>
LiteChannelWinXP/Commons/HttpHelper.cs
......@@ -220,7 +220,8 @@ namespace LiteChannelWinXP.Commons
var res_data = JsonConvert.DeserializeObject<respone<List<store_info>>>(json);
if (res_data == null || res_data.code != 10000)
{
Log.WorkLog("获取获取仓库基础信息失败", "获取失败");
Log.WorkLog("获取获取仓库基础信息失败" + res_data?.msg, "获取失败");
return default;
}
else
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论