From 38d8ecf532699a4ffb0c7df42422a45da405be12 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 26 Mar 2026 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-26=20=E4=BA=A7=E7=BA=BF=E4=BA=A7?=
=?UTF-8?q?=E9=87=8F=E9=87=87=E9=9B=86=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shopOrder/ProductionReportMapper.xml | 20 ++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
index f4de431..c9380fb 100644
--- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
@@ -237,6 +237,9 @@
AND SS.S_ResourceID like '%' + #{sResourceID} + '%'
+
+ AND T.AssJobSeqNo = #{assJobSeqNo}
+
AND T.ReportDate >= #{date1}
@@ -259,33 +262,36 @@
and T.Site=S.Site and T.OrderNo=S.OrderNo and T.Site=R.Site and T.OrderNo=R.OrderNo and T.ItemNo=R.ItemNo and s.Site=p.Site
and s.PartNo=p.PartNo and R.Site=W.Site and R.WorkCenterNo=W.WorkCenterNo and T.Site=O.Site and T.OperatorID=O.OperatorID
and T.Site=R.Site and T.OrderNo=R.OrderNo and T.ItemNo=R.ItemNo
- and T.Site in (Select Site from AccessSite where upper(UserID)=#{user})
+ and T.Site in (Select Site from AccessSite where upper(UserID)=#{user})
AND T.Reverseflag = 'N'
AND T.Site = #{site}
-
+
AND s.PartNo like '%' + #{partNo} + '%'
-
+
AND p.PartDescription+' / '+p.Spec like '%' + #{partDescription} + '%'
AND T.OrderNo = #{orderNo}
-
+
AND T.OperatorID like '%' + #{operatorID} + '%'
-
+
AND R.WorkcenterNo like '%' + #{workCenterNo} + '%'
AND SS.S_ResourceID like '%' + #{sResourceID} + '%'
-
+
+ AND T.AssJobSeqNo = #{assJobSeqNo}
+
+
AND T.ReportDate >= #{date1}
-
+
AND dateadd( DAY, 1, #{date2} ) > T.ReportDate