From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 4b55e8b..4ccad15 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -148,7 +148,8 @@
order by type desc,io.id desc
) a
LEFT JOIN
- (SELECT r.id, r.ins_order_id, is_ratify, url, url_s,sample_code FROM ins_report r left join ins_sample isa on r.ins_sample_id = isa.id WHERE is_ratify = 1) ir ON a.id =
+ (SELECT r.id, r.ins_order_id, is_ratify, url, url_s,sample_code FROM ins_report r left join ins_sample isa on
+ r.ins_sample_id = isa.id WHERE is_ratify = 1) ir ON a.id =
ir.ins_order_id )b
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -192,8 +193,9 @@
A.model,
A.inspection_item,
A.company,
+ A.cost ,
A.`name`,
- COUNT(1) num,
+ COUNT(1) num,
ROUND(SUM(A.price),2) price
FROM (SELECT i.id,
i.entrust_code,
@@ -202,7 +204,7 @@
isa.model,
ins_sample_id,
times cost,
- sum(c.price * times) price,
+ sum(c.price * times) price,
GROUP_CONCAT(distinct c.inspection_item SEPARATOR ',') inspection_item,
i.company,
u.`name`
@@ -248,16 +250,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="selectDeviceList" resultType="java.util.Map">
- select device_name,specification_model,management_number,<!--DATE_ADD(date_format(last_calibration_date,
- '%Y-%m-%d'),INTERVAL calibration_date month)--> date_format(next_calibration_date,'%Y-%m-%d')
- latest_traceability
- from device
- where device.management_number in
- <foreach collection="names" index="index" open="(" separator="," close=")" item="val">
- #{val}
- </foreach>
- </select>
+
<update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
UPDATE ins_order
@@ -386,7 +379,7 @@
A.inspection_item,
A.company,
A.`name`,
- COUNT(1) num,
+ COUNT(1) num,
ROUND(SUM(A.price),2) price
FROM (SELECT i.id,
i.entrust_code,
@@ -394,7 +387,7 @@
isa.sample,
isa.model,
ins_sample_id,
- sum(c.price * times) price,
+ sum(c.price * times) price,
GROUP_CONCAT(distinct c.inspection_item SEPARATOR ',') inspection_item,
i.company,
u.`name`
@@ -453,4 +446,23 @@
join user on prepare_user = name
where ins_order.id = #{id}
</select>
+
+ <select id="selectDeviceList" resultType="com.yuanchu.mom.dto.DevListDto">
+ select ROW_NUMBER() OVER (ORDER BY d.management_number) AS indexs,
+ device_name AS name,
+ specification_model AS model,
+ management_number AS number,
+ version,
+ date_format(CASE
+ WHEN dmr.next_calibration_date is not null THEN dmr.next_calibration_date
+ WHEN d.next_calibration_date > CURDATE() THEN d.next_calibration_date
+ END,'%Y-%m-%d') AS date
+ from device d
+ left join
+ device_metric_record dmr on d.id = dmr.device_id
+ where d.management_number in
+ <foreach collection="names" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3