From 159aa2f77147a4dad2bb60ab0e92f7e91cdb8cd0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 04 六月 2025 08:12:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 0d22aa0..aff2017 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -35,19 +35,19 @@
aoi.pack_name,
aoi.nty_status,
aoi.`status`,
--- CASE
--- aoi.ispt_result
--- WHEN 0 THEN
--- '鏈'
--- WHEN 1 THEN
--- '鍚堟牸'
--- WHEN 2 THEN
--- '涓嶅悎鏍�'
--- WHEN 3 THEN
--- '寰呭畾'
--- WHEN 4 THEN
--- '閮ㄥ垎鍚堟牸'
--- END AS isptResult$,
+ CASE
+ aoi.ispt_result
+ WHEN 0 THEN
+ '鏈'
+ WHEN 1 THEN
+ '鍚堟牸'
+ WHEN 2 THEN
+ '涓嶅悎鏍�'
+ WHEN 3 THEN
+ '寰呭畾'
+ WHEN 4 THEN
+ '閮ㄥ垎鍚堟牸'
+ END AS isptResult$,
aoi.deleted,
aoi.tenant_id,
aoi.create_by,
@@ -57,6 +57,7 @@
aoi.memo
FROM
man_asn_order_item aoi
+ where aoi.deleted = 0
-- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
) t
${ew.customSqlSegment}
@@ -94,6 +95,7 @@
aoi.pack_name,
aoi.nty_status,
aoi.`status`,
+ aoi.`ispt_result`,
CASE
aoi.ispt_result
WHEN 0 THEN
@@ -116,7 +118,8 @@
aoi.memo
FROM
man_asn_order_item aoi
- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
+ where aoi.deleted = 0
+-- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
) t
${ew.customSqlSegment}
</select>
--
Gitblit v1.9.1