From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +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 | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 7192284..89008a1 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -24,8 +24,8 @@
aoi.pur_unit,
aoi.prod_time,
aoi.qty,
- qii.safe_qty,
- qii.dis_qty,
+-- qii.safe_qty,
+-- qii.dis_qty,
aoi.splr_code,
aoi.splr_batch,
aoi.splr_name,
@@ -57,7 +57,7 @@
aoi.memo
FROM
man_asn_order_item aoi
- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
+-- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
) t
${ew.customSqlSegment}
</select>
@@ -94,6 +94,7 @@
aoi.pack_name,
aoi.nty_status,
aoi.`status`,
+ aoi.`ispt_result`,
CASE
aoi.ispt_result
WHEN 0 THEN
@@ -116,7 +117,7 @@
aoi.memo
FROM
man_asn_order_item aoi
- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
+-- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
) t
${ew.customSqlSegment}
</select>
--
Gitblit v1.9.1