From 766717d8c44891ec894994e86020110a471dfde1 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Mon, 18 Apr 2022 16:01:49 +0800
Subject: [PATCH] =?UTF-8?q?DTO=E4=B8=AD=E5=8E=BB=E6=8E=89state=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Wms/WmsDetailReportDto.cs        | 22 +++++++++----------
 .../WMS/WMSCusomerKanbanAppService.cs         |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs
index 659bfe37..e6b5fbcb 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs
@@ -179,8 +179,8 @@ namespace Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput
         public string MaterialDesc { set; get; }
         [Display(Name = "备注")]
         public string Remark1 { set; get; }
-        [Display(Name = "状态")]
-        public int State { set; get; }
+        //[Display(Name = "状态")]
+        //public int State { set; get; }
 
     }
 
@@ -254,8 +254,8 @@ namespace Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput
         {
         }
 
-        [Display(Name = "版本号")]
-        public string Version { set; get; }
+        //[Display(Name = "版本号")]
+        //public string Version { set; get; }
 
         [Display(Name = "客户")]
         public string Client { set; get; }
@@ -282,24 +282,24 @@ namespace Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput
         public decimal OutputQty { set; get; }
         [Display(Name = "差异数量")]
         public decimal DiffQty { set; get; }
-        //[Display(Name = "开票单价")]
-        //public decimal Price { set; get; }
-        //[Display(Name = "结算金额")]
-        //public decimal Amt { set; get; }
+        [Display(Name = "开票单价")]
+        public decimal Price { set; get; }
+        [Display(Name = "结算金额")]
+        public decimal Amt { set; get; }
         //[Display(Name = "已出库金额")]
         //public decimal OutPutAmt { set; get; }
         //[Display(Name = "WMS待出库金额")]
         //public decimal DiffAmt { set; get; }
         [Display(Name = "物料组编码")]
-        public string MaterialGroupCode { set; get; }
+        public string EstimateType { set; get; }
         [Display(Name = "物料组(车型)")]
         public string MaterialGroup { set; get; }
         [Display(Name = "物料组描述")]
         public string MaterialDesc { set; get; }
         [Display(Name = "备注")]
         public string Remark1 { set; get; }
-        [Display(Name = "状态")]
-        public int State { set; get; }
+        //[Display(Name = "状态")]
+        //public int State { set; get; }
 
     }
 
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
index 9fc0bcd1..1626abe5 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
@@ -518,7 +518,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                                         select g;
             foreach (var itm in _isRepeatOfReportList)
             {
-                checkList.Add(new ErrorExportDto(version, "红旗批量出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}组合物料号{1}有重复，请检查！", itm.Key.Kanban, itm.Key.SapMaterialCode), string.Empty));
+                checkList.Add(new ErrorExportDto(version, "自定义出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}组合物料号{1}有重复，请检查！", itm.Key.Kanban, itm.Key.SapMaterialCode), string.Empty));
             }
             if (checkList.Count > 0)
             {