From fa6a35a3f5299f1722db9f61b26e3d08e9d2eb0f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 08 十一月 2024 13:37:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
index 99f13fa..3c4deaf 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -771,7 +771,8 @@
                             }
                             //
                             LSH = LSH + 1;
-                            LSH2 = ConvertToBase(LSH, 36);
+                            LSH2 = LSH.ToString();
+                            //LSH2 = ConvertToBase(LSH, 34);
                             while (LSH2.Length < LSHlen)  //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
                             {
                                 LSH2 = "0" + LSH2;
@@ -1008,7 +1009,7 @@
         #region  灏嗗崄杩涘埗鏁板�艰浆鎴愭寚瀹氳繘鍒舵暟鍊硷紙num涓鸿杞崲鐨勫崄杩涜鏁板�硷紝nbase涓烘寚瀹氳繘鍒讹級
         public string ConvertToBase(int num, int nbase)
         {
-            string chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+            string chars = "0123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
             if (nbase < 2 || nbase > chars.Length)
                 return "";
             int r;

--
Gitblit v1.9.1