blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-09-26 8c29a327707574f1e04cd25218e05ba9b4c8e4a8 
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml


@@ -54,7 +54,7 @@


        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.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} and o.delivery = 0


            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}


            <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">


                and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}


            </if>


@@ -554,7 +554,7 @@






    <select id="getmaximum" >


        select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()


        select count(*) from (select * from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE() group by operation_order_number) zu


    </select>




    <insert id="insertIntFinishedOperateLog"  useGeneratedKeys="true" >


@@ -689,6 +689,10 @@


               )


    </insert>




    <delete id="updateOrderFinishedOperateLog"  >


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


    </delete>