优化周转表计算

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -74,7 +74,7 @@ from dc_auto_turnover as dat
 
                 DynamicParameters parameters = new DynamicParameters();
 
-                if ((!string.IsNullOrWhiteSpace(m.warehousetype)) || m.warehousearea > 0 || (!string.IsNullOrEmpty(m.warehouse_code)))
+                if ( m.warehousearea > 0 )
                 {
                     sqlCount += " left join dc_base_warehouse as t3 on dat.warehouse_code = t3.warehouse_code ";
                 }
@@ -194,8 +194,8 @@ from dc_auto_turnover as dat
                 {
                     if (!string.IsNullOrWhiteSpace(m.warehousetype))
                     {
-                        sql += " and t3.hq_type=" + $"'{m.warehousetype}'";
-                        sqlCount += " and t3.hq_type=" + $"'{m.warehousetype}'";
+                        sql += " and dat.hq_type=" + $"'{m.warehousetype}'";
+                        sqlCount += " and dat.hq_type=" + $"'{m.warehousetype}'";
                     }
                     if (m.warehousearea > 0)
                     {