From ddb54b18b965d1040c6dc30567a1b73e6856c88f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 30 Jul 2026 15:36:09 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-30=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boxManage/BoxForNotificationMapper.xml    |  2 +-
 .../shopOrder/WorkOrderDetailsAllocMapper.xml | 53 +++++++------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
index b49ecf8..d5e403c 100644
--- a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
+++ b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
@@ -147,7 +147,7 @@
             status,
             qty_on_hand
         FROM inventory_stock
-        WHERE parent_roll_no = #{rollNo}
+        WHERE (parent_roll_no = #{rollNo} or roll_no = #{rollNo})
           AND site = #{site}
           AND bu_no = #{buNo}
         and status='在库' AND COALESCE(parent_roll_type, '*') NOT IN ('箱标签')
diff --git a/src/main/resources/mapper/shopOrder/WorkOrderDetailsAllocMapper.xml b/src/main/resources/mapper/shopOrder/WorkOrderDetailsAllocMapper.xml
index 34f6fa6..ce74738 100644
--- a/src/main/resources/mapper/shopOrder/WorkOrderDetailsAllocMapper.xml
+++ b/src/main/resources/mapper/shopOrder/WorkOrderDetailsAllocMapper.xml
@@ -55,21 +55,21 @@
             P.PartDescription AS partDescription,
             A.LotSize AS lotSize,
             A.batch_no AS batchNo,
-            A.create_date AS createDate,
-            B.PlanFinishTime AS planFinishTime,
-            B.finishtime AS finishTime,
-            B.S_ScheduledDate AS sScheduledDate,
-            B.ClosedDate AS closedDate,
-            C.OperatorID AS operatorId,
-            C.ReportDate AS reportDate,
-            C.Scheduled_ShiftNo AS scheduledShiftNo,
-            C.WorkCenterNo AS workCenterNo,
-            SUM(ISNULL(C.ReportQty, 0)) AS totalReportQty,
-            SUM(ISNULL(C.ApproveQty, 0)) AS totalApproveQty,
-            SUM(ISNULL(C.ReportQty, 0) - ISNULL(C.ApproveQty, 0)) AS defectQty,
-            SUM(ISNULL(C.ReportedSetupTime, 0)) AS totalSetupTime,
-            SUM(ISNULL(C.ReportedManfTime, 0)) AS totalManfTime,
-            SUM(ISNULL(C.downtime, 0)) AS totalDownTime
+        CAST(A.create_date AS date) AS createDate,
+        CAST(B.PlanFinishTime AS date) AS planFinishTime,
+        CAST(B.finishtime AS date) AS finishTime,
+        CAST(B.S_ScheduledDate AS date) AS sScheduledDate,
+        CAST(B.ClosedDate AS date) AS closedDate,
+        C.OperatorID AS operatorId,
+        CAST(C.ReportDate AS date) AS reportDate,
+        C.Scheduled_ShiftNo AS scheduledShiftNo,
+        C.WorkCenterNo AS workCenterNo,
+        SUM(ISNULL(C.ReportQty, 0)) AS totalReportQty,   -- 报告数量
+        SUM(ISNULL(C.ApproveQty, 0)) AS totalApproveQty, -- 合格数量
+        SUM(ISNULL(C.ReportQty, 0) - ISNULL(C.ApproveQty, 0)) AS defectQty,  -- 不良数量
+        ROUND(SUM(ISNULL(C.ReportedSetupTime, 0)),4) AS totalSetupTime,
+        ROUND(SUM(ISNULL(C.ReportedManfTime, 0)),4) AS totalManfTime,
+        ROUND(SUM(ISNULL(C.downtime, 0)),4) AS totalDownTime
         FROM ShopOrder A
         INNER JOIN SOScheduledRouting B ON A.Site = B.Site AND A.OrderNo = B.OrderNo
         INNER JOIN SFDC C ON B.Site = C.Site AND B.OrderNo = C.OrderNo AND B.SeqNo = C.AssJobSeqNo
@@ -77,25 +77,10 @@
         <where>
             <include refid="workOrderDetailsBaseConditions"/>
         </where>
-        GROUP BY
-            A.Site,
-            A.OrderNo,
-            A.OrderType,
-            B.SeqNo,
-            A.PartNo,
-            P.PartDescription,
-            A.LotSize,
-            A.batch_no,
-            A.create_date,
-            B.PlanFinishTime,
-            B.finishtime,
-            B.S_ScheduledDate,
-            B.ClosedDate,
-            C.OperatorID,
-            C.ReportDate,
-            C.Scheduled_ShiftNo,
-            C.WorkCenterNo
-        ORDER BY B.SeqNo, C.ReportDate
+        GROUP BY            A.Site,            A.OrderNo,            A.OrderType,            B.SeqNo,            A.PartNo,            P.PartDescription,            A.LotSize,
+        A.batch_no,            CAST(A.create_date AS date),            CAST(B.PlanFinishTime AS date),            CAST(B.finishtime AS date),            CAST(B.S_ScheduledDate AS date),
+        CAST(B.ClosedDate AS date),            C.OperatorID,            CAST(C.ReportDate AS date),            C.Scheduled_ShiftNo,            C.WorkCenterNo
+        ORDER BY B.SeqNo, CAST(C.ReportDate AS date)
     </select>
 
     <!-- 根据allocType查询工单汇总数据 -->