2026-04-28

优化

src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@@ -416,7 +416,8 @@
         ISNULL(R.Poor_Performance_Qty, 0) as poorPerformanceQty,
         ISNULL(R.Defect_Qty, 0) as defectQty,
         ISNULL(R.Total_Qty, 0) as totalQty,
-        ROUND(ISNULL(100.0 * R.Good_Qty / NULLIF(R.Total_Qty, 0), 100), 2) as yieldRate
+        ROUND(ISNULL(100.0 * R.Good_Qty / NULLIF(R.Total_Qty, 0), 100), 2) as yieldRate ,
+        a.remark
         FROM SFDC_Rolls A WITH(NOLOCK)
         INNER JOIN part P WITH(NOLOCK) ON A.Site = P.Site AND A.PartNo = P.PartNo
         LEFT JOIN LatestMaterial B   ON A.Site = B.Site   AND A.RollNo = B.StartFromRollNo   AND B.rn = 1

src/main/resources/mapper/wms/WmsPrintMapper.xml

@@ -259,7 +259,7 @@
                 and a.batch_no like '%'+ #{query.batchNo}+'%'
             </if>
         </where>
-
+        order by a.first_in_date
     </select>
 
     <!-- 查询物料有效期信息 -->