更新版本

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs

@@ -62,8 +62,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         [Display(Name = "客户代码")]
         public string ClientCode { get; set; }
     }
-
-
     [Display(Name = "发票")]
     public class INVOICE_REPEAT_DTO : EntityDto<Guid>
     {
@@ -104,19 +102,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         [Display(Name = "业务类别")]
         public EnumBusinessType BusinessType { get; set; }
 
-
         public List<INVOICE_WAIT_DETAIL_DTO> DETIAL { set; get; }
     }
 
-
-
-
-
-
-
-
-
-
     public class INVOICE_GRP_EXP_DTO
     {
         /// <summary>
@@ -197,12 +185,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
 
         [ImporterHeader(Name = "金税发票金额", FixAllSpace = true)]
-        [Required(ErrorMessage = "{0}是必填项")]
-  
+        [Required(ErrorMessage = "{0}是必填项")]  
         public decimal RealAmt { get; set; }
 
-
-
     }
 
     public class INVOICE_GRP_REQ_DTO : RequestInputBase
@@ -248,7 +233,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
     }
 
-    public class INVOICE_WAIT_DETAIL_DTO : EntityDto<Guid>
+    public class INVOICE_WAIT_DETAIL_DTO 
 
     {
 
@@ -304,7 +289,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// <summary>
         ///扩展字段1
         /// </summary>
-        [Display(Name = "扩展字段1")]
+        [Display(Name = "合同号")]
         public string Extend1 { get; set; }
       
         /// <summary>
@@ -317,8 +302,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [Display(Name = "价格结束日期")]
         public DateTime EndDate { get; set; }
-
-
+        [Display(Name = "扩展字段", AutoGenerateField = false)]
+      
         public Dictionary<string, object> ExtraProperties { get; set; }
 
 
@@ -338,7 +323,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
     }
 
-    public class INVOICE_MAP_GROUP_DTO : EntityDto<Guid>
+    public class INVOICE_MAP_GROUP_DTO 
 
     {
 
@@ -365,19 +350,19 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// <summary>
         ///金额
         /// </summary>
-        [Display(Name = "金额")]
-        public decimal Amt { get; set; }
-        /// <summary>
-        ///扩展字段1
-        /// </summary>
-        [Display(Name = "扩展字段1")]
-        public string Extend1 { get; set; }
+        //[Display(Name = "金额")]
+        //public decimal Amt { get; set; }
         /// <summary>
-        ///扩展字段2
-        /// </summary>
-        [Display(Name = "扩展字段2")]
-        public string Extend2 { get; set; }
-        public bool IsDeleted { get; set; }
+        /////扩展字段1
+        ///// </summary>
+        //[Display(Name = "扩展字段1")]
+        //public string Extend1 { get; set; }
+        ///// <summary>
+        /////扩展字段2
+        ///// </summary>
+        //[Display(Name = "扩展字段2")]
+        //public string Extend2 { get; set; }
+        //public bool IsDeleted { get; set; }
 
     }
 
@@ -433,14 +418,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string InvGroupNum { get; set; }
     }
 
-    public class INVOICE_NOT_SETTLE_DTO : EntityDto<Guid>
+    public class INVOICE_NOT_SETTLE_DTO 
     {
 
-        ///// <summary>
-        /////期间
-        ///// </summary>
-        //[Display(Name = "期间")]
-        //public int Version { get; set; }
+        [Display(Name = "发票号")]
+        public string InvBillNum { get; set; }
         /// <summary>
         ///发票分组号
         /// </summary>
@@ -463,8 +445,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string LU1 { get; set; }
 
 
-        [Display(Name = "不可结算零件号")]
-        public string InvBillNum { get; set; }
 
 
         //[Display(Name = "不可结算零件号")]
@@ -482,7 +462,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         ///// </summary>
         //[Display(Name = "扩展字段2")]
         //public string Extend2 { get; set; }
-
+        [Display(Name = "不可结算零件号",AutoGenerateField =false)]
         public Dictionary<string, object> ExtraProperties { get; set; }
 
     }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs

@@ -115,6 +115,10 @@ public class PendingDeductionService : ITransientDependency, IExportJob
                     }).ConfigureAwait(false);
                 }
             }
+            //var query1=
+
+
+
         }
         else if (type == "JisHBPO")
         {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs

@@ -62,18 +62,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         {
 
             var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
-            if (ls == null && ls.Count ==0)
+            if (ls.Count > 1)
             {
-                throw new UserFriendlyException(string.Format("不存在编号为{0}",p_billNum));
+                throw new UserFriendlyException("可结算单有重复");
             }
-            foreach (BBAC_CAN_SA p_entiy in ls)
-            {
+            var first = ls.FirstOrDefault();
+           
                 switch (state)
                 {
                     case SettleBillState.财务已审核:
-                        if (p_entiy.State == SettleBillState.商务已审核)
+                        if (first.State == SettleBillState.商务已审核)
                         {
-                            p_entiy.State = state;
+                             first.State = state;
                         }
                         else
                         {
@@ -81,9 +81,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         }
                         break;
                     case SettleBillState.商务已审核:
-                        if (p_entiy.State == SettleBillState.已开票)
+                        if (first.State == SettleBillState.已开票)
                         {
-                            p_entiy.State = state;
+                            first.State = state;
                         }
                         else
                         {
@@ -91,9 +91,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         }
                         break;
                     case SettleBillState.已开票:
-                        if (p_entiy.State == SettleBillState.未结状态)
+                        if (first.State == SettleBillState.未结状态)
                         {
-                            p_entiy.State = state;
+                        first.State = state;
                         }
                         else
                         {
@@ -101,9 +101,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         }
                         break;
                     case SettleBillState.已扣减:
-                        if (p_entiy.State == SettleBillState.客户已收票)
+                        if (first.State == SettleBillState.客户已收票)
                         {
-                            p_entiy.State = state;
+                        first.State = state;
                         }
                         else
                         {
@@ -111,20 +111,20 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         }
                         break;
                     case SettleBillState.客户已收票:
-                        if (p_entiy.State == SettleBillState.财务已审核)
+                        if (first.State == SettleBillState.财务已审核)
                         {
-                            p_entiy.State = state;
+                            first.State = state;
                         }
                         else
                         {
                             throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【客户已收票】状态");
                         }
                         break;
-                }
-                await _repository.UpdateAsync(p_entiy);
-                return true;
             }
-            return false;
+            await _repository.UpdateAsync(first);
+            return true;
+   
+            
         }
         /// <summary>
         /// 向后流程

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_NOT_SA_MNG.cs

@@ -62,7 +62,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 return errors;
             }
 
-
             var billNumber = OrderNumberGenerator.GenerateOrderNumber("N");
             var _entity = new BBAC_CAN_SA();
             _entity.BillNum = billNumber;
@@ -93,9 +92,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                     contactid: itm.ContractDocID,
                     invbillnum: string.Empty,
                     partcode:itm.PartCode
-                    
                     );
-                 
                 _entityList.Add(_detailEntity);
             }
             await _repository.DbContext.BulkDeleteAsync(p_list);

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs

@@ -51,15 +51,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         public virtual async Task<List<string>> GenerateSettlementOrder(List<PUB_NOT_SA_DETAIL> p_list)
         {
             List<string> errors = new List<string>();
-            var query = p_list.Select(p => p.BusinessType).Distinct();
-            foreach (var itm in query.ToList())
+            var query = p_list.Select(p => p.BusinessType).Distinct().ToList();
+            if (query.Count > 1)
             {
-                errors.Add("选择项有不在同一业务的数据！");
-               
-            }
-            if (errors.Count > 0)
-            {
-                return errors;
+                foreach (var itm in query.ToList())
+                {
+                    errors.Add("选择项有不在同一业务的数据！");
+                }
+                if (errors.Count > 0)
+                {
+                    return errors;
+                }
             }
 
             var first= p_list.FirstOrDefault();