blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-09-03 b6831163ebaefff36901a100faae6dcf538b1215 
 north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml


@@ -26,8 +26,8 @@


        ogd.glass_address,


        ogd.glass_child,


        r.patch_num,


        od.width,


        od.height,


        ogd.child_width as width,


        ogd.child_height as height,


        od.shape,


        r.patch_type,


        r.patch_reason,


@@ -82,10 +82,10 @@


                and r.quality_inspector regexp #{patchLog.qualityInspector}


            </if>


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


                and od.width regexp #{patchLog.width}


                and ogd.child_width regexp REGEXP_REPLACE(#{patchLog.width},'\\.0+$','')


            </if>


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


                and od.height regexp #{patchLog.height}


                and ogd.child_height regexp REGEXP_REPLACE(#{patchLog.height},'\\.0+$','')


            </if>


            <if test="patchLog.shape != null and patchLog.shape != ''">


                and od.shape regexp #{patchLog.shape}


@@ -175,10 +175,10 @@


                and r.quality_inspector regexp #{patchLog.qualityInspector}


            </if>


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


                and od.width regexp #{patchLog.width}


                and ogd.child_width regexp REGEXP_REPLACE(#{patchLog.width},'\\.0+$','')


            </if>


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


                and od.height regexp #{patchLog.height}


                and ogd.child_height regexp REGEXP_REPLACE(#{patchLog.height},'\\.0+$','')


            </if>


            <if test="patchLog.shape != null and patchLog.shape != ''">


                and od.shape regexp #{patchLog.shape}


@@ -293,8 +293,8 @@


               dd.technology_number as technologyNumber,


               ogd.glass_address as glassAddress,


               dd.breakage_quantity-dd.quantity as patchNum,


               od.width,


               od.height,


                ogd.child_width as width,


                ogd.child_height as height,


               od.shape,


               dd.responsible_process as responsibleProcess,


               rw.this_process as patchProcesses,


@@ -352,10 +352,10 @@


                and rw.quality_inspector regexp #{patchLogAddDTO.qualityInspector}


            </if>


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


                and od.width regexp #{patchLogAddDTO.width}


                and ogd.child_width regexp REGEXP_REPLACE(#{patchLogAddDTO.width},'\\.0+$','')


            </if>


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


                and od.height regexp #{patchLogAddDTO.height}


                and ogd.child_height regexp REGEXP_REPLACE(#{patchLogAddDTO.height},'\\.0+$','')


            </if>


            <if test="patchLogAddDTO.shape != null and patchLogAddDTO.shape != ''">


                and od.shape regexp #{patchLogAddDTO.shape}