优化

Src/Kivii.Biz.Finances.V2.0.csproj

@@ -98,119 +98,135 @@
     <Compile Include="Transforms\RestfulStatistic.cs" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Content\codes\CurrentMember.InvoiceTitle.Address.json" />
+    <EmbeddedResource Include="Content\codes\CurrentMember.InvoiceTitle.json" />
+    <EmbeddedResource Include="Content\codet\CurrentMember.InvoiceTitle.Address.json" />
+    <EmbeddedResource Include="Content\codet\CurrentMember.InvoiceTitle.json" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
     <EmbeddedResource Include="Content\codes\App.Const.Finances.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.DownloadField.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Account.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.AccountDetail.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Bill.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Bill.Settlement.Selector.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Bill.Template.Selector.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Debiting.Payment.Selector.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.General.Storage.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.General.Template.Selector.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Invoice.Form.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Invoice.MultiAccept.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Invoice.Payed.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceApply.Execute.Form.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceApply.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceApply.Invoice.Accept.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceApply.Payment.Selector.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceApplyDetail.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceTitle.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceTitle.Selector.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Paying.Account.Selector.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Paying.Payment.Selector.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Accept.Form.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Chart.Department.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Chart.Month.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Filter.Form.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Offset.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Import.Excel.Edit.Form.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Import.Excel.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Import.Uploader.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Transfer.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Payment.Used.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Biz.Report.Selector.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Chart.Department.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Chart.Month.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Chart.Type.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Customer.Create.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Customer.Selector.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Form.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Logs.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.MultiForm.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Paying.Form.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.SettlementDetail.Form.js" />
+    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Statistic.Chart.js" />
     <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Transfer.Account.Selector.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Account.List.Deposit.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Account.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Bill.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Dashboard.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Invoice.Debit.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Invoice.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.InvoiceApply.Current.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Invoice.List2.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.InvoiceApply.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.InvoiceApply.Payment.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.InvoiceTitle.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Payment.Accept.List.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Payment.Filter.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Payment.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Payment.Filter.List2.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Payment.Split.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Settlement.Biz.Contract.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Settlement.Biz.Report.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Payment.Split.List2.js" />
     <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Settlement.List.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Statistic.Invoice.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Statistic.Payment.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Statistic.Settlement.Group.js" />
+    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Statistic.Settlement.js" />
     <EmbeddedResource Include="Content\codet\App.Const.Finances.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.DownloadField.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Account.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.AccountDetail.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Bill.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Bill.Settlement.Selector.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Bill.Template.Selector.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Debiting.Payment.Selector.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.General.Storage.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.General.Template.Selector.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Invoice.Form.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Invoice.MultiAccept.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Invoice.Payed.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceApply.Execute.Form.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceApply.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceApply.Invoice.Accept.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceApply.Payment.Selector.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceApplyDetail.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceTitle.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceTitle.Selector.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Paying.Account.Selector.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Paying.Payment.Selector.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Accept.Form.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Chart.Department.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Chart.Month.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Filter.Form.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Offset.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Import.Excel.Edit.Form.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Import.Excel.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Import.Uploader.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Transfer.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Payment.Used.List.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Biz.Report.Selector.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Chart.Department.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Chart.Month.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Chart.Type.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Customer.Create.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Customer.Selector.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Form.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Logs.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.MultiForm.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Paying.Form.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.SettlementDetail.Form.js" />
+    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Statistic.Chart.js" />
     <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Transfer.Account.Selector.js" />
+    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Account.List.Deposit.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Account.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Bill.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Dashboard.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Invoice.Debit.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Invoice.List.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.InvoiceApply.Current.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Invoice.List2.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.InvoiceApply.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.InvoiceApply.Payment.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.InvoiceTitle.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Payment.Accept.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Payment.Filter.List.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Payment.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Payment.Filter.List2.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Payment.Split.List.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Settlement.Biz.Contract.List.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Settlement.Biz.Report.List.js" />
+    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Payment.Split.List2.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Settlement.List.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Account.Form.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.General.Template.Selector.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Invoice.Form.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.InvoiceTitle.Biz.NjzjCustomer.Form.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Paying.Account.Selector.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Biz.Contract.Form.js" />
-    <EmbeddedResource Include="Content\codes\Classic.Control.Kivii.Finances.Settlement.Logs.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Account.List.Deposit.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Invoice.Biz.ErpInvoice.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.InvoiceTitle.Biz.NjzjCustomer.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Payment.Biz.ErpPayment.List.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Statistic.Invoice.js" />
-    <EmbeddedResource Include="Content\codes\Classic.View.Kivii.Finances.Statistic.Settlement.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Account.Form.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.General.Template.Selector.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Invoice.Form.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.InvoiceTitle.Biz.NjzjCustomer.Form.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Paying.Account.Selector.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Biz.Contract.Form.js" />
-    <EmbeddedResource Include="Content\codet\Classic.Control.Kivii.Finances.Settlement.Logs.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Account.List.Deposit.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Invoice.Biz.ErpInvoice.List.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.InvoiceTitle.Biz.NjzjCustomer.List.js" />
-    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Payment.Biz.ErpPayment.List.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Statistic.Invoice.js" />
+    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Statistic.Payment.js" />
+    <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Statistic.Settlement.Group.js" />
     <EmbeddedResource Include="Content\codet\Classic.View.Kivii.Finances.Statistic.Settlement.js" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

Src/Transforms/RestfulInvoice.cs

@@ -288,6 +288,7 @@ namespace Kivii.Finances.Transforms
                 invoice.PayerBankAccount = info.PayerBankAccount;
                 invoice.OperatorName = info.OperatorName;
                 invoice.Remark = info.Remark;
+                invoice.Summary = "手动录入发票!";
 
                 invoice.Metadata = new Dictionary<string, string>();
                 if (!info.Metadata.IsNullOrEmpty())

Src/Transforms/RestfulInvoiceApply.Apply.cs

@@ -299,7 +299,7 @@ namespace Kivii.Finances.Transforms
             if (applys.Sum(o => o.Amount) != existDetails.Sum(p => p.Amount)) throw new Exception("总金额和明细总额不一致!");
             var applyRelations = conn.Select<InvoiceApply>(o => Sql.In(o.ParentKvid, applys.ConvertAll(p => p.Kvid)) && o.OperateType == InvoiceApplyType.Related && o.OffsetKvid == Guid.Empty);
             var payments = conn.Select<Payment>(o => Sql.In(o.Kvid, applyRelations.ConvertAll(p => p.BizKvid)));//Type:Split,Pos,Cash,WeChat...
-            (conn.Exists<Invoice>(o => o.OffsetKvid != Guid.Empty && Sql.In(o.BizKvid, payments.ConvertAll(p => p.RootKvid)))).ThrowIfTrue("已有开票的到账,无法重复开票,请驳回!");
+            (conn.Exists<Invoice>(o => o.OffsetKvid == Guid.Empty && Sql.In(o.BizKvid, payments.ConvertAll(p => p.RootKvid)))).ThrowIfTrue("已有开票的到账,无法重复开票,请驳回!");
 
             var rtns = new RestfulExecutionResponse<InvoiceApply>();
             rtns.Results = new List<InvoiceApply>();
@@ -636,6 +636,7 @@ namespace Kivii.Finances.Transforms
                 invoice.PayerBankAccount = apply.PayerBankAccount;
                 invoice.OperatorName = apply.OperatorName;
                 invoice.Remark = apply.Remark;
+                invoice.Summary = "系统中开具发票!";
 
                 invoice.Metadata = new Dictionary<string, string>();
                 invoice.Metadata["PayeeOperatorName"] = apply.Metadata.ContainsKey("PayeeOperatorName") ? apply.Metadata["PayeeOperatorName"] : "";
@@ -879,6 +880,7 @@ namespace Kivii.Finances.Transforms
                 invoice.PayerBankAccount = apply.PayerBankAccount;
                 invoice.OperatorName = apply.OperatorName;
                 invoice.Remark = apply.Remark;
+                invoice.Summary = "系统中开具发票!";
 
                 invoice.Metadata = new Dictionary<string, string>();
                 invoice.Metadata["PayeeOperatorName"] = apply.Metadata.ContainsKey("PayeeOperatorName") ? apply.Metadata["PayeeOperatorName"] : "";