From 27a90e70749f5a569eda2c225d7b319b3c2d77a5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 15 十二月 2025 11:41:03 +0800
Subject: [PATCH] 订单拆分生成系统编号逻辑调整
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 9c9f99f..4a8569d 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -177,9 +177,9 @@
io.send_time,
io.order_type,
case when
- io.type_source = 0
- then io.sample_view
- else io.sample end sample,
+ io.type_source = 0
+ then io.sample_view
+ else io.sample end sample,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
userName,
checkName,
@@ -192,7 +192,8 @@
ira.url,
ira.url_s,
ira.temp_url_pdf,
- iiq.is_copper
+ iiq.is_copper,
+ iiq.is_split_order
FROM
ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
@@ -203,7 +204,7 @@
FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
WHERE u.state=0
<if test="sonLaboratory!= null and sonLaboratory != ''">
- and son_laboratory=#{sonLaboratory}
+ and son_laboratory=#{sonLaboratory}
</if>
GROUP BY ins_sample_id
ORDER BY ins_sample_id
@@ -251,6 +252,7 @@
${ew.customSqlSegment}
</if>
ORDER BY send_time asc
+
</select>
<select id="inspectionOrderDetailsTaskSwitching" resultType="com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo">
--
Gitblit v1.9.3