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

廖井涛

2024-08-29 07d08f8dc420ba47f66587fdc5038a59fc340c96

 north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml

@@ -9,7 +9,7 @@


    <!--获取补片数据-->
    <select id="SelectReplenish" >
    <select id="SelectReplenish"  >
        select
        r.id,
        r.review_status,
@@ -22,7 +22,7 @@
        o.batch,
        od.building_number,
        od.product_name,
        ogd.technology_number,
        r.technology_number,
        ogd.glass_address,
        r.patch_num,
        od.width,
@@ -38,13 +38,15 @@
        r.patch_processes,
        r.reviewer,
        date(r.create_time) as create_time,
        date(r.update_time) as update_time
        date(r.update_time) as update_time,
        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber
        from pp.patch_log r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
        left join sd.`order` o on r.order_id = o.order_id
        left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
        on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
        </where>
         order by r.review_status,r.id desc
        limit #{offset},#{pageSize};
@@ -88,6 +90,7 @@
        update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
    </update>


    <update id="updateOrderProcessDetail"  >
        update sd.order_process_detail
        set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
@@ -107,6 +110,11 @@

    <update id="updateDamageDetails"  >
        update pp.damage_details set quantity=quantity+#{patchLog.patchNum},patch_status=1 where id=#{patchLog.reviewer}
    </update>

    <update id="updateReportingWorkDetail"  >
        update pp.reporting_work_detail set patch_status=1 where reporting_work_id=#{reportingWorkId}
                                          and order_number=#{orderSort} and technology_number=#{technologyNumber}
    </update>


@@ -148,9 +156,24 @@
                 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=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1))
        where  dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and rw.reviewed_state!=-1
          and o.create_order>0
        order by dd.id desc
    </select>

    <delete id="deleteReplenishMp">
        delete from pp.patch_log where patch_id=#{patchId}
    </delete>

    <update id="updatePatchDdMp">
        update pp.damage_details set patch_status=0,quantity=quantity-#{qualityInspector}
     where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
    </update>

    <update id="updatePatchBgMp">
        update pp.reporting_work_detail set patch_status=0
        where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
    </update>


</mapper>