Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2024-11-08 fa6a35a3f5299f1722db9f61b26e3d08e9d2eb0f

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 WarM/ÌõÂë´òÓ¡/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;