Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2025-05-23 eab76cd34bff799686f68e6b70f86c9001e4913f

 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>