Merge branch 'mysql' into dev

Resolved merge conflict in utils/material_status_validator.py by keeping
both deduplication statistics and error messages for empty results.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

db/discrete_material_plan_dao.py

@@ -357,6 +357,97 @@ class DiscreteMaterialPlanDAO(BaseDAO):
 
         return all_results
 
+    def query_all_distinct_by_material_code(self) -> List[Dict]:
+        """
+        查询所有记录，基于 MaterialCode 去重
+
+        保留策略：每个 MaterialCode 保留第一条记录
+        排序规则：CreateDate ASC → SequenceNumber ASC
+
+        Returns:
+            List of dictionaries representing deduplicated records
+        """
+        with get_connection() as db:
+            table_name = self._convert_sql('[dbo].[DiscreteMaterialPlanData]')
+
+            sql = f"""
+            WITH RankedRecords AS (
+                SELECT
+                    *,
+                    ROW_NUMBER() OVER (
+                        PARTITION BY MaterialCode
+                        ORDER BY CreateDate ASC, SequenceNumber ASC
+                    ) AS rn
+                FROM {table_name}
+                WHERE MaterialCode IS NOT NULL
+            )
+            SELECT
+                Factory, MaterialStatus, PlanNumber, SourceNumber, MaterialType,
+                ProductCode, ProductName, ProductUnit, ProductPlanQuantity,
+                UseDepartment, Remark, Creator, CreateDate, Approver, ApproveDate,
+                SequenceNumber, MaterialCode, MaterialName, Specification, Model,
+                DrawingNumber, MaterialQuality, PlanQuantity, Unit, RequiredDate,
+                Warehouse, UnitUsage, CumulativeOutputQuantity, BOMVersion
+            FROM RankedRecords
+            WHERE rn = 1
+            """
+
+            return db.execute_query(sql)
+
+    def query_by_source_numbers_distinct(self, source_numbers: List[str]) -> List[Dict]:
+        """
+        按 SourceNumber 过滤查询，基于 MaterialCode 去重
+
+        保留策略：每个 MaterialCode 保留第一条记录
+        排序规则：CreateDate ASC → SequenceNumber ASC
+
+        Args:
+            source_numbers: SourceNumber 列表
+
+        Returns:
+            List of dictionaries representing deduplicated records
+        """
+        if not source_numbers:
+            return []
+
+        batch_size = 2000
+        all_results = []
+
+        for i in range(0, len(source_numbers), batch_size):
+            batch = source_numbers[i:i + batch_size]
+            placeholder = self._get_placeholder()
+            placeholders = ','.join([placeholder for _ in batch])
+            table_name = self._convert_sql('[dbo].[DiscreteMaterialPlanData]')
+
+            sql = f"""
+            WITH RankedRecords AS (
+                SELECT
+                    *,
+                    ROW_NUMBER() OVER (
+                        PARTITION BY MaterialCode
+                        ORDER BY CreateDate ASC, SequenceNumber ASC
+                    ) AS rn
+                FROM {table_name}
+                WHERE SourceNumber IN ({placeholders})
+                  AND MaterialCode IS NOT NULL
+            )
+            SELECT
+                Factory, MaterialStatus, PlanNumber, SourceNumber, MaterialType,
+                ProductCode, ProductName, ProductUnit, ProductPlanQuantity,
+                UseDepartment, Remark, Creator, CreateDate, Approver, ApproveDate,
+                SequenceNumber, MaterialCode, MaterialName, Specification, Model,
+                DrawingNumber, MaterialQuality, PlanQuantity, Unit, RequiredDate,
+                Warehouse, UnitUsage, CumulativeOutputQuantity, BOMVersion
+            FROM RankedRecords
+            WHERE rn = 1
+            """
+
+            with get_connection() as db:
+                results = db.execute_query(sql, tuple(batch))
+                all_results.extend(results)
+
+        return all_results
+
     def get_unique_material_names(self, source_numbers: List[str] = None) -> List[str]:
         """
         Get unique material names, optionally filtered by SourceNumber.