字段更改

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs

@@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs

@@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs

@@ -81,5 +81,30 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         /// </summary>
         [ExporterHeader(DisplayName = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs

@@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         /// </summary>
         [ImporterHeader(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ImporterHeader(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ImporterHeader(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ImporterHeader(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ImporterHeader(Name = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs

@@ -65,6 +65,26 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         /// </summary>
         public string StorageLocation { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
+
         /// <summary>
         /// 存储地点描述
         /// </summary>

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs

@@ -68,5 +68,24 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs

@@ -68,5 +68,24 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs

@@ -81,5 +81,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         /// </summary>
         [ExporterHeader(DisplayName = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "验收单号")]
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs

@@ -81,5 +81,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         /// </summary>
         [ImporterHeader(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ImporterHeader(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ImporterHeader(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ImporterHeader(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ImporterHeader(Name = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs

@@ -65,6 +65,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         /// </summary>
         public string StorageLocation { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
+
         /// <summary>
         /// 存储地点描述
         /// </summary>

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs

@@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs

@@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs

@@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         /// </summary>
         [ExporterHeader(DisplayName = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs

@@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         /// </summary>
         [ImporterHeader(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ImporterHeader(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ImporterHeader(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ImporterHeader(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ImporterHeader(Name = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs

@@ -65,6 +65,26 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         /// </summary>
         public string StorageLocation { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
+
         /// <summary>
         /// 存储地点描述
         /// </summary>

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs

@@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         public BT_Car_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber,
             string kanbanNumber, string year, string factory, DateTime acceptanceDate,
             string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc,
-            string materialCode) : base(Id)
+            string materialCode, string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id)
         {
             MaterialVoucherNo = materialVoucherNo;
             KanbanNumber = kanbanNumber;
@@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
             Supplier = supplier;
             StorageLocation = storageLocation;
             StorageLocationDesc = storageLocationDesc;
+            AcceptanceNo = acceptanceNo;
+            Qty = qty;
+            Price = price;
+            Amt = amt;
         }
 
         //验收单号	外部单号	物料凭证号	物料凭证日期	物料凭证记账日期	看板编号	外部看板编号	物料号	物料描述	数量	单价	金额
@@ -67,7 +71,11 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         /// </summary>
         [Display(Name = "物料凭证号")]
         public string MaterialVoucherNo { get; set; }
-
+        ///// <summary>
+        /////验收单号
+        ///// </summary>
+        //[Display(Name = "验收单号")]
+        //public string AcceptanceNo { get; set; }
         /// <summary>
         ///会计年度
         /// </summary>
@@ -120,6 +128,32 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         [Display(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
 
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [Display(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Display(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [Display(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [Display(Name = "金额")]
+        public decimal Amt { set; get; }
+
+
         /// <summary>
         /// 备注
         /// </summary>

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs

@@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         public HQ_F_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber,
             string kanbanNumber, string year, string factory, DateTime acceptanceDate,
             string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc,
-            string materialCode) : base(Id)
+            string materialCode, string acceptanceNo,decimal qty, decimal price, decimal amt) : base(Id)
         {
             MaterialVoucherNo = materialVoucherNo;
             KanbanNumber = kanbanNumber;
@@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
             Supplier = supplier;
             StorageLocation = storageLocation;
             StorageLocationDesc = storageLocationDesc;
+            AcceptanceNo = acceptanceNo;
+            Qty = qty;
+            Price = price;
+            Amt = amt;
         }
 
         //验收单号	外部单号	物料凭证号	物料凭证日期	物料凭证记账日期	看板编号	外部看板编号	物料号	物料描述	数量	单价	金额
@@ -124,24 +128,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         [Display(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [Display(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Display(Name = "数量")]
+        public decimal Qty { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 数量
+        /// 单价
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "数量")]
+        [Display(Name = "单价")]
-        //public decimal Qty { set; get; }
+        public decimal Price { set; get; }
-
-        ///// <summary>
-        ///// 单价
-        ///// </summary>
-        //[Display(Name = "单价")]
-        //public decimal Price { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 金额
+        /// 金额
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "金额")]
+        [Display(Name = "金额")]
-        //public decimal Amt { set; get; }
+        public decimal Amt { set; get; }
 
 
         /// <summary>

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs

@@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         public HQ_M_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber,
             string kanbanNumber, string year, string factory, DateTime acceptanceDate,
             string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc,
-            string materialCode) : base(Id)
+            string materialCode, string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id)
         {
             MaterialVoucherNo = materialVoucherNo;
             KanbanNumber = kanbanNumber;
@@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
             Supplier = supplier;
             StorageLocation = storageLocation;
             StorageLocationDesc = storageLocationDesc;
+            AcceptanceNo = acceptanceNo;
+            Qty = qty;
+            Price = price;
+            Amt = amt;
         }
 
         //验收单号	外部单号	物料凭证号	物料凭证日期	物料凭证记账日期	看板编号	外部看板编号	物料号	物料描述	数量	单价	金额
@@ -125,23 +129,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         public string StorageLocationDesc { get; set; }
 
 
-        ///// <summary>
+        /// <summary>
-        ///// 数量
+        ///验收单号
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "数量")]
+        [Display(Name = "验收单号")]
-        //public decimal Qty { set; get; }
+        public string AcceptanceNo { get; set; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 单价
+        /// 数量
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "单价")]
+        [Display(Name = "数量")]
-        //public decimal Price { set; get; }
+        public decimal Qty { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 金额
+        /// 单价
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "金额")]
+        [Display(Name = "单价")]
-        //public decimal Amt { set; get; }
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [Display(Name = "金额")]
+        public decimal Amt { set; get; }
 
 
         /// <summary>

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -365,6 +365,7 @@ namespace Win.Sfs.SettleAccount
                 b.Property(x => x.Supplier).HasMaxLength(50);
                 b.Property(x => x.StorageLocation).HasMaxLength(50);
                 b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
+                b.Property(x => x.AcceptanceNo).HasMaxLength(50);
                 //创建组合索引
                 b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);