SVN r812
SVN-Revision: r812
This commit is contained in:
@@ -228,6 +228,9 @@ namespace Lskj.PubPrint
|
|||||||
{
|
{
|
||||||
msg = "";
|
msg = "";
|
||||||
string printSQL = ReplaceHelper.ReplaceRowParam(item, item["printSQL"] + "");
|
string printSQL = ReplaceHelper.ReplaceRowParam(item, item["printSQL"] + "");
|
||||||
|
string printSQL1 = ReplaceHelper.ReplaceRowParam(item, item["printSQL1"] + "");//Delphi打印,把printSQL1和printSQL2一起传入进去 2025-06-17
|
||||||
|
string printSQL2 = ReplaceHelper.ReplaceRowParam(item, item["printSQL2"] + "");
|
||||||
|
|
||||||
int num = int.Parse(item["PrintCount"] + "");
|
int num = int.Parse(item["PrintCount"] + "");
|
||||||
string dllName = item["libaryName"] + "";
|
string dllName = item["libaryName"] + "";
|
||||||
string printerName = item["printerName"] + "";
|
string printerName = item["printerName"] + "";
|
||||||
@@ -240,13 +243,15 @@ namespace Lskj.PubPrint
|
|||||||
{
|
{
|
||||||
if (num > 1)
|
if (num > 1)
|
||||||
{
|
{
|
||||||
DelphiHelper.LoadDelphiDll(PubUtil.AbsolutelyPath + "Lib\\" + item["libaryName"], item["libaryName"] + "", item["printModuleName"] + "", item["printSQL"] + "", printSQL, Convert.ToInt32(3), item["printSQL"] + "");
|
//DelphiHelper.LoadDelphiDll(PubUtil.AbsolutelyPath + "Lib\\" + item["libaryName"], item["libaryName"] + "", item["printModuleName"] + "", item["printSQL"] + "", printSQL, Convert.ToInt32(3), item["printSQL"] + "");
|
||||||
|
DelphiHelper.LoadDelphiDll(PubUtil.AbsolutelyPath + "Lib\\" + item["libaryName"], item["libaryName"] + "", item["printModuleName"] + "", printSQL, printSQL1, Convert.ToInt32(3), printSQL2);
|
||||||
item["PrintCount"] = num - 1;
|
item["PrintCount"] = num - 1;
|
||||||
StartPrint(keyValuePair, out msg);
|
StartPrint(keyValuePair, out msg);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DelphiHelper.LoadDelphiDll(PubUtil.AbsolutelyPath + "Lib\\" + item["libaryName"], item["libaryName"] + "", item["printModuleName"] + "", item["printSQL"] + "", printSQL, Convert.ToInt32(3), item["printSQL"] + "");
|
//DelphiHelper.LoadDelphiDll(PubUtil.AbsolutelyPath + "Lib\\" + item["libaryName"], item["libaryName"] + "", item["printModuleName"] + "", item["printSQL"] + "", printSQL, Convert.ToInt32(3), item["printSQL"] + "");
|
||||||
|
DelphiHelper.LoadDelphiDll(PubUtil.AbsolutelyPath + "Lib\\" + item["libaryName"], item["libaryName"] + "", item["printModuleName"] + "", printSQL, printSQL1, Convert.ToInt32(3), printSQL2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -511,27 +516,4 @@ namespace Lskj.PubPrint
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
|
||||||
MessageUtil.Show(Message, ex.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void 打印回撤ToolStripMenuItem_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
DataRow item = this.gridView2.GetFocusedDataRow();
|
|
||||||
string sqlValue = string.Format("update p_SystemPrintTaskTab set printFlag = 0 where id='{0}'", item["id"]);
|
|
||||||
SqlHelper.ExecuteNonQuery(sqlValue);
|
|
||||||
DataTable DT = SqlHelper.ExecuteDataTable(string.Format("{0} {1} printFlag = 1 {2} {3}", Sql, condition, PrintScreen, SortField));
|
|
||||||
this.Afterprint.DataSource = DT;
|
|
||||||
RefreshLogUIThread(DateTime.Now + " 打印已回退.\r\n");
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
|
||||||
MessageUtil.Show(Message, ex.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user