Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-01-26 deb789b123fc47b37859da8a6dd16910cf7c96cb

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

@@ -16,27 +16,24 @@
        <result column="g_type" property="glassTypes.type"/>-->

    </resultMap>
    <select id="defaultFinishedGoodsInventory" resultMap="selectFinishedGoodsInventory">
    <select id="getselectFinishedOperateLog" >
        select
            a.id,
            prodID,
            product,
            glassType,
            typeName,
            totalThickness,
            thickness,
            Query,
            remarks,
            state,
            creator,
            date(a.createTime) as 'createTime',
            updateTime
            *
        from
            product as a
                left join basic_glass_type bgt on bgt.typeID = a.glassType

        order by id desc
        limit #{offset},#{pageSize}
        ;
            mm.finished_operate_log limit 0,1;
    </select>

    <insert id="insertFinishedOperateLog"  useGeneratedKeys="true" keyProperty="id" >
        insert into mm.finished_operate_log(operation_order_number,
                                            product_number,
                                            operation_number,
                                            operate_type,
                                            operator,
                                            quantity,
                                            operate_time
        )
        values (
                   #{processId} ,#{orderDetail.productId},#{orderNumber},"入库","王五",#{inventoryQuantity},now()
               )
    </insert>
</mapper>