Skip to content

T
ticket_half_auto
Commit 60130e2f authored by 李佳's avatar 李佳
Browse files
Options

半自动版本点击按钮打印报表会上传两次，干掉一次

parent 2e54d381
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 93 deletions
ChuPiao.AutoPrint.Desktop/AutoPrint/AutoPrintTabPage.cs
View file @ 60130e2f
......@@ -183,11 +183,13 @@ namespace ChuPiao.AutoPrint.Desktop.AutoPrint
void service_PrintTimeReportOver(object sender, EventArgs e)
{
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = true;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = true;
Logger.Log.Info("service_PrintTimeReportOver");
}
void service_PrintMoneyReportOver(object sender, EventArgs e)
{
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = true;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = true;
Logger.Log.Info("service_PrintMoneyReportOver");
}
......@@ -636,6 +638,7 @@ namespace ChuPiao.AutoPrint.Desktop.AutoPrint
}
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = false;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = false;
try
{
......@@ -652,6 +655,7 @@ namespace ChuPiao.AutoPrint.Desktop.AutoPrint
{
MessageService.ShowMessage("请选择机器号", "操作提示");
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = true;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = true;
return;
}
}
......@@ -659,12 +663,14 @@ namespace ChuPiao.AutoPrint.Desktop.AutoPrint
{
LoggingService.Error(string.Concat("上传天报表异常。", ex));
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = true;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = true;
}
}
void ToolStripButtonUpdateMoney_Click(object sender, EventArgs e)
{
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = false;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = false;
try
{
......@@ -680,6 +686,7 @@ namespace ChuPiao.AutoPrint.Desktop.AutoPrint
if (selectedMachineNum == 0)
{
MessageService.ShowMessage("请选择机器号", "操作提示");
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = true;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = true;
return;
......@@ -688,6 +695,7 @@ namespace ChuPiao.AutoPrint.Desktop.AutoPrint
catch (Exception ex)
{
LoggingService.Error(string.Concat("上传缴款报表异常。", ex));
autoPrintToolStrip.ToolStripButtonPrintCurrentDayReport.Enabled = true;
autoPrintToolStrip.ToolStripButtonUpdateMoney.Enabled = true;
}
......
ChuPiao.AutoPrint/Services/AutoPrint/AutoPrintService.cs
View file @ 60130e2f
......@@ -2615,89 +2615,90 @@ namespace ChuPiao.AutoPrint.Services.AutoPrint
DecodeMachinePayMoneyReport decodePrintData = new DecodeMachinePayMoneyReport();
LotMachine.PrintPayMoneyReport(decodePrintData, false);
//半自动的版本，虚拟打印机会传一次报表，这里就不重复传了
if (decodePrintData.DecodeSuccess)
{
A10006UploadMachineBalance pack = new A10006UploadMachineBalance();
pack.AgentId = LotMachine.MachineInfo.M_Number;
pack.Salt = LotMachine.MachineInfo.M_Salt;
//A10006UploadMachineBalance pack = new A10006UploadMachineBalance();
//pack.AgentId = LotMachine.MachineInfo.M_Number;
//pack.Salt = LotMachine.MachineInfo.M_Salt;
pack.Balance = decodePrintData.MachinePayMoneyReportEntity.R_Balance;
pack.QueryTime = decodePrintData.MachinePayMoneyReportEntity.R_QueryTime.ToString("yyyyMMddHHmmss");
//pack.Balance = decodePrintData.MachinePayMoneyReportEntity.R_Balance;
//pack.QueryTime = decodePrintData.MachinePayMoneyReportEntity.R_QueryTime.ToString("yyyyMMddHHmmss");
//天
MachineReportTime reportTime = MachineReportTimeList.GetCurrentTime(1);
pack.From = reportTime.From.ToString("yyyyMMdd");
pack.To = reportTime.To.ToString("yyyyMMdd");
pack.Type = 1;
pack.TypeName = reportTime.ValueMember;
pack.Prntext = decodePrintData.MachinePayMoneyReportEntity.R_PrnText;
////天
//MachineReportTime reportTime = MachineReportTimeList.GetCurrentTime(1);
//pack.From = reportTime.From.ToString("yyyyMMdd");
//pack.To = reportTime.To.ToString("yyyyMMdd");
//pack.Type = 1;
//pack.TypeName = reportTime.ValueMember;
//pack.Prntext = decodePrintData.MachinePayMoneyReportEntity.R_PrnText;
A10006UploadMachineBalanceRet packRet = PackManager.Instance.Send(pack) as A10006UploadMachineBalanceRet;
if (packRet.Code <= 0)
{
LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
throw new Exception("上传缴款报表中的余额失败，" + packRet.Code.ToString() + " " + packRet.Message);
//A10006UploadMachineBalanceRet packRet = PackManager.Instance.Send(pack) as A10006UploadMachineBalanceRet;
//if (packRet.Code <= 0)
//{
// LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
// throw new Exception("上传缴款报表中的余额失败，" + packRet.Code.ToString() + " " + packRet.Message);
}
//}
DateTime now = DateTime.Now.AddHours(-7);
//归属到周余额
reportTime = MachineReportTimeList.GetCurrentTime(2);
if (reportTime.To.ToShortDateString() == now.ToShortDateString())
{
pack.From = reportTime.From.ToString("yyyyMMdd");
pack.To = reportTime.To.ToString("yyyyMMdd");
pack.Type = 2;
pack.TypeName = reportTime.ValueMember;
//DateTime now = DateTime.Now.AddHours(-7);
////归属到周余额
//reportTime = MachineReportTimeList.GetCurrentTime(2);
//if (reportTime.To.ToShortDateString() == now.ToShortDateString())
//{
// pack.From = reportTime.From.ToString("yyyyMMdd");
// pack.To = reportTime.To.ToString("yyyyMMdd");
// pack.Type = 2;
// pack.TypeName = reportTime.ValueMember;
packRet = PackManager.Instance.Send(pack) as A10006UploadMachineBalanceRet;
if (packRet.Code <= 0)
{
LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
throw new Exception("上传缴款报表中的余额失败，" + packRet.Code.ToString() + " " + packRet.Message);
// packRet = PackManager.Instance.Send(pack) as A10006UploadMachineBalanceRet;
// if (packRet.Code <= 0)
// {
// LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
// throw new Exception("上传缴款报表中的余额失败，" + packRet.Code.ToString() + " " + packRet.Message);
}
}
//归属到月余额
reportTime = MachineReportTimeList.GetCurrentTime(3);
if (reportTime.To.ToShortDateString() == now.ToShortDateString())
{
pack.From = reportTime.From.ToString("yyyyMMdd");
pack.To = reportTime.To.ToString("yyyyMMdd");
pack.Type = 3;
pack.TypeName = reportTime.ValueMember;
// }
//}
////归属到月余额
//reportTime = MachineReportTimeList.GetCurrentTime(3);
//if (reportTime.To.ToShortDateString() == now.ToShortDateString())
//{
// pack.From = reportTime.From.ToString("yyyyMMdd");
// pack.To = reportTime.To.ToString("yyyyMMdd");
// pack.Type = 3;
// pack.TypeName = reportTime.ValueMember;
packRet = PackManager.Instance.Send(pack) as A10006UploadMachineBalanceRet;
if (packRet.Code <= 0)
{
LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
throw new Exception("上传缴款报表中的余额失败，" + packRet.Code.ToString() + " " + packRet.Message);
// packRet = PackManager.Instance.Send(pack) as A10006UploadMachineBalanceRet;
// if (packRet.Code <= 0)
// {
// LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
// throw new Exception("上传缴款报表中的余额失败，" + packRet.Code.ToString() + " " + packRet.Message);
}
}
// }
//}
if (decodePrintData.MachinePayMoneyReportEntity.R_DataList.Count > 0)
{
A10007UploadMachinePay pack1 = new A10007UploadMachinePay();
pack1.AgentId = LotMachine.MachineInfo.M_Number;
pack1.Salt = LotMachine.MachineInfo.M_Salt;
//if (decodePrintData.MachinePayMoneyReportEntity.R_DataList.Count > 0)
//{
// A10007UploadMachinePay pack1 = new A10007UploadMachinePay();
// pack1.AgentId = LotMachine.MachineInfo.M_Number;
// pack1.Salt = LotMachine.MachineInfo.M_Salt;
pack1.QueryTime = decodePrintData.MachinePayMoneyReportEntity.R_QueryTime;
foreach (PayMoneyDataItem item in decodePrintData.MachinePayMoneyReportEntity.R_DataList)
{
pack1.PaymentList.Add(new UploadMachinePayItem(item.PayType, item.PayMoney, item.PayTime,item.Fee));
}
// pack1.QueryTime = decodePrintData.MachinePayMoneyReportEntity.R_QueryTime;
// foreach (PayMoneyDataItem item in decodePrintData.MachinePayMoneyReportEntity.R_DataList)
// {
// pack1.PaymentList.Add(new UploadMachinePayItem(item.PayType, item.PayMoney, item.PayTime,item.Fee));
// }
A10007UploadMachinePayRet packRet1 = PackManager.Instance.Send(pack1) as A10007UploadMachinePayRet;
if (packRet1.Code <= 0)
{
LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
throw new Exception("上传缴款报表中的缴款记录失败，" + packRet1.Code.ToString() + " " + packRet1.Message);
// A10007UploadMachinePayRet packRet1 = PackManager.Instance.Send(pack1) as A10007UploadMachinePayRet;
// if (packRet1.Code <= 0)
// {
// LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传缴款报表失败，请重试！");
// throw new Exception("上传缴款报表中的缴款记录失败，" + packRet1.Code.ToString() + " " + packRet1.Message);
}
}
// }
//}
LotMachine.Log.Info(LotMachine.MachineInfo.M_Number + " 上传缴款报表成功！");
//LotMachine.Log.Info(LotMachine.MachineInfo.M_Number + " 上传缴款报表成功！");
}
else
......@@ -2721,34 +2722,35 @@ namespace ChuPiao.AutoPrint.Services.AutoPrint
DecodeMachineReport decodeMachineReport = new DecodeMachineReport();
LotMachine.PrintReport(from, to, decodeMachineReport, false);
//半自动的版本，虚拟打印机会传一次报表，这里就不重复传了
if (decodeMachineReport.DecodeSuccess)
{
A10005UploadMachineSale pack = new A10005UploadMachineSale();
pack.AgentId = LotMachine.MachineInfo.M_Number;
pack.Salt = LotMachine.MachineInfo.M_Salt;
pack.SaleMoney = decodeMachineReport.MachineReportEntity.R_SaleMoney;
pack.SaleNum = decodeMachineReport.MachineReportEntity.R_SaleTicket;
pack.EncashMoney = decodeMachineReport.MachineReportEntity.R_EncashMoney;
pack.EncashNum = decodeMachineReport.MachineReportEntity.R_EncashTicket;
pack.ReturnMoney = decodeMachineReport.MachineReportEntity.R_ReturnMoney;
pack.ReturnNum = decodeMachineReport.MachineReportEntity.R_ReturnTicket;
pack.QueryTime = decodeMachineReport.MachineReportEntity.R_QueryTime.ToString("yyyyMMddHHmmss");
pack.From = decodeMachineReport.MachineReportEntity.R_StartTime.ToString("yyyyMMdd");
pack.To = decodeMachineReport.MachineReportEntity.R_EndTime.ToString("yyyyMMdd");
pack.Type = type;
pack.TypeName = typename;
pack.Prntext = decodeMachineReport.MachineReportEntity.R_PrnText;
A10005UploadMachineSaleRet packRet = PackManager.Instance.Send(pack) as A10005UploadMachineSaleRet;
if (packRet.Code <= 0)
{
LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传时段报表失败，请重试！");
throw new Exception("上传时段报表失败，" + packRet.Code.ToString() + " " + packRet.Message);
//A10005UploadMachineSale pack = new A10005UploadMachineSale();
//pack.AgentId = LotMachine.MachineInfo.M_Number;
//pack.Salt = LotMachine.MachineInfo.M_Salt;
//pack.SaleMoney = decodeMachineReport.MachineReportEntity.R_SaleMoney;
//pack.SaleNum = decodeMachineReport.MachineReportEntity.R_SaleTicket;
//pack.EncashMoney = decodeMachineReport.MachineReportEntity.R_EncashMoney;
//pack.EncashNum = decodeMachineReport.MachineReportEntity.R_EncashTicket;
//pack.ReturnMoney = decodeMachineReport.MachineReportEntity.R_ReturnMoney;
//pack.ReturnNum = decodeMachineReport.MachineReportEntity.R_ReturnTicket;
//pack.QueryTime = decodeMachineReport.MachineReportEntity.R_QueryTime.ToString("yyyyMMddHHmmss");
//pack.From = decodeMachineReport.MachineReportEntity.R_StartTime.ToString("yyyyMMdd");
//pack.To = decodeMachineReport.MachineReportEntity.R_EndTime.ToString("yyyyMMdd");
//pack.Type = type;
//pack.TypeName = typename;
//pack.Prntext = decodeMachineReport.MachineReportEntity.R_PrnText;
//A10005UploadMachineSaleRet packRet = PackManager.Instance.Send(pack) as A10005UploadMachineSaleRet;
//if (packRet.Code <= 0)
//{
// LotMachine.Log.Warn(LotMachine.MachineInfo.M_Number + " 上传时段报表失败，请重试！");
// throw new Exception("上传时段报表失败，" + packRet.Code.ToString() + " " + packRet.Message);
}
//}
LotMachine.Log.Info(LotMachine.MachineInfo.M_Number + " 上传时段报表成功！");
//LotMachine.Log.Info(LotMachine.MachineInfo.M_Number + " 上传时段报表成功！");
}
else
......
ChuPiao_Linux.suo
View file @ 60130e2f
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment