From f7de63161a3bddece7d3de1ac7124552b9dfe635 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期五, 31 十二月 2021 17:44:22 +0800
Subject: [PATCH] 博日条码规则变更

---
 WarM/条码打印/Gy_BarCodeBill.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 b539031..8a76fc9 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"
@@ -1229,7 +1229,8 @@
                         //if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
                         //{
                             //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
-                            TM = HMaterNumber + LSH2 + sYear + sPeriod + sDay ;
+                            //T/*M*/ = HMaterNumber + LSH2 + sYear + sPeriod + sDay;
+                        TM =  LSH2 + sYear + sPeriod + sDay;
                         //}
 
                         if (i + 1 > grdSub.Rows.Count)
@@ -2401,10 +2402,14 @@
             grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅"].ToString();
             grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
             grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
-            if (cmbHBarCodeType.Text == "鎵规鏉$爜" && CampanyName == "鍗氭棩绉戞妧")
+            if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
             {
                 grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
             }
+            else if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�")
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
+            }
             else
             {
                 grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();

--
Gitblit v1.9.1