diff --git a/HKCardOUT/HKCardOUT.csproj b/HKCardOUT/HKCardOUT.csproj
index b7d8a94..25728b2 100644
--- a/HKCardOUT/HKCardOUT.csproj
+++ b/HKCardOUT/HKCardOUT.csproj
@@ -14,9 +14,9 @@
1.0.0.0
AnyCPU;x86
-
+
TRACE;Core
diff --git a/HKCardOUT/ViewModels/RootViewModel.cs b/HKCardOUT/ViewModels/RootViewModel.cs
index 599a7e5..fff8cbf 100644
--- a/HKCardOUT/ViewModels/RootViewModel.cs
+++ b/HKCardOUT/ViewModels/RootViewModel.cs
@@ -236,17 +236,6 @@ namespace HKCardOUT.ViewModels
ThreadManage.GetInstance().StartLong(() =>
{
- //DataBus.saleLogDtos.Enqueue(new SaleLogDto
- //{
- // Location = "5",
- // CardNo = "1585836138202009600"
- //});
- //DataBus.saleLogDtos.Enqueue(new SaleLogDto
- //{
- // Location = "6",
- // CardNo = "1585828985667981312"
- //});
-
if (0 < Stacks.Count && Stacks.TryDequeue(out SaleLogDto Info))
{
if (Info != null)
diff --git a/HKCardOUT/Views/AdWindow.xaml.cs b/HKCardOUT/Views/AdWindow.xaml.cs
index 1dac9bf..cb13875 100644
--- a/HKCardOUT/Views/AdWindow.xaml.cs
+++ b/HKCardOUT/Views/AdWindow.xaml.cs
@@ -41,8 +41,8 @@ namespace HKCardOUT.Views
if (BindScreen != -1)
{
int[] NotchNum = new int[2];
- if (bindScreen == 0) { NotchNum[0] = 1; NotchNum[1] = 2; }
- if (bindScreen == 1) { NotchNum[0] = 5; NotchNum[1] = 6; }
+ if (bindScreen == 1) { NotchNum[0] = 1; NotchNum[1] = 2; }
+ if (bindScreen == 0) { NotchNum[0] = 5; NotchNum[1] = 6; }
if (bindScreen == 2) { NotchNum[0] = 3; NotchNum[1] = 4; }
(this.DataContext as AdWindowViewModel).InitData(NotchNum);
@@ -62,7 +62,7 @@ namespace HKCardOUT.Views
}
InitView2(input);
- InitControl();
+ //InitControl();
};
this.Closed += (sender, ev) =>
{