From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml
index c7f7e4e..212e574 100644
--- a/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml
@@ -26,6 +26,41 @@
update_time,
memo
FROM man_qly_ispt_item qii
- LEFT JOIN man_qly_inspect_result qir ON qii.id = qir.ispt_item_id) t ${ew.customSqlSegment}
+ LEFT JOIN man_qly_inspect_result qir ON qii.id = qir.ispt_item_id
+ where qii.deleted = 0
+ ) t
+
+ ${ew.customSqlSegment}
+ </select>
+ <select id="selectIsptResult" resultType="com.vincent.rsf.server.manager.entity.QlyIsptItem">
+ SELECT *
+ FROM (SELECT qii.id,
+ ispect_id,
+ asn_item_id,
+ matnr_code,
+ maktx,
+ qii.rcpt_id,
+ splr_name,
+ splr_batch,
+ rcpt_qty,
+ dly_qty,
+ track_code,
+ pic_path,
+ `status`,
+ deleted,
+ tenant_id,
+ create_by,
+ COALESCE((SELECT anfme FROM man_qly_inspect_result WHERE qii.id = ispt_item_id AND ispt_result = 1), 0) AS safe_qty,
+ COALESCE((SELECT anfme FROM man_qly_inspect_result WHERE qii.id = ispt_item_id AND ispt_result = 2), 0) AS dis_qty,
+ create_time,
+ update_by,
+ update_time,
+ memo
+ FROM man_qly_ispt_item qii
+ where qii.deleted = 0
+ ) t
+
+ ${ew.customSqlSegment}
+
</select>
</mapper>
--
Gitblit v1.9.1