Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-06-10 d7bb8c43b17253b46c6a466cff5545e8b4bcaad3

 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml

@@ -13,6 +13,7 @@
                    aoi.asn_code,
                    aoi.plat_item_id,
                    aoi.po_detl_id,
                    aoi.plat_work_code,
                    aoi.po_code,
                    aoi.fields_index,
                    aoi.matnr_id,
@@ -21,11 +22,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 +59,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 +74,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 +83,7 @@
                    aoi.maktx,
                    aoi.anfme,
                    aoi.stock_unit,
                    aoi.work_qty,
                    aoi.pur_qty,
                    aoi.pur_unit,
                    aoi.prod_time,
@@ -94,6 +99,7 @@
                    aoi.pack_name,
                    aoi.nty_status,
                    aoi.`status`,
                    aoi.`ispt_result`,
                    CASE
                        aoi.ispt_result
                        WHEN 0 THEN
@@ -116,7 +122,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>