blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-09-10 ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f 
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml


@@ -52,6 +52,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 sd.`order` o on o.order_id=fol.order_id


        <where>


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


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


@@ -159,7 +160,6 @@


            </if>


        </where>


        order by fol.`status` desc


        limit #{offset},#{pageSize};


    </select>




    <update id="updateToExamine">


@@ -297,8 +297,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 +402,6 @@


                and fol.operate_time regexp #{finishedOperateLog.operateTime}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>






@@ -545,8 +542,6 @@


                and fol.remarks regexp #{finishedOperateLog.remarksr}


            </if>


        </where>


        order by fol.`status` desc


        limit #{offset},#{pageSize};


    </select>




    <select id="getselectFinishedOperateLog" >


@@ -559,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" >


@@ -571,10 +566,11 @@


                                            operator,


                                            quantity,


                                            operate_time,


                                            status


                                            status,


                                            remarks


        )


        values (


                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},#{flowCard.inventoryQuantity},now(),"未审核"


                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},#{flowCard.inventoryQuantity},now(),"未审核",#{container}


               )


    </insert>