Browse Source

测试

Lishi
xxe 2 years ago
parent
commit
18119ba8f8
4 changed files with 22 additions and 9 deletions
  1. +1
    -7
      HKCardOUT/Logic/RemoteService.cs
  2. +19
    -0
      HKCardOUT/Logic/Service/HKCore.cs
  3. +1
    -1
      HKCardOUT/ViewModels/RootViewModel.cs
  4. +1
    -1
      HKCardOUT/options.json

+ 1
- 7
HKCardOUT/Logic/RemoteService.cs View File

@@ -47,13 +47,7 @@ namespace HKCardOUT.Logic
t.NodePath = ApiRoute.SyncSaleLog; t.NodePath = ApiRoute.SyncSaleLog;
}).Build().RunStringFirst(); }).Build().RunStringFirst();
HKLog.HKLogImport.WriteInfo($"同步消费时候调用:{data}"); HKLog.HKLogImport.WriteInfo($"同步消费时候调用:{data}");
var m = bool.Parse(data.ToModel<JObject>()["data"].ToString());
if (m)
{
UHF_RS485_Helper.GetInstance().OpenBeep(StallId.AsInt());
return m;
}
else return false;
return bool.Parse(data.ToModel<JObject>()["data"].ToString());
} }
catch (Exception ex) catch (Exception ex)
{ {


+ 19
- 0
HKCardOUT/Logic/Service/HKCore.cs View File

@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using UHFHelper;
using XExten.Advance.LinqFramework; using XExten.Advance.LinqFramework;


namespace HKCardOUT.Logic.Service namespace HKCardOUT.Logic.Service
@@ -56,7 +57,10 @@ namespace HKCardOUT.Logic.Service
{ {
//先出餐后推数据 //先出餐后推数据
if (DataBus.StartDevice) if (DataBus.StartDevice)
{
Main.GetInstance.Start(input.Location.AsInt()); Main.GetInstance.Start(input.Location.AsInt());
UHF_RS485_Helper.GetInstance().OpenBeep(input.Location.AsInt());
}
var res = RemoteService.SyncSaleLog(input.CardNo, input.Location); var res = RemoteService.SyncSaleLog(input.CardNo, input.Location);
if (res) if (res)
DbContext.Context.Updateable<SaleLog>().SetColumns(t => t.IsSync == true).Where(t => t.Id == entity.Id).ExecuteCommand(); DbContext.Context.Updateable<SaleLog>().SetColumns(t => t.IsSync == true).Where(t => t.Id == entity.Id).ExecuteCommand();
@@ -65,7 +69,10 @@ namespace HKCardOUT.Logic.Service
else else
{ {
if (DataBus.StartDevice) if (DataBus.StartDevice)
{
Main.GetInstance.Start(input.Location.AsInt()); Main.GetInstance.Start(input.Location.AsInt());
UHF_RS485_Helper.GetInstance().OpenBeep(input.Location.AsInt());
}
return true; return true;
} }
} }
@@ -108,7 +115,10 @@ namespace HKCardOUT.Logic.Service
{ {
//先出餐后推数据 //先出餐后推数据
if (DataBus.StartDevice) if (DataBus.StartDevice)
{
Main.GetInstance.Start(input.Location.AsInt()); Main.GetInstance.Start(input.Location.AsInt());
UHF_RS485_Helper.GetInstance().OpenBeep(input.Location.AsInt());
}
var res = RemoteService.SyncSaleLog(input.CardNo, input.Location); var res = RemoteService.SyncSaleLog(input.CardNo, input.Location);
if (res) if (res)
DbContext.Context.Updateable<SaleLog>().SetColumns(t => t.IsSync == true).Where(t => t.Id == entity.Id).ExecuteCommand(); DbContext.Context.Updateable<SaleLog>().SetColumns(t => t.IsSync == true).Where(t => t.Id == entity.Id).ExecuteCommand();
@@ -117,7 +127,10 @@ namespace HKCardOUT.Logic.Service
else else
{ {
if (DataBus.StartDevice) if (DataBus.StartDevice)
{
Main.GetInstance.Start(input.Location.AsInt()); Main.GetInstance.Start(input.Location.AsInt());
UHF_RS485_Helper.GetInstance().OpenBeep(input.Location.AsInt());
}
return true; return true;
} }
} }
@@ -160,7 +173,10 @@ namespace HKCardOUT.Logic.Service
{ {
//先出餐后推数据 //先出餐后推数据
if (DataBus.StartDevice) if (DataBus.StartDevice)
{
Main.GetInstance.Start(input.Location.AsInt()); Main.GetInstance.Start(input.Location.AsInt());
UHF_RS485_Helper.GetInstance().OpenBeep(input.Location.AsInt());
}
var res = RemoteService.SyncSaleLog(input.CardNo, input.Location); var res = RemoteService.SyncSaleLog(input.CardNo, input.Location);
if (res) if (res)
DbContext.Context.Updateable<SaleLog>().SetColumns(t => t.IsSync == true).Where(t => t.Id == entity.Id).ExecuteCommand(); DbContext.Context.Updateable<SaleLog>().SetColumns(t => t.IsSync == true).Where(t => t.Id == entity.Id).ExecuteCommand();
@@ -169,7 +185,10 @@ namespace HKCardOUT.Logic.Service
else else
{ {
if (DataBus.StartDevice) if (DataBus.StartDevice)
{
Main.GetInstance.Start(input.Location.AsInt()); Main.GetInstance.Start(input.Location.AsInt());
UHF_RS485_Helper.GetInstance().OpenBeep(input.Location.AsInt());
}
return true; return true;
} }
} }


+ 1
- 1
HKCardOUT/ViewModels/RootViewModel.cs View File

@@ -91,7 +91,7 @@ namespace HKCardOUT.ViewModels
HandyControl.Controls.Growl.InfoGlobal("系统已离线,请连接网络,并重启程序!"); HandyControl.Controls.Growl.InfoGlobal("系统已离线,请连接网络,并重启程序!");
} }


Thread.Sleep(10);
Thread.Sleep(50);
}), "串口监听"); }), "串口监听");
}); });




+ 1
- 1
HKCardOUT/options.json View File

@@ -22,5 +22,5 @@
//每个时间段的刷卡次数 //每个时间段的刷卡次数
"Count":1, "Count":1,
//取消单卡刷卡限制 //取消单卡刷卡限制
"Cancel":true
"Cancel":false
} }

Loading…
Cancel
Save