blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-12-08 7c30e26f3cc97ebcbb2cf86e2026b10f2e23994d 
 north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml


@@ -51,7 +51,7 @@


                and r.rework_id regexp #{rework.reworkId}


            </if>


            <if test="rework.reworkTeam != null and rework.reworkTeam != ''">


                and r.rework_team regexp #{rework.reworkTeam}


                and r.rework_team like concat('%', #{rework.reworkTeam}, '%')


            </if>


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


                and r.order_id regexp #{rework.orderId}


@@ -99,7 +99,7 @@


                and ogd.glass_address regexp #{rework.glassAddress}


            </if>


            <if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">


                and r.responsible_team regexp #{rework.responsibleTeam}


                and r.responsible_team like concat('%', #{rework.responsibleTeam}, '%')


            </if>


            <if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">


                and r.responsible_equipment regexp #{rework.responsibleEquipment}


@@ -123,7 +123,7 @@


                and r.rework_processes regexp #{rework.reworkProcesses}


            </if>


            <if test="rework.reviewer != null and rework.reviewer != ''">


                and r.reviewer regexp #{rework.reviewer}


                and r.reviewer like concat('%', #{rework.reviewer}, '%')


            </if>


        </where>


         order by r.review_status,r.id desc limit #{offset},#{pageSize};


@@ -145,7 +145,7 @@


                and r.rework_id regexp #{rework.reworkId}


            </if>


            <if test="rework.reworkTeam != null and rework.reworkTeam != ''">


                and r.rework_team regexp #{rework.reworkTeam}


                and r.rework_team like concat('%', #{rework.reworkTeam}, '%')


            </if>


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


                and r.order_id regexp #{rework.orderId}


@@ -193,7 +193,7 @@


                and ogd.glass_address regexp #{rework.glassAddress}


            </if>


            <if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">


                and r.responsible_team regexp #{rework.responsibleTeam}


                and r.responsible_team like concat('%', #{rework.responsibleTeam}, '%')


            </if>


            <if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">


                and r.responsible_equipment regexp #{rework.responsibleEquipment}


@@ -217,7 +217,7 @@


                and r.rework_processes regexp #{rework.reworkProcesses}


            </if>


            <if test="rework.reviewer != null and rework.reviewer != ''">


                and r.reviewer regexp #{rework.reviewer}


                and r.reviewer like concat('%', #{rework.reviewer}, '%')


            </if>


        </where>


        ) as zu;


@@ -257,7 +257,8 @@


                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd


                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number




        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 order by dd.id desc


        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 and  rw.reviewed_state>=0


        order by dd.id desc


    </select>






@@ -295,6 +296,7 @@


    <update id="updateReworkDdMp">


        update pp.damage_details set patch_status=0,quantity=quantity-#{reworkNum}


        where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}


              and breakage_type=#{reworkType} and breakage_reason=#{reworkReason}


    </update>




    <update id="updateReworkBgMp">