From 169571eb8c63a921d8096139d2b6d55398dfa31c Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 28 Apr 2026 17:24:51 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-28=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/shopOrder/ProductionReportMapper.xml | 3 ++- src/main/resources/mapper/wms/WmsPrintMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index ced9e2a..ac031ff 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/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 diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml index ea9c4b1..9309699 100644 --- a/src/main/resources/mapper/wms/WmsPrintMapper.xml +++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml @@ -259,7 +259,7 @@ and a.batch_no like '%'+ #{query.batchNo}+'%' - + order by a.first_in_date