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

chenlu

2025-08-19 845c72fc9778eaccaa079091142e0a49b1d090be

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

@@ -633,11 +633,12 @@
                                            operator,
                                            quantity,
                                            operate_time,
                                            status
                                            status,
                                            remarks
        )
        values (
                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核"
                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核",#{boxNo}
               )
    </insert>

@@ -950,7 +951,7 @@
            o.order_id=#{orderId} and fol.remarks=#{remarks} and od.product_id=#{productId}
        group by od.order_id,od.order_number
        ORDER BY
            fol.operate_time DESC
            od.order_number

    </select>