blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-02-23 3bee17a52f3ee1f493048465f3e07b31c2102ee5 
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml


@@ -53,6 +53,7 @@


              from mm.finished_operate_log aa where aa.operate_type = '领出' or aa.operate_type = '返工') fol


                 left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number


        <where>


                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>


@@ -75,10 +76,10 @@


                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}


            </if>


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


                and  od.width regexp #{finishedOperateLog.orderDetail.width}


                and  od.width regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')


            </if>


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


                and  od.height regexp #{finishedOperateLog.orderDetail.height}


                and  od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')


            </if>


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


                and fol.operate_time regexp #{finishedOperateLog.operateTime}


@@ -109,6 +110,7 @@


            from mm.finished_operate_log aa where aa.operate_type = '领出' or aa.operate_type = '返工') fol


            left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number


        <where>


                 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>


@@ -131,10 +133,10 @@


                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}


            </if>


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


                and  od.width regexp #{finishedOperateLog.orderDetail.width}


                and  od.width regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')


            </if>


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


                and  od.height regexp #{finishedOperateLog.orderDetail.height}


                and  od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')


            </if>


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


                and fol.operate_time regexp #{finishedOperateLog.operateTime}


@@ -176,6 +178,7 @@


              from mm.finished_operate_log aa where aa.operate_type = '调拨') fol


                 left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number


        <where>


                 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>


@@ -204,10 +207,10 @@


                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}


            </if>


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


                and  od.width regexp #{finishedOperateLog.orderDetail.width}


                and  od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')


            </if>


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


                and  od.height regexp #{finishedOperateLog.orderDetail.height}


                and  od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')


            </if>


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


                and fol.operate_time regexp #{finishedOperateLog.operateTime}


@@ -221,6 +224,45 @@


        from (select *


              from mm.finished_operate_log aa where aa.operate_type = '调拨') fol


                 left join sd.order_detail od on fol.order_id = od.order_id and fol.end_operation_order_number = od.order_number


        <where>


            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>


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


                and fol.order_id regexp #{finishedOperateLog.orderId}


            </if>


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


                and fol.operation_number regexp #{finishedOperateLog.operationNumber}


            </if>


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


                and fol.stater_operation_order_number regexp #{finishedOperateLog.staterOperationOrderNumber}


            </if>


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


                and fol.end_operation_order_number regexp #{finishedOperateLog.endOperationOrderNumber}


            </if>


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


                and fol.quantity regexp #{finishedOperateLog.quantity}


            </if>


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


                and fol.operator regexp #{finishedOperateLog.operator}


            </if>


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


                and  od.product_id regexp #{finishedOperateLog.orderDetail.productId}


            </if>


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


                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}


            </if>


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


                and  od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')


            </if>


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


                and  od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')


            </if>


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


                and fol.operate_time regexp #{finishedOperateLog.operateTime}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>




@@ -261,7 +303,7 @@


                                            operate_time


        )


        values (


                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.order_id},#{orderDetail.deliveryDetail.orderNumber}


                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}


                   ,"出库",#{userName},#{orderDetail.warehouseNum},now()


               )


    </insert>