优化

Src/Extensions/BillExtension.cs

@@ -94,5 +94,49 @@ namespace Kivii.Finances
             }
 
         }
+
+
+        /// <summary>
+        /// 账单验证是否归档方法
+        /// </summary>
+        /// <param name="bill"></param>
+        /// <param name="conn"></param>
+        /// <returns></returns>
+        public static Bill Archiving(this Bill bill,IDbConnection conn = null)
+        {
+            bill.ThrowIfNull("账单不能为空!");
+            
+            if (conn == null)
+            {
+                conn = KiviiContext.GetOpenedDbConnection<Bill>();
+            }
+            var queryDetails = conn.From<BillDetail>();
+            queryDetails.Where(o => o.BillKvid == bill.Kvid);
+            queryDetails.Select(o => o.BizKvid);
+            //var details = conn.Select(queryDetails);
+            var querySettlements=conn.From<Settlement>();
+            querySettlements.Where(o => o.OffsetKvid == Guid.Empty && Sql.In(o.Kvid, queryDetails));
+            querySettlements.Select(o => new { o.Amount, o.AmountPlan, o.AmountPayment });
+            var settlements = conn.Select(querySettlements);
+            if (settlements.IsNullOrEmpty())//未找到结算信息 说明此账单没有费用 
+            {
+                bill.Amount = 0;
+                bill.AddOnlyProperties(o => o.Amount);
+                bill.AmountPlan = 0;
+                bill.AddOnlyProperties(o => o.AmountPlan);
+                bill.AmountPayment = 0;
+                bill.AddOnlyProperties(o => o.AmountPayment);
+                conn.UpdateOnly(bill);
+                return bill;
+            }
+            bill.Amount = settlements.Sum(o => o.Amount);
+            bill.AddOnlyProperties(o => o.Amount);
+            bill.AmountPlan = settlements.Sum(o => o.AmountPlan);
+            bill.AddOnlyProperties(o => o.AmountPlan);
+            bill.AmountPayment = settlements.Sum(o => o.AmountPayment);
+            bill.AddOnlyProperties(o => o.AmountPayment);
+            conn.UpdateOnly(bill);
+            return bill;
+        }
     }
 }

Src/Properties/AssemblyInfo.cs

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

Src/Transforms/RestfulBill.InvoiceApply.cs

@@ -177,8 +177,12 @@ namespace Kivii.Finances.Transforms
                     o.BizType
                 });
                 bills = conn.Select(queryBills);
+                if (!bills.IsNullOrEmpty())
+                {
+                    var existKvids = bills.ConvertAll(o => o.BizKvid);
+                    if (conn.Exists<InvoiceApply>(o => Sql.In(o.Kvid, existKvids) && o.Status != (int)InvoiceApplyStatus.ApplyReject)) throw new Exception("存在账单已申请,请勿重复操作!");
+                }
             }
-            if (bills.Exists(o => o.BizKvid != Guid.Empty)) throw new Exception("存在账单已申请,请勿重复操作!");
 
             var trans = conn.OpenTransaction();
             try

Src/Transforms/RestfulBill.cs

@@ -163,33 +163,35 @@ namespace Kivii.Finances.Transforms
             var rtns = new RestfulUpdateResponse<Bill>();
             rtns.Results = new List<Bill>();
 
-            var allBillDetails = conn.Select<BillDetail>(o => Sql.In(o.BillKvid, bills.ConvertAll(p => p.Kvid)));
-            var allSettlements = conn.Select<Settlement>(o => Sql.In(o.Kvid, allBillDetails.ConvertAll(p => p.BizKvid)));
+            //var allBillDetails = conn.Select<BillDetail>(o => Sql.In(o.BillKvid, bills.ConvertAll(p => p.Kvid)));
+            //var allSettlements = conn.Select<Settlement>(o => Sql.In(o.Kvid, allBillDetails.ConvertAll(p => p.BizKvid)));
             foreach (var bill in bills)
             {
-                var billDetails = allBillDetails.Where(o => o.BillKvid == bill.Kvid).ToList();
-                if (billDetails.IsNullOrEmpty()) continue;
-                var settlements = allSettlements.Where(o => billDetails.ConvertAll(p => p.BizKvid).Contains(o.Kvid)).ToList();
-                if (settlements.IsNullOrEmpty())//未找到结算信息 说明此账单没有费用 
-                {
-                    bill.Amount = 0;
-                    bill.AddOnlyProperties(o => o.Amount);
-                    bill.AmountPlan = 0;
-                    bill.AddOnlyProperties(o => o.AmountPlan);
-                    bill.AmountPayment = 0;
-                    bill.AddOnlyProperties(o => o.AmountPayment);
-                    conn.UpdateOnly(bill);
-                    rtns.Results.Add(bill);
-                    continue;
-                }
-                bill.Amount = settlements.Sum(o => o.Amount);
-                bill.AddOnlyProperties(o => o.Amount);
-                bill.AmountPlan = settlements.Sum(o => o.AmountPlan);
-                bill.AddOnlyProperties(o => o.AmountPlan);
-                bill.AmountPayment = settlements.Sum(o => o.AmountPayment);
-                bill.AddOnlyProperties(o => o.AmountPayment);
-                conn.UpdateOnly(bill);
+                var item = bill.Archiving(conn);
                 rtns.Results.Add(bill);
+                //var billDetails = allBillDetails.Where(o => o.BillKvid == bill.Kvid).ToList();
+                //if (billDetails.IsNullOrEmpty()) continue;
+                //var settlements = allSettlements.Where(o => billDetails.ConvertAll(p => p.BizKvid).Contains(o.Kvid)).ToList();
+                //if (settlements.IsNullOrEmpty())//未找到结算信息 说明此账单没有费用 
+                //{
+                //    bill.Amount = 0;
+                //    bill.AddOnlyProperties(o => o.Amount);
+                //    bill.AmountPlan = 0;
+                //    bill.AddOnlyProperties(o => o.AmountPlan);
+                //    bill.AmountPayment = 0;
+                //    bill.AddOnlyProperties(o => o.AmountPayment);
+                //    conn.UpdateOnly(bill);
+                //    rtns.Results.Add(bill);
+                //    continue;
+                //}
+                //bill.Amount = settlements.Sum(o => o.Amount);
+                //bill.AddOnlyProperties(o => o.Amount);
+                //bill.AmountPlan = settlements.Sum(o => o.AmountPlan);
+                //bill.AddOnlyProperties(o => o.AmountPlan);
+                //bill.AmountPayment = settlements.Sum(o => o.AmountPayment);
+                //bill.AddOnlyProperties(o => o.AmountPayment);
+                //conn.UpdateOnly(bill);
+                //rtns.Results.Add(bill);
             }
 
             return rtns;