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,17 @@
            (
                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,
@@ -64,15 +71,15 @@
            ) 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,