Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs

@@ -163,13 +163,13 @@ namespace Shentun.Peis.ChargeRequests
             {
                 request_no_rule_prefix = "";
             }
-            var primarykeyBuilderEnt = await _primarykeyBuilderRepository.FirstOrDefaultAsync(f => f.PrimarykeyBuilderId == "lis_request_no");
+            var primarykeyBuilderEnt = await _primarykeyBuilderRepository.FirstOrDefaultAsync(f => f.PrimarykeyBuilderId == "charge_request_no");
 
 
 
 
             string maxnum = "1";
-            string date = DateTime.Now.ToString("yyyyMMdd");// 当天
+            string date = DateTime.Now.ToString("yyMMdd");// 当天
 
             if (request_no_rule_coding == "0")
             {
@@ -182,9 +182,14 @@ namespace Shentun.Peis.ChargeRequests
                     {
                         //新的日期  为1  maxnum
                         primarykeyBuilderEnt.DateString = date;
+                        maxnum = "1";
+                    }
+                    else
+                    {
+                        maxnum = (Convert.ToInt32(primarykeyBuilderEnt.SerialNo) + 1).ToString();
                     }
                    
-                    maxnum = (Convert.ToInt32(primarykeyBuilderEnt.SerialNo) + 1).ToString();
+               
                     primarykeyBuilderEnt.SerialNo = maxnum; //更新新的序列号
 
                     LisRequestNo = request_no_rule_prefix + date + maxnum.PadLeft(Convert.ToInt32(request_no_rule_tail_len), '0');