From 2cf06285f64311722cbf79fd5635b16718635e5e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 六月 2026 18:07:16 +0800
Subject: [PATCH] 不合格处理：支持多生产批次提交oa；oa流程查看调整
---
inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
index b343984..e1edf4c 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
@@ -16,7 +16,66 @@
*
from (
select
- iiq.*,
+ iiq.contract,
+ iiq.order_no,
+ iiq.order_type,
+ iiq.material_prop,
+ iiq.line_no,
+ iiq.release_no,
+ iiq.receipt_no,
+ iiq.part_no,
+ iiq.part_desc,
+ iiq.status,
+ iiq.status_db,
+ iiq.qty_arrived,
+ iiq.qty_inspected,
+ iiq.qty_to_inspect,
+ iiq.supplier_id,
+ iiq.supplier_name,
+ iiq.inv_qty_in_store,
+ iiq.pur_qty_in_store,
+ iiq.configuration_id,
+ iiq.lot_batch_no,
+ iiq.waiv_dev_rej_no,
+ iiq.activity_seq,
+ iiq.serial_no,
+ iiq.location_no,
+ iiq.eng_chg_level,
+ iiq.receiver,
+ iiq.receiver_name,
+ iiq.buyer_code,
+ iiq.buyer_name,
+ iiq.arrive_date,
+ iiq.delivery_date,
+ iiq.product_date,
+ iiq.invalid_date,
+ iiq.approved_date,
+ iiq.req_ceater,
+ iiq.req_ceater_name,
+ iiq.line_remarks,
+ iiq.buy_unit_meas,
+ iiq.is_source,
+ iiq.number,
+ iiq.state,
+ iiq.receiver_date,
+ iiq.is_first,
+ iiq.to_location,
+ iiq.is_inspect,
+ iiq.declare_user,
+ iiq.declare_user_id,
+ iiq.part_unit,
+ iiq.industry_chain,
+ iiq.declare_date,
+ iiq.is_quarter,
+ iiq.is_copper,
+ iiq.update_batch_no,
+ iiq.is_finish,
+ iiq.inspect_status,
+ iiq.is_register,
+ iiq.is_update_batch,
+ iiq.is_expire,
+ iiq.is_split_order,
+ iuh.id,
iuh.id as handler_id,
iuh.no,
iuh.material_name,
@@ -34,6 +93,9 @@
iuh.request_id,
iuh.file_url,
iuh.headline,
+ iuh.ins_order_id,
+ iuh.is_old_data,
+ iuh.group_id,
coa.operation
from
ins_unqualified_handler iuh
@@ -48,12 +110,12 @@
FROM
common_oa
) AS coa ON iuh.request_id = coa.workflow_id AND coa.rn = 1
+ <where>
+ <if test="feedbackStartDate!=null and feedbackEndDate !=null">
+ AND iuh.feedback_time between #{feedbackStartDate} AND #{feedbackEndDate}
+ </if>
+ </where>
)tempA
- <where>
- <if test="feedbackStartDate!=null and feedbackEndDate !=null">
- AND feedback_time between #{feedbackStartDate} AND #{feedbackEndDate}
- </if>
- </where>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -102,4 +164,34 @@
and operation != '鎶勯��'
group by co.node_name
</select>
+ <select id="findByGroupId" resultType="com.ruoyi.inspect.vo.UnqualifiedHandlerVO">
+ select
+ iuh.id as handler_id,
+ iuh.no,
+ iuh.headline,
+ iuh.material_name,
+ GROUP_CONCAT(iuh.production_batch SEPARATOR '銆�') AS production_batch,
+ SUM(iuh.cargo_quantity) AS cargo_quantity,
+ iuh.buy_unit_meas,
+ iuh.specs_models,
+ iiq.supplier_name,
+ iuh.inspect_time,
+ iuh.feedback_user,
+ iuh.feedback_time,
+ iuh.classification,
+ iuh.off_grade_ascription,
+ iuh.unqualified_desc,
+ iuh.inventory_quantity_id,
+ iuh.request_id,
+ iuh.oa_state,
+ iuh.file_url,
+ iuh.group_id
+ from
+ ins_unqualified_handler iuh
+ inner join
+ ifs_inventory_quantity iiq on iuh.inventory_quantity_id = iiq.id
+ where iuh.group_id=#{groupId}
+ group by iuh.group_id
+ limit 1
+ </select>
</mapper>
--
Gitblit v1.9.3