From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 15:00:44 +0800
Subject: [PATCH] 新增调拔单功能 盘点功能优化

---
 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml |   83 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 07fd049..ec21369 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -9,10 +9,18 @@
             (
                 SELECT
                     aoi.id,
-                    aoi.asn_id,
-                    aoi.asn_code,
+                    aoi.order_id,
+                    aoi.order_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,8 +66,72 @@
                     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>
+    <select id="resultById" resultType="com.vincent.rsf.server.manager.entity.WkOrderItem">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    aoi.id,
+                    aoi.order_id,
+                    aoi.order_code,
+                    aoi.plat_item_id,
+                    aoi.plat_work_code,
+                    aoi.po_detl_id,
+                    aoi.po_code,
+                    aoi.fields_index,
+                    aoi.matnr_id,
+                    aoi.matnr_code,
+                    aoi.maktx,
+                    aoi.anfme,
+                    aoi.stock_unit,
+                    aoi.work_qty,
+                    aoi.pur_qty,
+                    aoi.pur_unit,
+                    aoi.prod_time,
+                    aoi.qty,
+                    qii.safe_qty,
+                    qii.dis_qty,
+                    aoi.splr_code,
+                    aoi.splr_batch,
+                    aoi.splr_name,
+                    aoi.qrcode,
+                    aoi.track_code,
+                    aoi.barcode,
+                    aoi.pack_name,
+                    aoi.nty_status,
+                    aoi.`status`,
+                    aoi.`ispt_result`,
+                    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,
+                    aoi.create_time,
+                    aoi.update_by,
+                    aoi.update_time,
+                    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}
+    </select>
 </mapper>

--
Gitblit v1.9.1