From 899dc884de4a46ea32acdf2f2d6b857b4c5fbcf4 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 28 七月 2022 17:05:13 +0800
Subject: [PATCH] 条码生成模块,拆分功能修改

---
 WarM/条码打印/Gy_BarCodeBill.designer.cs |   31 ++++++++++++++++---------------
 WarM/条码打印/Gy_BarCodeBill.cs          |    6 ++++++
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index d249490..b70b19d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -3113,6 +3113,12 @@
                 grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
                 grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
                 grdMain.Rows[row + r].Cells[HMakerCol].Value = grdMain.Rows[row].Cells[HMakerCol].Value;
+                //缃戞牸鎵撳嬀
+                DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+                oCell.ThreeState = false;
+                oCell.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+                oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell;
 
             }
             DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index e4a90dc..13b91ee 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -37,9 +37,9 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.AddRow = new System.Windows.Forms.ToolStripButton();
             this.spRow = new System.Windows.Forms.ToolStripButton();
+            this.bc = new System.Windows.Forms.ToolStripButton();
             this.DelRow = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.bc = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
             this.wxm = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@@ -245,6 +245,20 @@
             this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
             this.spRow.Click += new System.EventHandler(this.spRow_Click);
             // 
+            // bc
+            // 
+            this.bc.AutoSize = false;
+            this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+            this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.bc.Name = "bc";
+            this.bc.Size = new System.Drawing.Size(35, 47);
+            this.bc.Text = "鐢熸垚";
+            this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.bc.Click += new System.EventHandler(this.bc_Click);
+            // 
             // DelRow
             // 
             this.DelRow.AutoSize = false;
@@ -263,20 +277,7 @@
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
             this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
-            // 
-            // bc
-            // 
-            this.bc.AutoSize = false;
-            this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
-            this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.bc.Name = "bc";
-            this.bc.Size = new System.Drawing.Size(35, 47);
-            this.bc.Text = "鐢熸垚";
-            this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.bc.Click += new System.EventHandler(this.bc_Click);
+            this.toolStripSeparator4.Visible = false;
             // 
             // toolStripSeparator8
             // 

--
Gitblit v1.9.1