yinq
/
Sln.Mesnac.PayCalculationSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change -测试打卡机

Browse Source
main
frankiecao 1 year ago
parent 9bfa45f719 c12b9ff73f
commit 4a2c91b8a7
10 changed files with 150 additions and 52 deletions
Show Stats Download Patch File Download Diff File

6
SlnMesnac.Business/base/BaseBusiness.cs
Unescape Escape View File

@ -40,14 +40,12 @@ namespace SlnMesnac.Business.@base
private readonly HIDMode hIDMode;
public BaseBusiness(List<PlcAbsractFactory> plcFactories, List<RfidAbsractFactory> rfidFactories, StringChange stringChanges, HIDMode hIDModes)
public BaseBusiness(List<PlcAbsractFactory> plcFactories, List<RfidAbsractFactory> rfidFactories, HIDMode hIDModes)
{
_plcFactories = plcFactories;
_rfidFactories = rfidFactories;
//示例
stringChange = stringChanges;
//stringChange = stringChanges;
hIDMode = hIDModes;
}

14
SlnMesnac.Business/business/RecordRfidInfoBusniess.cs
Unescape Escape View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace SlnMesnac.Business.business
{
/// <summary>
/// 记录Rfid信息
/// </summary>
public class RecordRfidInfoBusniess
{
}
}

14
SlnMesnac.Business/business/RfidHandleBusniess.cs
Unescape Escape View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace SlnMesnac.Business.business
{
/// <summary>
/// RFID打卡机业务逻辑类
/// </summary>
public class RfidHandleBusniess
{
}
}

54
SlnMesnac.Common/HIDMode.cs
Unescape Escape View File

@ -7,50 +7,36 @@ namespace SlnMesnac.Common
{
public class HIDMode
{
DeviceClass deviceClass = new DeviceClass();
public DeviceClass deviceClass = new DeviceClass();
public string ButtonText = "";
public HIDMode()
{
deviceClass.isConnectedFunc = ConnectStart;
deviceClass.pushTagData = GetTag;
}
public void ConnectStart(bool Start)
/// <summary>
/// 连接或断开打卡机
/// </summary>
public void ConnectRfidHid()
{
if (Start)
{
//button1.Text = "DisConnect";
}
else
{
//button1.Text = "Monitor";
}
deviceClass.ConnectDevice();
}
private void GetTag(Tag tag)
/// <summary>
/// 断开打卡机
/// </summary>
public void DisconnectRfidHid()
{
//this.Invoke(new Action(() => {
// int flag = 0;
// foreach (ListViewItem viewitem in listView1.Items)
// {
// if (viewitem.SubItems[1].Text == tag.UID)
// {
// viewitem.SubItems[2].Text = (int.Parse(viewitem.SubItems[2].Text) + 1).ToString();
// viewitem.SubItems[3].Text = System.DateTime.Now.ToString();
// flag = 1;
// }
// }
// if (flag == 0)
// {
// System.Windows.Forms.ListViewItem EPCitem = new System.Windows.Forms.ListViewItem((listView1.Items.Count + 1).ToString());
// EPCitem.SubItems.Add(tag.UID);
// EPCitem.SubItems.Add("1");
deviceClass.Close();
}
// DateTime TimeNow_temp = System.DateTime.Now;
// string TimeNow_str = TimeNow_temp.ToString();
// EPCitem.SubItems.Add(TimeNow_str);
// listView1.Items.Add(EPCitem);
// }
//}));
/// <summary>
/// 获取标签
/// </summary>
public void GetTag(Tag tag)
{
string tagInfo = tag.ToString();
}
}
}

6
SlnMesnac.WPF/SlnMesnac.WPF.csproj
Unescape Escape View File

@ -43,6 +43,12 @@
<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
</ItemGroup>
<ItemGroup>
<Reference Include="HighRFIDSendCardDLL">
<HintPath>C:\Users\Administrator\Desktop\信明橡塑\Tool For HID Mode_V1.0.0\Tool For HID Mode_V1.0.0\HighRFIDSendCardDLL.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Resource Include="Templates\image\background.jpg" />
</ItemGroup>

8
SlnMesnac.WPF/UserControls/EmployeeLoginPage.xaml
Unescape Escape View File

@ -114,10 +114,10 @@
<TextBlock Text="打卡类型" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1">
<Button Content="上班打卡" x:Name="On" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Select}" Style="{StaticResource BUTTON_AGREE}" FontSize="15" FontWeight="Bold" Background="#009999" BorderBrush="#FF36B5C1" Margin="40,10,40,10"/>
<Button Content="上班打卡" x:Name="On" Command="{Binding CheckInCommand}" CommandParameter="{Binding Name,ElementName=On}" Style="{StaticResource BUTTON_AGREE}" FontSize="15" FontWeight="Bold" Background="#009999" BorderBrush="#FF36B5C1" Margin="40,10,40,10" Click="On_Click"/>
</Border>
<Border Grid.Column="2">
<Button Content="下班打卡" x:Name="Off" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Select}" Style="{StaticResource BUTTON_AGREE}" FontSize="15" FontWeight="Bold" Background="#009999" BorderBrush="#FF36B5C1" Margin="40,10,40,10"/>
<Button Content="下班打卡" x:Name="Off" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Off}" Style="{StaticResource BUTTON_AGREE}" FontSize="15" FontWeight="Bold" Background="#009999" BorderBrush="#FF36B5C1" Margin="40,10,40,10"/>
</Border>
</Grid>
</Border>
@ -141,10 +141,10 @@
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="员工姓名" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding date,StringFormat=\{0:yyyy-MM-dd\}}" Header="工单编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding flightData}" Header="员工类型" Width="3*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding hualway}" Header="性别" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding hualway}" Header="性别" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="卡号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="班组编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="手机号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="手机号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTemplateColumn Header="操作" Width="2*" >
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>

35
SlnMesnac.WPF/UserControls/EmployeeLoginPage.xaml.cs
Unescape Escape View File

@ -1,7 +1,11 @@
using System;
using HighRFIDSendCardDemo;
using SlnMesnac.Common;
using SlnMesnac.WPF.ViewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
@ -12,6 +16,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Threading;
namespace SlnMesnac.WPF.Page
{
@ -20,9 +25,37 @@ namespace SlnMesnac.WPF.Page
/// </summary>
public partial class EmployeeLoginPage : UserControl
{
HIDMode hIDMode = new HIDMode();
DeviceClass deviceClass = new DeviceClass();
DispatcherTimer timer;
public EmployeeLoginPage()
{
InitializeComponent();
//timer = new DispatcherTimer();
//timer.Interval = TimeSpan.FromSeconds(5);
//timer.Tick += Timer_Tick;
this.DataContext = new EmployeeLoginViewModel();
}
/// <summary>
/// 定时器
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Timer_Tick(object sender, EventArgs e)
{
//timer.Stop();
//hIDMode.DisconnectRfidHid();
}
private void On_Click(object sender, RoutedEventArgs e)
{
//hIDMode.ConnectRfidHid();
//timer.Start();
}
}
}

7
SlnMesnac.WPF/UserControls/ExecutePage.xaml
Unescape Escape View File

@ -233,12 +233,9 @@
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="序号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="ERP订单编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="工单编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding date,StringFormat=\{0:yyyy-MM-dd\}}" Header="工单编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding flightData}" Header="物料名称" Width="3*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding hualway}" Header="计划数量" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="计划数量" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding baggageTagCode}" Header="完成数量" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding date,StringFormat=\{0:yyyy-MM-dd\}}" Header="实际开始时间" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>
</Border>

52
SlnMesnac.WPF/ViewModel/EmployeeLoginViewModel.cs
Unescape Escape View File

@ -0,0 +1,52 @@
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using SlnMesnac.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SlnMesnac.WPF.ViewModel
{
public class EmployeeLoginViewModel : ViewModelBase
{
private readonly ILogger<EmployeeLoginViewModel> _logger;
public EmployeeLoginViewModel()
{
CheckInCommand = new RelayCommand(CheckIn);
}
/// <summary>
/// 获取标签信息
/// </summary>
private void GetTagInfo()
{
}
#region 事件定义
/// <summary>
/// 上班打卡
/// </summary>
public RelayCommand CheckInCommand { get; set; }
/// <summary>
/// 下班打卡
/// </summary>
public RelayCommand CheckOutCommand { get; set; }
#endregion
public void CheckIn()
{
var str = "";
var hid = App.ServiceProvider.GetService<HIDMode>();
hid.ConnectRfidHid();
}
}
}

6
SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
Unescape Escape View File

@ -31,9 +31,8 @@ namespace SlnMesnac.WPF.ViewModel
// set { _PlcStatus = value; RaisePropertyChanged(nameof(PlcStatus)); }
//}
/// <summary>
/// 箱壳扫码器状态
/// 打卡机状态
/// </summary>
private int _ShellScannerStatus = 0;
public int ShellScannerStatus
@ -43,7 +42,7 @@ namespace SlnMesnac.WPF.ViewModel
}
/// <summary>
/// 内胆扫码器状态
/// 扫码枪状态
/// </summary>
private int _BoldScannerStatus = 0;
public int BoldScannerStatus
@ -93,7 +92,6 @@ namespace SlnMesnac.WPF.ViewModel
ControlOnClickCommand = new RelayCommand<object>(obj => ControlOnClick(obj));
FormControlCommand = new RelayCommand<object>(x => FormControl(x));
}
/// <summary>

Write Preview
Loading…
Cancel
Save