加交货日期过滤条件

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

@@ -555,9 +555,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
                 "FROM\n" +
                 "	Set_HQ_H_Kanban A\n" +
                 "	INNER JOIN ( SELECT MaterialCode, Kanban FROM Set_HQ_H_Kanban GROUP BY MaterialCode, Kanban HAVING COUNT ( * ) > 1 ) B ON A.Kanban = B.Kanban \n" +
-            "	AND A.MaterialCode = B.MaterialCode " +
-            "    left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode ";
-            var listCompare = DbConnection.Query<CompareFactoryExtend>(sql2);
+                "	AND A.MaterialCode = B.MaterialCode\n" +
+                "	LEFT JOIN Set_material t1 ON a.MaterialCode= t1.CustomerPartCode \n" +
+                "WHERE\n" +
+                "	1 = 1 {0}";
+            var _sql2=string.Format(sql2, condition);
+            var listCompare = DbConnection.Query<CompareFactoryExtend>(_sql2);
 
 
 
@@ -575,9 +578,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "   left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode \n" +
 
             "WHERE\n" +
-            "	B.Kanban IS NULL";
-
-            var listCompare1 = DbConnection.Query<CompareFactoryExtend>(sql3);
+            "	B.Kanban IS NULL {0} ";
+            var _sql3 = string.Format(sql2, condition);
+            var listCompare1 = DbConnection.Query<CompareFactoryExtend>(_sql3);
 
 
            

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

@@ -718,9 +718,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "FROM\n" +
             "	Set_HQ_H_Kanban A\n" +
             "	INNER JOIN ( SELECT MaterialCode, Kanban FROM Set_HQ_H_Kanban GROUP BY MaterialCode, Kanban HAVING COUNT ( * ) > 1 ) B ON A.Kanban = B.Kanban \n" +
-            "	AND A.MaterialCode = B.MaterialCode " +
-            "    left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode ";
-            var listCompare = DbConnection.Query<CompareExtend>(sql2);
+            "	AND A.MaterialCode = B.MaterialCode\n" +
+            "	LEFT JOIN Set_material t1 ON a.MaterialCode= t1.CustomerPartCode \n" +
+            "WHERE\n" +
+            "	1 = 1 {0} ";
+            var _sql2 = string.Format(str, condition);
+            var listCompare = DbConnection.Query<CompareExtend>(_sql2);
 
 
 
@@ -738,9 +741,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "   left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode \n" +
 
             "WHERE\n" +
-            "	B.Kanban IS NULL";
+            "	B.Kanban IS NULL {0}";
 
-            var listCompare1 = DbConnection.Query<CompareExtend>(sql3);
+            var _sql3 = string.Format(str, condition);
+
+            var listCompare1 = DbConnection.Query<CompareExtend>(_sql3);
 
 
             string contionCompare = string.Empty;