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

guoyujie

2025-11-21 714ed2fda4d83bdc2da48ccfe7e42f220acbee99

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

@@ -64,10 +64,23 @@
        fol.money,
        o.customer_name,
        o.project,
        od.price
        od.price,
        CASE
        WHEN #{type} = '入库' THEN
            if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
        ELSE
            0
        END AS quantity_available,
        CASE
        WHEN #{type} = '入库' THEN
        if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
        ELSE
        0
        END AS cancelAvailable
        from (select *
        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number
        left join sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -145,6 +158,7 @@
        from (select *
        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number
        left join sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -221,6 +235,11 @@

    <update id="updateFinishedOperateLogState">
        update mm.finished_operate_log set status=#{type} where id=#{finishedOperateLog.id};
    </update>

    <update id="updateFinishedOperateLogQuantity">
        update mm.finished_operate_log set quantity=quantity-#{finishedOperateLog.cancelAvailable},
                                           area=area-#{deliveryDetailArea},money=money-#{deliveryDetailMoney}  where id=#{finishedOperateLog.id};
    </update>

    <select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
@@ -803,17 +822,18 @@
                                            status,
                                            area,
                                            compute_area,
                                            remarks
                                            remarks,
                                            money
        )
        values (
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核",
                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},""
                   #{oddNumber} ,#{orderDetail.orderId},#{processId},#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核",
                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},"",#{orderDetail.grossAmount}
               )
    </insert>

    <delete id="updateOrderFinishedOperateLog"  >
    <update id="updateOrderFinishedOperateLog"  >
        update  mm.finished_operate_log set status="已作废" where order_id=#{orderDetail.orderId} and operation_number=#{orderDetail.orderNumber} and operate_type="入库";
    </delete>
    </update>

    <select id="getSelectStorageRecordPint" resultMap="selectFinishedGoodsInventory">
        select fol.id,
@@ -1076,4 +1096,8 @@
        left join sd.`order` o on o.order_id=fol.order_id
        where fol.operation_order_number=#{deliveryId}
    </select>




</mapper>