From fdfee59e6a121674bbfa430be30a6c1cb956f34e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 08 十二月 2025 10:38:26 +0800
Subject: [PATCH] 夏宝调拨条码生成模块,条码生成时流水号获取修正

---
 WarM/条码打印/Gy_BarCodeBill_XiaBao.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
index 31e55f9..c02460a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
@@ -706,10 +706,10 @@
                             ////鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
                             //sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
 
-                            //寰幆鍒ゆ柇璇ヨ鍓嶉潰鎵�鏈夎涓槸鍚﹀瓨鍦ㄧ浉鍚岀墿鏂�
+                            //寰幆鍒ゆ柇璇ヨ鍓嶉潰鎵�鏈夎涓槸鍚﹀瓨鍦ㄧ浉鍚屾潯鐮佸墠缂�
                             for (int i = 0; i < j; i++)
                             {
-                                if(ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value)== ClsPub.isLong(grdMain.Rows[j - i - 1].Cells[HMaterIDCol].Value))
+                                if(sTMNumber == ClsPub.isStrNull(grdMain.Rows[j - i - 1].Cells[HTMNumberCol].Value))
                                 {
                                     LSH = ClsPub.isLong(grdMain.Rows[j - i - 1].Cells[HLSHCol].Value);
                                     HBarcodeNo = ClsPub.isLong(grdMain.Rows[j - i - 1].Cells[HBarcodeNoCol].Value);
@@ -872,11 +872,11 @@
                         }
                         else
                         {
-                            //寰幆鍒ゆ柇璇ヨ鍚庨潰鐨勬墍鏈夎鏄惁瀛樺湪鍜岃琛岀墿鏂欑浉鍚岀殑琛岋紝濡備笉瀛樺湪 鍒欏洖濉搴旀祦姘村彿淇℃伅锛屽瓨鍦ㄥ垯涓嶅洖濉祦姘村彿淇℃伅
+                            //寰幆鍒ゆ柇璇ヨ鍚庨潰鐨勬墍鏈夎鏄惁瀛樺湪鍜岃琛屾潯鐮佸墠缂�鐩稿悓鐨勮锛屽涓嶅瓨鍦� 鍒欏洖濉搴旀祦姘村彿淇℃伅锛屽瓨鍦ㄥ垯涓嶅洖濉祦姘村彿淇℃伅
                             bool b = false;
                             for (int i = 0; i < j; i++)
                             {
-                                if (ClsPub.isLong(grdMain.Rows[grdMain.Rows.Count - j - 1].Cells[HMaterIDCol].Value) == ClsPub.isLong(grdMain.Rows[grdMain.Rows.Count - i - 1].Cells[HMaterIDCol].Value))
+                                if (ClsPub.isStrNull(grdMain.Rows[grdMain.Rows.Count - j - 1].Cells[HTMNumberCol].Value) == ClsPub.isStrNull(grdMain.Rows[grdMain.Rows.Count - i - 1].Cells[HTMNumberCol].Value))
                                 {
                                     b = true;
                                     break;

--
Gitblit v1.9.1