优化

Src/ApplyExtension.cs

@@ -33,7 +33,7 @@ namespace Kivii.Finances.Seeyon.Extensions
             }
         }
 
-        public static ResponseForm<ResponseData> RequestBillForm0710(this JsonServiceClient client, FormMain_InvoiceApplication0710 form, IAuthSession session)
+        public static ResponseForm<ResponseData> RequestBillForm0710(this JsonServiceClient client, FormMain_OrdinaryInvoice0710 form, IAuthSession session)
         {
             if (client == null) throw new ArgumentNullException("client");
             if (form == null) throw new ArgumentNullException("form");
@@ -41,12 +41,14 @@ namespace Kivii.Finances.Seeyon.Extensions
             var request = new RequestForm<RequestForm_InvoiceApply>();
             request.appName = Configs.appName;//"collaboration";
             request.data = new RequestData<RequestForm_InvoiceApply>();
-            request.data.templateCode = Configs.templateCode;//"JYHTSQ";
+            request.data.templateCode = Configs.templateCodeOrdinaryInvoice;//"JYHTSQ";
+            var templateCodeSuffix = form.收款单位名称.GetTemplateCodeSuffix();
+            if (!templateCodeSuffix.IsNullOrEmpty()) request.data.templateCode = $"{Configs.templateCodeOrdinaryInvoice}_{templateCodeSuffix}";
             request.data.draft = "0";
             //request.data.senderLoginName = token.bindingUser.loginName;
-            request.data.subject = $"预借发票申请({token.bindingUser.name} {DateTime.Now:yyyy-MM-dd HH:mm})";
+            request.data.subject = $"到账发票申请({token.bindingUser.name} {DateTime.Now:yyyy-MM-dd HH:mm})";
             request.data.data = new RequestForm_InvoiceApply();
-            request.data.data.formmain_0710 = new FormMain_InvoiceApplication0710();
+            request.data.data.formmain_0710 = new FormMain_OrdinaryInvoice0710();
             request.data.data.formmain_0710 = form;
             Console.WriteLine("-------------------------------------------------------------------------");
             Console.WriteLine(JsonSerializer.SerializeToString(request));
@@ -63,7 +65,9 @@ namespace Kivii.Finances.Seeyon.Extensions
             var request = new RequestForm<RequestForm_InvoiceApply>();
             request.appName = Configs.appName;//"collaboration";
             request.data = new RequestData<RequestForm_InvoiceApply>();
-            request.data.templateCode = Configs.templateCode;//"JYHTSQ";
+            request.data.templateCode = Configs.templateCodeAdvanceInvoice;//"JYHTSQ";
+            var templateCodeSuffix = form.收款单位.GetTemplateCodeSuffix();
+            if (!templateCodeSuffix.IsNullOrEmpty()) request.data.templateCode = $"{Configs.templateCodeOrdinaryInvoice}_{templateCodeSuffix}";
             request.data.draft = "0";
             //request.data.senderLoginName = token.bindingUser.loginName;
             request.data.subject = $"预借发票申请({token.bindingUser.name} {DateTime.Now:yyyy-MM-dd HH:mm})";
@@ -78,13 +82,13 @@ namespace Kivii.Finances.Seeyon.Extensions
         }
 
 
-        public static FormMain_InvoiceApplication0710 PayedConvertToForm(this List<InvoiceApply> applys)
+        public static FormMain_OrdinaryInvoice0710 PayedConvertToForm(this List<InvoiceApply> applys)
         {
             var apply = applys[0];
             var bizKvids = applys.ConvertAll(o => o.Kvid.ToString());
             //var strBizKvids = JsonSerializer.SerializeToString(bizKvids);
             var amount = applys.Sum(o => o.Amount);
-            var rtns = new FormMain_InvoiceApplication0710();
+            var rtns = new FormMain_OrdinaryInvoice0710();
             //var settlementType = "code|MonthlySettlement";//默认月结
             rtns.业务类型 = typeof(BillApply).FullName;
             rtns.业务编号 = bizKvids;
@@ -92,7 +96,7 @@ namespace Kivii.Finances.Seeyon.Extensions
             rtns.申请日期 = DateTime.Now.ToString("yyyy-MM-dd");
             rtns.申请部门 = KiviiContext.CurrentMember.DepartmentName;
             rtns.申请人 = apply.OperatorName;
-            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : "4529935671729733794";
+            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : (apply.Type == "增值税普通发票"? "4529935671729733794": "4728848026009816823");
             rtns.数量 = "1";
             rtns.总金额 = amount.ToString();
             rtns.金额大写 = amount.ConvertToChinese();
@@ -109,11 +113,11 @@ namespace Kivii.Finances.Seeyon.Extensions
             return rtns;
         }
 
-        public static FormMain_InvoiceApplication0710 PayedConvertToForm(this InvoiceApply apply)
+        public static FormMain_OrdinaryInvoice0710 PayedConvertToForm(this InvoiceApply apply)
         {
             var bizKvids = new List<string>();
             bizKvids.Add(apply.Kvid.ToString());
-            var rtns = new FormMain_InvoiceApplication0710();
+            var rtns = new FormMain_OrdinaryInvoice0710();
             //var settlementType = "code|MonthlySettlement";//默认月结
             rtns.业务类型 = typeof(BillApply).FullName;
             rtns.业务编号 = bizKvids;
@@ -121,7 +125,7 @@ namespace Kivii.Finances.Seeyon.Extensions
             rtns.申请日期 = DateTime.Now.ToString("yyyy-MM-dd");
             rtns.申请部门 = KiviiContext.CurrentMember.DepartmentName;
             rtns.申请人 = apply.OperatorName;
-            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : "4529935671729733794";
+            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : (apply.Type == "增值税普通发票"? "4529935671729733794": "4728848026009816823");
             rtns.数量 = "1";
             rtns.总金额 = apply.Amount.ToString();
             rtns.金额大写 = apply.Amount.ConvertToChinese();
@@ -152,7 +156,7 @@ namespace Kivii.Finances.Seeyon.Extensions
             rtns.申请日期 = DateTime.Now.ToString("yyyy-MM-dd");
             rtns.申请部门 = KiviiContext.CurrentMember.DepartmentName;
             rtns.申请人 = apply.OperatorName;
-            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : "4529935671729733794";
+            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : (apply.Type == "增值税普通发票"? "4529935671729733794": "4728848026009816823");
             rtns.数量 = "1";
             rtns.总金额 = amount.ToString();
             rtns.金额大写 = amount.ConvertToChinese();
@@ -181,7 +185,7 @@ namespace Kivii.Finances.Seeyon.Extensions
             rtns.申请日期 = DateTime.Now.ToString("yyyy-MM-dd");
             rtns.申请部门 = KiviiContext.CurrentMember.DepartmentName;
             rtns.申请人 = apply.OperatorName;
-            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : "4529935671729733794";
+            rtns.发票类型 = apply.Type == "增值税专用发票" ? "-4189929216282050282" : (apply.Type == "增值税普通发票"? "4529935671729733794": "4728848026009816823");
             rtns.数量 = "1";
             rtns.总金额 = apply.Amount.ToString();
             rtns.金额大写 = apply.Amount.ConvertToChinese();
@@ -198,6 +202,16 @@ namespace Kivii.Finances.Seeyon.Extensions
             return rtns;
         }
 
+        public static string GetTemplateCodeSuffix(this string payeeName)
+        {
+            var rtns = string.Empty;
+            if (payeeName.Contains("南京市产品质量监督检验院")) rtns = "ZJY";
+            if (payeeName.Contains("深圳市宁深检验检测技术有限公司")) rtns = "NS";
+            if (payeeName.Contains("江苏苏测智能装备检测有限公司")) rtns = "ZB";
+            if (payeeName.Contains("江苏苏测检测认证有限公司")) rtns = "SC";
+            return rtns;
+        }
+
         public static string ConvertToChinese(this decimal Num)
         {
             string[] DX_SZ = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾" };//大写数字  

Src/Configs.cs

@@ -16,7 +16,10 @@ namespace Kivii.Finances.Seeyon
         internal static string RouteRestToken = "/seeyon/rest/token";
 
         internal static string appName = "collaboration";//"collaboration";//OA提供
-        internal static string templateCode = "AdvanceInvoice";//"JYHTSQ";//OA提供
+        internal static string templateCodeAdvanceInvoice = "AdvanceInvoice";//OA提供
+        internal static string templateCodeOrdinaryInvoice = "OrdinaryInvoice";//OA提供
+        internal static string templateCodeInvoiceVoid = "InvoiceVoid";//OA提供
+        internal static string templateCodeInvoiceRedOffset = "InvoiceRedOffset";//OA提供
 
         internal static string restUserName = "settlement";//"rest";
         internal static string restPassword = "53aab6e3-05e5-4f6f-9084-38247e6142b6";//"fba09671-2b1e-4c8c-9aaf-de16821070df";

Src/Entities/BillApply.cs

@@ -273,7 +273,7 @@ namespace Kivii.Finances.Seeyon.Entities
 
     public class RequestForm_InvoiceApply
     {
-        public FormMain_InvoiceApplication0710 formmain_0710 { get; set; }
+        public FormMain_OrdinaryInvoice0710 formmain_0710 { get; set; }
 
         public FormMain_AdvanceInvoice0318 formmain_0318 { get; set; }
     }
@@ -282,7 +282,7 @@ namespace Kivii.Finances.Seeyon.Entities
     /// <summary>
     /// 发起流程表单接口【到账发票申请】
     /// </summary>
-    public class FormMain_InvoiceApplication0710
+    public class FormMain_OrdinaryInvoice0710
     {
         /// <summary>
         /// 唯一编号,BizKvid
@@ -317,7 +317,7 @@ namespace Kivii.Finances.Seeyon.Entities
 
         public string 收款单位开户行及账号 { get; set; }
         /// <summary>
-        /// 票据类型{普通：4529935671729733794    专票：-4189929216282050282}
+        /// 发票类型{普通：4529935671729733794  专票：-4189929216282050282  收据：4728848026009816823}
         /// </summary>
         public string 发票类型 { get; set; }
 
@@ -378,7 +378,7 @@ namespace Kivii.Finances.Seeyon.Entities
         public string 开户行及账号 { get; set; }
 
         /// <summary>
-        /// 票据类型{普通：4529935671729733794    专票：-4189929216282050282}
+        /// 发票类型{普通：4529935671729733794  专票：-4189929216282050282  收据：4728848026009816823}
         /// </summary>
         public string 发票类型 { get; set; }
 
@@ -431,7 +431,7 @@ namespace Kivii.Finances.Seeyon.Entities
         public string 原发票号 { get; set; }
 
         /// <summary>
-        /// 原发票类型{普通：4529935671729733794    专票：-4189929216282050282}
+        /// 发票类型{普通：4529935671729733794  专票：-4189929216282050282  收据：4728848026009816823}
         /// </summary>
         public string 原发票类型 { get; set; }
 
@@ -480,7 +480,7 @@ namespace Kivii.Finances.Seeyon.Entities
         public string 原发票号 { get; set; }
 
         /// <summary>
-        /// 原发票类型{普通：4529935671729733794    专票：-4189929216282050282}
+        /// 发票类型{普通：4529935671729733794  专票：-4189929216282050282  收据：4728848026009816823}
         /// </summary>
         public string 原发票类型 { get; set; }
 

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2023.10110")]
-[assembly: AssemblyFileVersion("5.4.2023.10110")]
+[assembly: AssemblyVersion("5.4.2023.12180")]
+[assembly: AssemblyFileVersion("5.4.2023.12180")]