From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 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..4064a76 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -13,6 +13,14 @@
aoi.asn_code,
aoi.plat_item_id,
aoi.po_detl_id,
+ aoi.plat_order_code,
+ aoi.project_code,
+ aoi.ispt_status,
+ aoi.ispt_result,
+ aoi.batch,
+ aoi.spec,
+ aoi.model,
+ aoi.plat_work_code,
aoi.po_code,
aoi.fields_index,
aoi.matnr_id,
@@ -21,11 +29,12 @@
aoi.anfme,
aoi.stock_unit,
aoi.pur_qty,
+ aoi.work_qty,
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 +66,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>
@@ -71,6 +81,7 @@
aoi.asn_id,
aoi.asn_code,
aoi.plat_item_id,
+ aoi.plat_work_code,
aoi.po_detl_id,
aoi.po_code,
aoi.fields_index,
@@ -79,6 +90,7 @@
aoi.maktx,
aoi.anfme,
aoi.stock_unit,
+ aoi.work_qty,
aoi.pur_qty,
aoi.pur_unit,
aoi.prod_time,
@@ -94,6 +106,7 @@
aoi.pack_name,
aoi.nty_status,
aoi.`status`,
+ aoi.`ispt_result`,
CASE
aoi.ispt_result
WHEN 0 THEN
@@ -116,7 +129,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