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

skyouc

2025-07-19 846b74917841f922795425d0f063dc35fbb9e39c

 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,20 +66,22 @@
                    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.AsnOrderItem">
    <select id="resultById" resultType="com.vincent.rsf.server.manager.entity.WkOrderItem">
        SELECT
            *
        FROM
            (
                SELECT
                    aoi.id,
                    aoi.asn_id,
                    aoi.asn_code,
                    aoi.order_id,
                    aoi.order_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>