Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-16 098dadcc34468f9fe37ffca45a55821d8d57fae8

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

@@ -100,7 +100,7 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        order by fol.`status` desc
        order by fol.operate_time desc
        limit #{offset},#{pageSize};
    </select>

@@ -159,7 +159,6 @@
            </if>
        </where>
        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>

    <update id="updateToExamine">
@@ -297,8 +296,6 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>

    <select id="getselectAllocateFinishedOperateLog" resultMap="selectFinishedGoodsInventory" >
@@ -404,7 +401,6 @@
                and fol.operate_time regexp #{finishedOperateLog.operateTime}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -545,8 +541,6 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>

    <select id="getselectFinishedOperateLog" >
@@ -677,5 +671,23 @@

    </select>

    <insert id="insertOrderFinishedOperateLog"  useGeneratedKeys="true" >
        insert into mm.finished_operate_log(operation_order_number,
                                            order_id,
                                            process_id,
                                            operation_number,
                                            operate_type,
                                            operator,
                                            quantity,
                                            operate_time,
                                            status
        )
        values (
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核"
               )
    </insert>




</mapper>