From 2eaeb19b16af087d17c186c6220bf64f2fc07f4f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:51:57 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
index 2b65479..cb4bee9 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,7 @@
iuh.request_id,
iuh.file_url,
iuh.headline,
+ iuh.ins_order_id,
coa.operation
from
ins_unqualified_handler iuh
@@ -44,16 +104,16 @@
LEFT JOIN (
SELECT
*,
- ROW_NUMBER() OVER (PARTITION BY workflow_id ORDER BY approval_time DESC, id DESC) AS rn
+ ROW_NUMBER() OVER (PARTITION BY workflow_id ORDER BY approval_date DESC,approval_time DESC, id DESC) AS rn
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>
--
Gitblit v1.9.3