From 742de442921f5b0e24934534d77d98fadf0b1fef Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Mon, 18 Apr 2022 15:35:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=9B=B4=E6=94=B9:MaterialCode=20=E4=B8=BASa?= =?UTF-8?q?pMaterialCode=E7=9A=84=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WMS/WMSCusomerKanbanAppService.cs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 c2b38446..9fc0bcd1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs @@ -292,9 +292,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var error = from itm1 in outPutDetail join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban } + new { itm1.SapMaterialCode, itm1.Kanban } equals - new { itm2.MaterialCode, itm2.Kanban } + new { itm2.SapMaterialCode, itm2.Kanban } select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); if (errList.Count() == 0) @@ -302,9 +302,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var query = from itm1 in _lst join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } + new { itm1.SapMaterialCode, itm1.Kanban } equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 + new { itm2.SapMaterialCode, itm2.Kanban } into temp1 from tm1 in temp1.DefaultIfEmpty() where tm1 == null select itm1; @@ -459,7 +459,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts //检验1:导入模板中的第一页签数据不能为空 if (result == null || result.Count() == 0) { - checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); + checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); } if (checkList.Count > 0) { @@ -474,7 +474,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts { if (itm.Qty == 0) { - checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的结算数量为０，影响出库请检查！", itm.Kanban), string.Empty)); + checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的结算数量为０，影响出库请检查！", itm.Kanban), string.Empty)); } } @@ -487,7 +487,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create(), !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, itm.Kanban, - itm.MaterialCode, + itm.SapMaterialCode, itm.MaterialDesc, itm.MaterialGroup, string.Empty, @@ -512,13 +512,13 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts //检验3：导入模板中看板号+物料号，不能重复 var _isRepeatOfReportList = from arc in _lst - group arc by new { arc.Kanban, arc.MaterialCode, arc.Version } + group arc by new { arc.Kanban, arc.SapMaterialCode, arc.Version } into g where g.Count() > 1 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.MaterialCode), 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) { @@ -532,9 +532,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var error = from itm1 in outPutDetail join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban } + new { itm1.SapMaterialCode, itm1.Kanban } equals - new { itm2.MaterialCode, itm2.Kanban} + new { itm2.SapMaterialCode, itm2.Kanban} select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); @@ -551,9 +551,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var query = from itm1 in _lst join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } + new { itm1.SapMaterialCode, itm1.Kanban } equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 + new { itm2.SapMaterialCode, itm2.Kanban } into temp1 from tm1 in temp1.DefaultIfEmpty() where tm1 == null select itm1; 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 2/2] =?UTF-8?q?DTO=E4=B8=AD=E5=8E=BB=E6=8E=89state?= =?UTF-8?q?=E7=8A=B6=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) {