红旗未结核对调整

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnHQSettleAccounts/UnHQSettleImportDto.cs

@@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts
         /// <summary>
         ///外部看板编号
         /// </summary>
-        [ImporterHeader(Name = "外部看板编号")]
+        [ImporterHeader(Name = "外部单号")]
         public string ExternalKanbanNumber { get; set; }
         /// <summary>
         ///看板编号

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnHQSettleAccounts/UnHQSettleAppService.cs

@@ -86,12 +86,13 @@ namespace Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts
         public async Task<string> UnHQSettleUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
         {
             ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<UnHQSettleImportDto>(files, _excelImportService);
+            var result_org = await _exportImporter.UploadExcelImport<UnHQSettleImportDto>(files, _excelImportService);
 
-            if (result == null || result.Count == 0)
+            if (result_org == null || result_org.Count == 0)
             {
                 throw new BusinessException("导入模板数据不能为空！");
             }
+            var result = result_org.Where(p => p.Factory != "L").ToList();//去掉工厂L
 
             var entityList = ObjectMapper.Map<List<UnHQSettleImportDto>, List<UnHQSettleAccount>>(result);
             //删除版本

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

@@ -241,12 +241,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "			LEFT JOIN  set_backQty  AS tt ON a.Kanban = tt.Code \n" +
             "			AND a.MaterialCode = tt.MaterialCode \n" +
             "		WHERE\n" +
-            "			a.WMSDeliveryQty> B.Qty \n" +
+            "			a.WMSDeliveryQty> B.Qty AND  (a.WMSDeliveryQty-tt.Qty)!=B.Qty \n" +
             "		) TEMP1\n" +
             "	LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE Version = '202110' ) TEMP2 ON TEMP1.SapCode = TEMP2.MaterialCode \n" +
             "	) UNION2";
 
-
+            //财务香凝要求：交货数量－退货数量＝结算数量  这样的不体现在未结中
 
             sql = string.Format(sql,contion,strDate);
 

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

@@ -47,6 +47,9 @@ namespace SettleAccount.Job.Services.Report
 
             var _ls = _dapper.GetKanbanReportList(version, begin, end, iscontionversion);
 
+            //财务香凝要求：交货数量－退货数量＝结算数量  这样的不体现在未结中
+            //_ls = _ls.Where(p => p.DiffQty != 0).ToList();
+
             //有发货有结算，且发货数量大于结算
             var _ls_wmskanban = _dapper.GetWMSKanbanReportList(version, begin, end, iscontionversion);