From c74c475237c681ab1b7f0313f74c12bac54a73ad Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sun, 4 Jan 2026 16:37:09 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-04=20=E7=94=9F=E4=BA=A7=E6=B4=BE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=94=9F=E6=88=90=E9=A1=B5=E9=9D=A2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/wms/data/InboundQcResultData.java | 1 + .../mapper/shopOrder/ShopOrderMapper.xml | 41 ++++++++++--------- .../resources/mapper/wms/WmsPrintMapper.xml | 7 +++- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java b/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java index 9a9a30a..d66da06 100644 --- a/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java +++ b/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java @@ -43,4 +43,5 @@ public class InboundQcResultData extends QueryPage { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endDate; private String notifyNo; + private String spec; } diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml index ffdf21d..d71a61a 100644 --- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml +++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml @@ -163,49 +163,52 @@ D.LotSize AS OrderQty FROM SOScheduledRouting AS T - INNER JOIN SORouting AS S WITH(NOLOCK) ON T.Site = S.Site AND T.OrderNo = S.OrderNo AND T.ItemNo = S.ItemNo - LEFT JOIN ShopOrder AS D WITH(NOLOCK) ON T.Site = D.Site AND T.OrderNo = D.OrderNo - LEFT JOIN SOScheduledList AS E WITH(NOLOCK) ON E.Site = T.Site AND E.LinkedSeqNo = T.SeqNo - LEFT JOIN Part AS P WITH(NOLOCK) ON S.Site = P.Site AND S.PartNo = P.PartNo - LEFT JOIN SORouting AS S1 WITH(NOLOCK) ON S.Site = S1.Site AND S.OrderNo = S1.OrderNo AND S.PreItemNo = S1.ItemNo - LEFT JOIN SORouting AS S2 WITH(NOLOCK) ON S.Site = S2.Site AND S.OrderNo = S2.OrderNo AND S.NextItemNo = S2.ItemNo - LEFT JOIN ( SELECT Site, CreatedOpsSeqNo, COUNT(1) AS RollCount FROM SFDC_Rolls WITH(NOLOCK) WHERE RollType = '下道流转' GROUP BY Site, CreatedOpsSeqNo) AS R ON R.Site = T.Site AND R.CreatedOpsSeqNo = T.SeqNo - LEFT JOIN Customer C WITH(NOLOCK) ON D.Site = C.Site AND D.CustomerID = C.CustomerID + INNER JOIN SORouting AS S WITH(NOLOCK) ON T.Site = S.Site AND T.OrderNo = S.OrderNo AND T.ItemNo = S.ItemNo + LEFT JOIN ShopOrder AS D WITH(NOLOCK) ON T.Site = D.Site AND T.OrderNo = D.OrderNo + LEFT JOIN SOScheduledList AS E WITH(NOLOCK) ON E.Site = T.Site AND E.LinkedSeqNo = T.SeqNo + LEFT JOIN Part AS P WITH(NOLOCK) ON S.Site = P.Site AND S.PartNo = P.PartNo + LEFT JOIN SORouting AS S1 WITH(NOLOCK) ON S.Site = S1.Site AND S.OrderNo = S1.OrderNo AND S.PreItemNo = S1.ItemNo + LEFT JOIN SORouting AS S2 WITH(NOLOCK) ON S.Site = S2.Site AND S.OrderNo = S2.OrderNo AND S.NextItemNo = S2.ItemNo + LEFT JOIN (SELECT Site, CreatedOpsSeqNo, COUNT(1) AS RollCount FROM SFDC_Rolls WITH(NOLOCK) WHERE RollType = '下道流转' GROUP BY Site, CreatedOpsSeqNo) AS R ON R.Site = T.Site AND R.CreatedOpsSeqNo = T.SeqNo + LEFT JOIN Customer C WITH(NOLOCK) ON D.Site = C.Site AND D.CustomerID = C.CustomerID AND T.Site = S.Site AND T.OrderNo = S.OrderNo AND T.ItemNo = S.ItemNo - + AND T.Site like '%' + #{site} + '%' - + AND T.OrderNo like '%' + #{orderNo} + '%' - + + AND T.SeqNo like '%' + CAST(CAST(#{seqNo} AS BIGINT) AS VARCHAR) + '%' + + AND S.PartNo like '%' + #{partNo} + '%' - + AND T.S_ResourceID like '%' + #{sResourceID} + '%' - + AND T.S_WorkCenterNo like '%' + #{workCenterNo} + '%' - + AND D.EnterDate >= #{date1} - + AND dateadd( DAY, 1, #{date2} ) > D.EnterDate - + AND T.PlanStartTime >= #{date3} - + AND dateadd( DAY, 1, #{date4} ) > T.PlanStartTime - + AND T.PlanFinishTime>= #{date5} - + AND dateadd( DAY, 1, #{date6} ) > T.PlanFinishTime ${sql} diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml index 34d7547..6c5d2f1 100644 --- a/src/main/resources/mapper/wms/WmsPrintMapper.xml +++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml @@ -12,6 +12,7 @@ a.order_status, d.part_no, d.part_desc, + p.spec, D.related_order_no AS po_orderNo, D.related_order_line_no AS po_itemNo, c.SupplierName, @@ -25,8 +26,9 @@ disposal_measures, B.batch_qualified_qty, b.inspector_no - from inbound_notification_head a + from inbound_notification_head a inner join inbound_notification_detail D on a.site = D.site and a.bu_no = D.bu_no and a.order_no = D.order_no AND A.order_type ='采购入库' + LEFT JOIN PART P ON D.site = P.Site AND D.part_no = P.PartNo inner join qc_iqc_record b on D.site = b.site and D.bu_no = b.bu_no and D.inspection_no = b.inspection_no left join Supplier c on a.site = c.Site and a.Supplier_ID = c.supplierID @@ -48,6 +50,9 @@ and b.part_desc like '%'+ #{query.partDesc,jdbcType=CHAR} +'%' + + and p.spec like '%'+ #{query.spec} +'%' + and b.inspector_date > #{query.startDate}