Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

1 year ago · 8b6f65586f
5 changed files with 32 additions and 56 deletions
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
@ -74,14 +74,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        /// 零件号
        /// </summary>
        public string LU { get; set; }
-
-
        /// <summary>
        /// 物料描述
        /// </summary>
        public string MaterialDesc { get; set; }
-
-
        /// <summary>
        /// 生产号
        /// </summary>
@ -98,20 +94,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        /// 金额
        /// </summary>
        public decimal Amt { get; set; }
-
-
+        /// <summary>
+        /// 合同号
+        /// </summary>
        public string ContractDocID { set; get; }
-
-
        /// <summary>
        /// 客户零件号
        /// </summary>
-       
        public string PartCode { get; set; }

-
-
-
    }
    public class BBAC_CAN_SA_DETAIL_EXP_DTO
    {
@ -152,8 +143,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        [ExporterHeader(DisplayName = "物料描述")]
        public string MaterialDesc { get; set; }

-
-
        [ExporterHeader(DisplayName = "生产码")]
        public string PN { get; set; }
        public string KeyCode { get; set; }
@ -231,10 +220,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        public int Version { get; set; }
        //[Display(Name = "单价")]
        //public decimal Price { get; set; }
-        [Display(Name = "发票分组号")]
        /// <summary>
        /// 
        /// </summary>
+        [Display(Name = "发票分组号")]
+      
        public string BillNum { get; set; }
        [Display(Name = "下线日期")]
        public DateTime SettleDate { get; set; }
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
@ -172,7 +172,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        /// 发票明细
        /// </summary>
        public List<INVOICE_WAIT_DETAIL_DTO> INVOICE_WAIT_DETAIL { get; set; }
-
        /// <summary>
        /// 发票和结算分组对应关系
        /// </summary>
@ -181,15 +180,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        /// 已结分组包含不可结算零件
        /// </summary>
        public List<INVOICE_NOT_SETTLE_DTO> INVOICE_NOT_SETTLE { get; set; }
-
        /// <summary>
        /// 发票调整明细
        /// </summary>
        public List<PUB_ADJ_DETAIL_DTO> ADJ_DETAIL { get; set; }

-
-
-
    }

    public class INVOICE_WAIT_DETAIL_DTO : EntityDto<Guid>
@ -216,6 +211,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        /// </summary>
        [Display(Name = "零件号")]
        public string LU { get; set; }
+
+        /// <summary>
+        ///零件号
+        /// </summary>
+        [Display(Name = "客户零件号")]
+        public string PartCode { get; set; }
+
+
+
        /// <summary>
        ///单价
        /// </summary>
@ -241,20 +245,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
        /// </summary>
        [Display(Name = "扩展字段1")]
        public string Extend1 { get; set; }
-        /// <summary>
-        ///扩展字段2
-        /// </summary>
-        [Display(Name = "扩展字段2")]
-        public string Extend2 { get; set; }
+      
        /// <summary>
        ///扩展字段3
        /// </summary>
-        [Display(Name = "扩展字段3")]
+        [Display(Name = "价格开始日期")]
        public DateTime BeginDate { get; set; }
        /// <summary>
        ///扩展字段4
        /// </summary>
-        [Display(Name = "扩展字段4")]
+        [Display(Name = "价格结束日期")]
        public DateTime EndDate { get; set; }

    }
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_WAIT_DETAIL.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_WAIT_DETAIL.cs
@ -20,6 +20,11 @@ public class INVOICE_WAIT_DETAIL :FullAuditedAggregateRoot<Guid>
    [Display(Name = "零件号")]
    public string LU { get; set; } = null!;

+
+    [Display(Name = "客户零件号")]
+    public string PartCode { get; set; } = null!;
+
+
    [Display(Name = "单价")]
    public decimal PRICE { get; set; }

@ -48,7 +53,7 @@ public class INVOICE_WAIT_DETAIL :FullAuditedAggregateRoot<Guid>



-    public INVOICE_WAIT_DETAIL(Guid guid, int version, string invbillNum, string invGroupNum, string lU, decimal pRICE, decimal qty, decimal amt, EnumBusinessType bussiessType, string extend1, string extend2,DateTime beginDate,DateTime endDate)
+    public INVOICE_WAIT_DETAIL(Guid guid, int version, string invbillNum, string invGroupNum, string lU, decimal pRICE, decimal qty, decimal amt, EnumBusinessType bussiessType, string extend1, string extend2,DateTime beginDate,DateTime endDate,string partcode)
    {
        Id = guid;
        Version = version;
@ -63,6 +68,7 @@ public class INVOICE_WAIT_DETAIL :FullAuditedAggregateRoot<Guid>
        Extend2 = extend2;
        BeginDate = beginDate;
        EndDate = endDate;
+        PartCode = partcode;
       
    }

--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
@ -840,16 +840,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
        public virtual async Task<bool> Reject(string groupbillNum)
        {

-           
-
            var ls = await _repository.Where(p => p.InvGroupNum == groupbillNum).ToListAsync();
-
-
-
-
-
-
-
            if (ls != null && ls.Count > 0)
            {
                var count=ls.Select(p => p.State).Distinct().Count();
@ -1030,7 +1021,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                                where tm == null
                                select new TMEP_INV
                                {
-                                   
                                    LU = itm.LU,
                                    Amt = itm.Amt,
                                    Qty = itm.Qty,
@ -1100,7 +1090,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                            extend1: string.Empty,
                            extend2: string.Empty,
                            beginDate: detail.BeginDate,
-                            endDate: detail.EndDate
+                            endDate: detail.EndDate,
+                            partcode:detail.PartCode
                            ));
                    }
                    if (_entityDetailList.Count > 0)
@ -1335,7 +1326,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                            extend1: string.Empty,
                            extend2: string.Empty,
                            beginDate: detail.BeginDate,
-                            endDate: detail.EndDate
+                            endDate: detail.EndDate,
+                            partcode:detail.PartCode
+                            
                            ));
                    }
                    if (_entityDetailList.Count > 0)
@ -1406,14 +1399,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                _invls = invlist.Select(p => p.InvbillNum).ToList();
            }
            return _invls;
-
        }

-
-
-
-
-
        /// <summary>
        /// 第一次开票
        /// </summary>
@ -1509,7 +1496,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                    var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID })
                        .Select(itm => new
                        {
-                            
+                            PartCode=itm.Key.PartCode,
                            InvGroupNum = itm.Key.InvGroupNum,
                            LU = itm.Key.PartCode,
                            ContactDocID = itm.Key.ContractDocID,
@ -1551,7 +1538,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                            invbillNum: key,
                            invGroupNum: p_InvGroupNum,
                            lU: detail.LU,
-                            
                            qty: detail.Qty,
                            bussiessType: businessType,
                            amt: detail.Amt,
@ -1559,7 +1545,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                            extend1: string.Empty,
                            extend2: string.Empty,
                            beginDate: detail.BeginDate,
-                            endDate: detail.EndDate
+                            endDate: detail.EndDate,
+                            partcode:detail.PartCode
                            ));
                    }
                    if (_entityDetailList.Count > 0)
@ -1625,8 +1612,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                {
                    await _repository.DbContext.BulkInsertAsync(notDetialList);
                }
-
-
                _invls = invlist.Select(p => p.InvbillNum).ToList();
            }

--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs
@ -39,14 +39,9 @@ namespace Win.Sfs.SettleAccount
        正常 = 1,
        [Description("报废")]
        报废 = 2,
-        [Description("替换")]
-        替换 = 3,
-
        [Description("提交")]
        提交 = 3,

-
-
    }

    public enum BusinessType