From cdc6cbb0526005e7b68082999be662e694bf351c Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 23 Jul 2026 16:47:40 +0800 Subject: [PATCH] =?UTF-8?q?2026-07-23=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IssureNotifyServiceImpl.java | 7 ++++++- .../resources/mapper/orderIssure/IssureNotifyMapper.xml | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index 7d93bd6..7d19bce 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -3,6 +3,7 @@ package com.gaotao.modules.orderIssure.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.common.utils.BigDecimalUtils; import com.gaotao.common.utils.DateUtils; @@ -551,8 +552,12 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { @Override public PageUtils searchIssueNotifyReport(IssueNotifyReportData data) { + Page page = new Page<>(data.getPage(), data.getLimit()); + page.addOrder(OrderItem.asc("A.NotifyNo")); + page.addOrder(OrderItem.asc("B.SOOrderNo")); + page.addOrder(OrderItem.asc("C.BOMItemNo")); IPage resultList = issureNotifyMapper.searchIssueNotifyReport( - new Page(data.getPage(), data.getLimit()), data); + page, data); return new PageUtils(resultList); } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index cf1c3ff..e42c921 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -686,6 +686,12 @@ C.standard_dosage AS standardDosage, C.QtyToIssue AS qtyToIssue, ISNULL(C.actual_out_qty, 0) AS actualOutQty, + SUM(ISNULL(S.roll_qty,0)) AS returnQrt,--新增，累计退料数量 + CASE + WHEN ISNULL(C.actual_out_qty, 0) - ISNULL(qtyToIssue, 0) - ISNULL(SUM(S.roll_qty), 0) 0 + THEN 0 + ELSE ROUND(ISNULL(C.actual_out_qty, 0) - ISNULL(qtyToIssue, 0) - ISNULL(SUM(S.roll_qty), 0), 2) + END AS reQtyToIssue, --新增，应退数量 A.work_center_no AS workCenterNo, so.out_batchNo AS outBatchNo, W.WareHouseName AS warehouseName, @@ -697,6 +703,7 @@ INNER JOIN Part P ON C.Site = P.Site AND C.ComponentPartNo = P.PartNo INNER JOIN UM U ON U.Site = P.Site AND U.UMID = P.UMID LEFT JOIN WareHouse W ON C.Site = W.Site AND C.warehouse_id = W.WareHouseID + LEFT JOIN StockTransactionLog S ON S.site = A.Site AND S.order_no = B.SOOrderNo AND S.part_no = C.ComponentPartNo AND S.document_type = '生产退仓' --新增 A.site IN (SELECT site FROM AccessSite WHERE userID = #{query.userName}) @@ -739,6 +746,6 @@ - ORDER BY A.NotifyNo, B.SOOrderNo, C.BOMItemNo + GROUP BY A.NotifyNo, CONVERT(VARCHAR(10), A.NotifyDate, 23), A.Status, B.SOOrderNo, C.BOMItemNo, C.ComponentPartNo, P.PartDescription, P.Spec, U.UMName, C.component_scrap, C.first_inspection_qty, C.standard_dosage, C.QtyToIssue, C.actual_out_qty, A.work_center_no, so.out_batchNo, W.WareHouseName, C.warehouse_id \ No newline at end of file