Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-09-08 e9efa502e1da94697177a6e9cae04f0168db7c82

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -167,7 +167,6 @@

           productAbbreviation:'اختصار المنتج',
           productDuplication:'تكرار المنتج',
           default:'默认'
       }
    },
    order:{
@@ -385,6 +384,8 @@
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'


    },


 north-glass-erp/northglass-erp/src/lang/en.js

@@ -167,7 +167,6 @@

            productAbbreviation:'Product abbreviation',
            productDuplication:'Product repetition',
            default:'默认'
        }
    },
    order:{
@@ -386,6 +385,7 @@
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'

    },


 north-glass-erp/northglass-erp/src/lang/kr.js

@@ -167,7 +167,6 @@

            productAbbreviation:'제품명 축약',
            productDuplication:'제품 중복',
            default:'默认'
        }
    },
    order:{
@@ -391,8 +390,11 @@
        xMargin:'X축 여백',
        yMargin:'Y축 여백',
        location:'상표 위치',
        sort:'유리 굽힘 방지'

        sort:'유리 굽힘 방지',
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'
    },

    workOrder:{

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -384,6 +384,7 @@
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'

    },


 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -167,7 +167,6 @@

           productAbbreviation:'产品简称',
           productDuplication:'产品重复',
           default:'默认'
       }
    },
    order:{
@@ -395,6 +394,7 @@
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'

    },


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

@@ -8,13 +8,14 @@
    FROM pp.damage_details as a
    left join pp.reporting_work as b
    on a.reporting_work_id = b.reporting_work_id
    left join patch_log as c
    on a.reporting_work_id = c.reporting_work_id and a.process_id = c.process_id and a.order_number = c.order_sort
    WHERE a.process_id = #{processId}
    <if test="needOrderNumber!=null">
    and a.order_number = #{orderNumber}
    </if>
    and a.technology_number =#{technologyNumber}
    and a.breakage_quantity>0
    and a.patch_status=0
    and b.reviewed_state>=0
    and b.this_process in (WITH RECURSIVE cte AS (
                            SELECT 1 AS n
@@ -24,21 +25,25 @@
                           SELECT REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) AS process
                           FROM cte
                           WHERE REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) IS NOT NULL)
    and c.review_status = 0

</select>
    <select id="getNotReview">
    select a.*
    select a.*,ifnull(c.review_status,0) as reviewed_state
    from damage_details as a
    left join reporting_work as b
    on a.reporting_work_id = b.reporting_work_id
    left join patch_log as c
    on a.reporting_work_id = c.reporting_work_id and a.process_id = c.process_id and a.order_number = c.order_sort
    and a.technology_number = c.technology_number
    where a.process_id=#{processId}
     and b.reviewed_state>=0
  <if test="orderNumber!= null">
  <if test="orderNumber!= null || orderNumber!=''">
      and a.order_number = #{orderNumber}
  </if>
    and a.technology_number = #{technologyNumber}
     and     a.patch_status=0
    and a.breakage_quantity>0
    and c.review_status = 0

    </select>
</mapper>