From a774e1cc4d9c489cafe9c1389de945642ace0230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com> Date: Sat, 11 Oct 2025 16:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/controller/QuaController.java | 2 ++ .../quality/QcCheckTaskProduceMapper.xml | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index fc35598b8..b54187876 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -6,6 +6,8 @@ import com.op.common.core.utils.StringUtils; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.web.page.TableDataInfo; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; import com.op.quality.domain.*; import com.op.quality.service.*; import com.op.system.api.RemoteMesService; diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 660f5b492..1cca932bf 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -460,22 +460,37 @@ pow.workorder_name checkLoc, pow.product_code materialCode, pow.product_name materialName, - pow.quantity_split quality, +-- pow.quantity_split quality, pow.unit, be.workshop_code supplierCode, be.workshop_name supplierName, pow.product_date incomeTime, pow.workorder_name checkLoc, pow.prod_type productType, - qct.check_no + qct.check_no, + SUM(mr.quantity_feedback) AS quality from pro_order_workorder pow left join base_equipment be on be.equipment_code = pow.workorder_name and be.equipment_type_code = 'equ_type_bzx' left join qc_check_task qct on qct.order_no = pow.workorder_code and qct.check_type='checkTypeCP' and qct.del_flag = '0' + LEFT JOIN mes_report_work mr ON mr.workorder_code = pow.workorder_code where pow.del_flag = '0' and pow.status = #{status} and pow.parent_order = '0' and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120) or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)) and qct.check_no is null + GROUP BY -- 新增分组以计算总和 + pow.factory_code, + pow.workorder_code, + pow.workorder_name, + pow.product_code, + pow.product_name, + pow.quantity_split, + pow.unit, + be.workshop_code, + be.workshop_name, + pow.product_date, + pow.prod_type, + qct.check_no;