From 1aef885a3aa69ddeaceb9260ab3cca86cbbbc23d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 05 十月 2024 18:45:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
index 53ff25e..eeab9df 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -410,6 +410,19 @@
             this.Sub_SaveBill();
             Display();
 
+            //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
+            grdList.Rows[0].Cells[0].Value = "*";
+            Report = new GridppReport();
+            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf");  //here .
+            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+            Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+            if (comboBox_PrinterParams.Text != "")
+            {
+                Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(榛樿)", "");
+            }
+            Report.Print(false);
+
             Display4();
         }
         //淇濆瓨鍗曟嵁
@@ -2412,7 +2425,7 @@
             }
             else
             {
-                timer3.Enabled = false;
+                //timer3.Enabled = false;
                 currentRepeatConnectTimes = 0;
                 MessageBox.Show("杩炴帴宸叉柇寮�锛岃閲嶆柊杩炴帴锛�!");
             }

--
Gitblit v1.9.1