diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs
index 8cfd0c1c..6f67e218 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs
@@ -19,6 +19,15 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
///
/// 7.大众准时化未结明细表(包含漏结,漏结要有标识)
///
+ ///
+
+ public class FisRemoveItem
+ {
+ public string SapMaterialCode { set; get; }
+ public string ChassisNumber { set; get; }
+
+ public string MaterialDesc { set; get; }
+ }
public class UnSettledDetailDapperRepository : DapperRepository, ITransientDependency
{
@@ -140,8 +149,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" LEFT JOIN Set_material B ON a.MaterialCode = b.CustomerPartCode \n" +
" LEFT JOIN (select max(Id) Id,MaterialCode,MaterialDesc from Set_material group by MaterialCode,MaterialDesc) d ON a.ParentSapMaterialCode = d.MaterialCode \n" +
" ) temp1\n" +
-" LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) ) temp2 ON temp1.SapMaterialCode = temp2.MaterialCode \n"+
+" LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) ) temp2 ON temp1.SapMaterialCode = temp2.MaterialCode \n" +
" left join set_backQty tt on temp1.SapMaterialCode = tt.MaterialCode and temp1.ChassisNumber = tt.Code ";
+;
//var _materialList = DbConnection.Query("select * from set_material").ToList();
//var _priceList = DbConnection.Query("select MaterialCode,Price from Set_PriceList where version=(select max(version) from set_Set_PriceListVersion)").ToList();
@@ -275,8 +285,24 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
_list = _list.Where(p => p.SapMaterialCode == sapCode).ToList();
return _list;
}
+
+ public virtual List GetRemoveDetail()
+ {
+
+
+ var sqlString = "select * from Set_FisRemove";
+ string _sql = string.Format(sqlString);
+ ;
+ var _query = DbConnection.Query(_sql);
+
+
+ var _list = _query.ToList();
+
+
+ return _list;
+ }
}
}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs
index 90856169..9d40148e 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs
@@ -101,6 +101,17 @@ namespace SettleAccount.Job.Services.Report
_list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList();
}
}
+ var removeList= _dapper.GetRemoveDetail();
+
+ var _query= from itm in _list
+ join itm1 in removeList on new { itm.ChassisNumber, itm.SapMaterialCode }
+equals new { itm1.ChassisNumber, itm1.SapMaterialCode } into temp1
+ from tm1 in temp1.DefaultIfEmpty()
+ where tm1 == null
+ select itm;
+
+ _list=_query.ToList();
+
_list = _list.OrderBy(p => p.SapMaterialCode).ThenBy(p => p.ChassisNumber).ThenBy(p => p.Flag).ToList();
_outputService.Export(id, _first, _list);
return id.ToString();