更新版本

src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@@ -325,7 +325,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
         [Route("InvoiceSettledDiff-Make")]
         [DisableRequestSizeLimit]
      
-        public async Task<string> InvoiceSettledDiffMake(string year, string period, string version, string customerCode, string factory, string matialCode, string state)
+        public async Task<string> InvoiceSettledDiffMake(string year, string period, string version,string sapCode, string customerCode, string factory, string matialCode, string state)
         {
             //if (!_settleAccountVersionrepository.Any(p => p.Version == version))
             //{
@@ -342,6 +342,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
             //customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty });
             //customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" });
             customConditionList.Add(new CustomCondition() { Name = "MatialCode", Value = matialCode ?? string.Empty });
+            customConditionList.Add(new CustomCondition() { Name = "sapCode", Value = sapCode ?? string.Empty });
             customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "结算与开票数据对比" });
             customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? DateTime.Now.Year.ToString() });
 
@@ -439,7 +440,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
             customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup });
             customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(sapCode) ? string.Empty : sapCode });
 
-            var _taskid = await _service.ExportEnqueueAsync("大众结算未发运核对明细表", ExportExtentsion.Excel,version,string.Empty ,CurrentUser, typeof(UnInvoiceSettledDetailDiffExportService), customConditionList, (rs) =>
+            var _taskid = await _service.ExportEnqueueAsync("大众准时化结算数量差异比对表", ExportExtentsion.Excel,version,string.Empty ,CurrentUser, typeof(UnInvoiceSettledDetailDiffExportService), customConditionList, (rs) =>
             {
             });
             return _taskid;

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs

@@ -104,10 +104,7 @@ string.Format(" '{0}' as Version ,", version)+"\n" +
 
             var _list = _query.OrderBy(p=>p.Factory).ToList();
 
-            if (!string.IsNullOrEmpty(materialcode))
+           
-            {
-              _list=  _list.Where(p => p.MaterialCode == materialcode).ToList();
-            }
 
 
             return _list;

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs

@@ -73,22 +73,22 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "WHERE 1=1 {1}";
             string addwhere = string.Empty;
             string addSqlStr = string.Format(sqlString, version);
-            if (!string.IsNullOrEmpty(kanBan))
+            //if (!string.IsNullOrEmpty(kanBan))
-            {
+            //{
-                addwhere += string.Format(" AND Kanban LIKE '{0}%'  ", kanBan);
+            //    addwhere += string.Format(" AND Kanban LIKE '{0}%'  ", kanBan);
-            }
+            //}
-            else if(!string.IsNullOrEmpty(sapMaterialCode))
+            //else if(!string.IsNullOrEmpty(sapMaterialCode))
-            {
+            //{
-                addwhere += string.Format(" AND SapMaterialCode LIKE '{0}%'   ", sapMaterialCode);
+            //    addwhere += string.Format(" AND SapMaterialCode LIKE '{0}%'   ", sapMaterialCode);
-            }
+            //}
-            else if(!string.IsNullOrEmpty(customerPartCode))
+            //else if(!string.IsNullOrEmpty(customerPartCode))
-            {
+            //{
-                addwhere += string.Format(" AND CustomerPartCode LIKE '{0}%'   ", customerPartCode);
+            //    addwhere += string.Format(" AND CustomerPartCode LIKE '{0}%'   ", customerPartCode);
-            }
+            //}
-            else if (!string.IsNullOrEmpty(estimateTypeDesc))
+            //else if (!string.IsNullOrEmpty(estimateTypeDesc))
-            {
+            //{
-                addwhere += string.Format(" AND EstimateTypeDesc LIKE '{0}%'   ", estimateTypeDesc);
+            //    addwhere += string.Format(" AND EstimateTypeDesc LIKE '{0}%'   ", estimateTypeDesc);
-            }
+            //}
 
             string _sql = string.Format(addSqlStr, addwhere);
             var _query = DbConnection.Query<SettleKBWithCode>(_sql, null, null, true, 1200, null);
@@ -189,7 +189,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public string WMSDeliveryNote { set; get; }
 
         [ExporterHeader(DisplayName = "实际发货日期")]
-        public string ActualGoodsDate { set; get; }
+        public DateTime ActualGoodsDate { set; get; }
 
         [ExporterHeader(DisplayName = "条码号")]
         public string Kanban { set; get; }
@@ -203,6 +203,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         [ExporterHeader(DisplayName = "客户物料")]
         public string CustomerPartCode { set; get; }
 
+        [ExporterHeader(DisplayName = "厂内物料号")]
+        public string SapMaterialCode { set; get; }
+
+
         [ExporterHeader(DisplayName = "物料组(车型)")]
         public string EstimateTypeDesc { set; get; }
 
@@ -249,6 +253,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public string DeliveryOrderNo { set; get; }
 
       
+
+
     }
    
 }

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnInvoiceSettledDetailDiffDapperRepository.cs

@@ -107,13 +107,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             var _query = DbConnection.Query<InvoiceSettledDetailDiff>(_sql, null, null, true, 1200, null);
             _list=_query.ToList();
 
-            if (_list.Count > 0)
-            {
-                if(!string.IsNullOrEmpty(materialGroup))
-                {
-                    _list = _list.Where(p => p.MaterialGroup == materialGroup).ToList();
-                }
-            }
          
 
             return _list;

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs

@@ -43,6 +43,11 @@ namespace SettleAccount.Job.Services
 
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
+
+
+            var _filename = exportName.FirstOrDefault();
+
+
             var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
             var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
             var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
@@ -118,12 +123,14 @@ namespace SettleAccount.Job.Services
 
                 if (!string.IsNullOrEmpty(materialGroup))
                 {
-                   var _groupList= materialGroup.Split(new char[] { '\n' }).Distinct().ToList();
+                   var _groupList= materialGroup.Split(new char[] { ',' }).Distinct().ToList();
                     if(_groupList.Count()>0)
                     {
                         _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
                     }
                 }
+
+                
                 if (!string.IsNullOrEmpty(kenncode))
                 {
                     var _groupList = kenncode.Split("\n").ToList();
@@ -153,7 +160,7 @@ namespace SettleAccount.Job.Services
                 _ls = _ls.OrderBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ThenBy(p => p.SapMaterialCode).ToList();
 
             }
-            _outputService.Export<InvoiceSettledDetailDiff>(id, string.Format("大众发票与结算核对明细表_{0}.xlsx", Guid.NewGuid().ToString()), _ls);
+            _outputService.Export<InvoiceSettledDetailDiff>(id, _filename, _ls);
 
             return id.ToString();
         }

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs

@@ -43,6 +43,7 @@ namespace SettleAccount.Job.Services
             //var customerCode = p_list.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value;
 
             var matialCode= p_list.Where(p => p.Name == "MatialCode").FirstOrDefault().Value;
+            var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value;
 
             var _first = exportName.FirstOrDefault();
             var _ls= _dapperRepository.GetInvoiceSettledDiffReportList(version,year,"set_settle",matialCode);
@@ -51,6 +52,27 @@ namespace SettleAccount.Job.Services
 
             List<InvoiceSettledDiff> _list = new List<InvoiceSettledDiff>();
             List<InvoiceSettledDiffExportDto> _lsExport = new List<InvoiceSettledDiffExportDto>();
+
+
+
+            if (!string.IsNullOrEmpty(sapCode))
+            {
+                var _groupList = sapCode.Split(new char[] { ',' }).Distinct().ToList();
+                if (_groupList.Count() > 0)
+                {
+                    _ls = _ls.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList();
+                }
+            }
+            if (!string.IsNullOrEmpty(matialCode))
+            {
+                var _groupList = matialCode.Split(new char[] { ',' }).Distinct().ToList();
+                if (_groupList.Count() > 0)
+                {
+                    _ls = _ls.Where(p => _groupList.Contains(p.MaterialCode)).ToList();
+                }
+            }
+
+
             foreach (var itm in _ls)
             {
                //_list.Add(new InvoiceSettledDiff(Guid.NewGuid(), _id, itm.MaterialCode, itm.InvoiceQty, itm.SettleQty));
@@ -72,20 +94,13 @@ namespace SettleAccount.Job.Services
                     SapMaterialCode =itm.SapMaterialCode ,
                     MaterialDesc=itm.MaterialDesc,
                     SapMaterialGroup=itm.SapMaterialGroup,
-                    
                     Factory = itm.Factory,
-                    
-                    
-
-
-
                });
 
             }
-            _outputService.Export<InvoiceSettledDiffExportDto>(id, string.Format("大众发票与结算核对汇总表({1})_{0}.xlsx", Guid.NewGuid().ToString(),version), _lsExport);
+            _outputService.Export<InvoiceSettledDiffExportDto>(id,_first, _lsExport);
+
           
-            //_repository.Insert(_list);
-            //_versionRepository.Insert(_id, version, customerCode, customerCode, string.Empty, string.Empty, projectName);
             return id.ToString();
         }
     }

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleDoorPanelExportService.cs

@@ -45,6 +45,7 @@ namespace SettleAccount.Job.Services.Report
         //public virtual List<SettleDoorPanelExport> GetSettleDoorPanelReportList(string purchaseOrderNo, string version, string sapCode, string matialCode)
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
+            var _filename = exportName.FirstOrDefault();
             var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
             var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
             var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
@@ -118,7 +119,7 @@ namespace SettleAccount.Job.Services.Report
 
                 if (!string.IsNullOrEmpty(materialGroup))
                 {
-                    var _groupList = materialGroup.Split(new char[] { '\n' }).Distinct().ToList();
+                    var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
                     if (_groupList.Count() > 0)
                     {
                         _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
@@ -161,7 +162,7 @@ namespace SettleAccount.Job.Services.Report
             .Append(report2List.ToList(), "差异汇总验证表")
             .ExportAppendDataAsByteArray();
             result.ShouldNotBeNull();
-            _fileContainer.SaveAsync(string.Format("大众准时化结算门板价格差异比对报表_{0}.xlsx", Guid.NewGuid().ToString()), result.Result, true);
+            _fileContainer.SaveAsync(_filename, result.Result, true);
 
             // _outputService.Export<SettleDoorPanelExport>(id, string.Format("大众准时化结算门板价格差异比对报表_{0}.xlsx", Guid.NewGuid().ToString()), _list);
 

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs

@@ -28,10 +28,14 @@ namespace SettleAccount.Job.Services.Report
 
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
+
+            var _filename = exportName.FirstOrDefault();
             var sapMaterialCode = p_list.Where(p => p.Name == "SapMaterialCode").FirstOrDefault().Value;
+
+
             var customerPartCode = p_list.Where(p => p.Name == "CustomerPartCode").FirstOrDefault().Value;
             var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
-            var estimateTypeDesc = p_list.Where(p => p.Name == "EstimateTypeDesc").FirstOrDefault().Value;
+            var materialGroup = p_list.Where(p => p.Name == "EstimateTypeDesc").FirstOrDefault().Value;
             var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value;
 
 
@@ -39,7 +43,7 @@ namespace SettleAccount.Job.Services.Report
             var endTime = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
 
 
-            var _list = _dapper.GetSettleKBWithCodeReportList(kanban, version, sapMaterialCode, customerPartCode,estimateTypeDesc, beginTime, endTime);
+            var _list = _dapper.GetSettleKBWithCodeReportList(kanban, version, sapMaterialCode, customerPartCode,materialGroup, beginTime, endTime);
             var diffList = _erpdapperRepository.GetSettleInvoiceDiff(version);
             if (diffList != null)
             {
@@ -53,7 +57,62 @@ namespace SettleAccount.Job.Services.Report
             }
 
 
-            _outputService.Export<SettleKBWithCode>(id, string.Format("大众看板结算与交货核对明细表_{0}.xlsx", Guid.NewGuid().ToString()), _list);
+            if (!string.IsNullOrEmpty(materialGroup))
+            {
+                var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
+                if (_groupList.Count() > 0)
+                {
+                    _list = _list.Where(p => _groupList.Contains(p.EstimateTypeDesc)).ToList();
+                }
+            }
+           
+            if (!string.IsNullOrEmpty(sapMaterialCode))
+            {
+                var _groupList = sapMaterialCode.Split(new char[] { '\n' }).Distinct().ToList();
+                if (_groupList.Count() > 0)
+                {
+                    _list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList();
+                }
+            }
+
+            if (!string.IsNullOrEmpty(customerPartCode))
+            {
+                var _groupList = customerPartCode.Split(new char[] { '\n' }).Distinct().ToList();
+                if (_groupList.Count() > 0)
+                {
+                    _list = _list.Where(p => _groupList.Contains(p.CustomerPartCode)).ToList();
+                }
+            }
+
+            if (!string.IsNullOrEmpty(beginTime))
+            {
+                
+                   _list = _list.Where(p => DateTime.Parse(beginTime)<=p.ActualGoodsDate).ToList();
+               
+            }
+            if (!string.IsNullOrEmpty(endTime))
+            {
+
+                _list = _list.Where(p => DateTime.Parse(endTime) >= p.ActualGoodsDate).ToList();
+
+            }
+
+            if (!string.IsNullOrEmpty(kanban))
+            {
+                var _groupList = kanban.Split(new char[] { '\n' }).Distinct().ToList();
+                if (_groupList.Count() > 0)
+                {
+                    _list = _list.Where(p => _groupList.Contains(p.Kanban)).ToList();
+                }
+
+              
+
+            }
+
+           
+
+
+            _outputService.Export<SettleKBWithCode>(id,_filename , _list);
 
             return id.ToString();
         }

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs

@@ -81,7 +81,7 @@ namespace SettleAccount.Job.Services
             var chassisNumber = p_list.Where(p => p.Name == "ChassisNumber").FirstOrDefault().Value;
             var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
             var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value;
-
+            var _filename = exportName.FirstOrDefault();
             // customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup });
 
 
@@ -98,7 +98,7 @@ namespace SettleAccount.Job.Services
 
             if (!string.IsNullOrEmpty(materialGroup))
             {
-                var _groupList = materialGroup.Split(new char[] { '\n' }).Distinct().ToList();
+                var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
                 if (_groupList.Count() > 0)
                 {
                     _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
@@ -163,7 +163,7 @@ namespace SettleAccount.Job.Services
             .Append(_lsSum, "数量差异汇总表")
             .ExportAppendDataAsByteArray();
             result.ShouldNotBeNull();
-            _fileContainer.SaveAsync(string.Format("大众准时化结算数量差异比对表_{0}.xlsx", Guid.NewGuid().ToString()), result.Result, true);
+            _fileContainer.SaveAsync(_filename, result.Result, true);
 
             //_outputService.Export<InvoiceSettledDetailDiff>(id, string.Format("大众结算未发运核对明细表_{0}.xlsx", Guid.NewGuid().ToString()), _ls);
 

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs

@@ -139,7 +139,7 @@ namespace SettleAccount.Job.Services.Report
 
             if (!string.IsNullOrEmpty(materialGroup))
             {
-                var _groupList = materialGroup.Split(new char[] { '\n' }).Distinct().Distinct().ToList();
+                var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().Distinct().ToList();
                 if (_groupList.Count() > 0)
                 {
                     _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
@@ -218,7 +218,7 @@ namespace SettleAccount.Job.Services.Report
             .Append(_lsSum1.ToList(),"结算系统对比大众R3未结差异汇总")
             .ExportAppendDataAsByteArray();
             result.ShouldNotBeNull();
-            _fileContainer.SaveAsync(string.Format("大众准时化未结差异比对表_{0}.xlsx", Guid.NewGuid().ToString()), result.Result, true);
+            _fileContainer.SaveAsync(_first, result.Result, true);
 
 
 
@@ -260,7 +260,7 @@ namespace SettleAccount.Job.Services.Report
             _list.AddRange(_lst);
             if (!string.IsNullOrEmpty(materialGroup))
             {
-                var _groupList = materialGroup.Split(new char[] { '\n' }).Distinct().ToList();
+                var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
                 if (_groupList.Count() > 0)
                 {
                     _list = _list.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs

@@ -65,7 +65,7 @@ namespace SettleAccount.Job.Services.Report
             _list.AddRange(_lst);
             if (!string.IsNullOrEmpty(materialGroup))
             {
-                var _groupList = materialGroup.Split(new char[] { '\n' }).Distinct().ToList();
+                var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
                 if (_groupList.Count() > 0)
                 {
                     _list = _list.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();