补充

chenlu

2025-12-19 fbd881bdd757de4bbb44c073f9a3db4c73b2ebd4

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -59,6 +59,8 @@
        <result column="order_id" property="materialOutbound.orderId"/>
        <result column="project" property="materialOutbound.project"/>
        <result column="batch" property="materialOutbound.batch"/>

        <result column="date_of_manufacture" property="materialOutboundDetail.dateOfManufacture"/>
    </resultMap>


@@ -1012,6 +1014,7 @@
    <select id="getMaterialLogReport" resultMap="selectMaterialOutboundLog">
        select *
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        <where>
            date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
            <if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1085,6 +1088,7 @@
        select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
        count(ml.id) as 'total'
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        <where>
            date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
            <if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1155,6 +1159,7 @@
    <select id="exportMaterialLogReport" >
        select *
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
                                left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}

    </select>
@@ -1382,4 +1387,14 @@
        where id=#{materialInventoryId}
    </update>

    <select id="selectGetStockList">
        select mi.*, ms.json
        from mm.material_inventory mi
        left join mm.material_store ms
            on mi.material_code=ms.id
        where inventory_quantity>0
        and mi.inventory_organization = '原片库'
        order by mi.id desc
    </select>

</mapper>