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

huang

2024-11-26 45f64d8b130c57ff2b8e8442d65ab7a490e915e3

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

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

@@ -135,7 +135,7 @@
            hollowThickness:'* Hollow thickness',
            hollowGasType:'* Inflation mode',
            hollowType:'* Sealing compound',
            hollowGlueDepth:'* Default glue depth',
            hollowGlueDepth:'Default glue depth',
            hollow:'Hollow spacer',
            hollowUpdate:'Hollow spacers modified',
            interlayerThickness:'*Lamination thickness',

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

@@ -135,7 +135,7 @@
            hollowThickness:'* Средняя толщина',
            hollowGasType:'* Способ наполнения',
            hollowType:'* Гель',
            hollowGlueDepth:'* Глубина клея по умолчанию',
            hollowGlueDepth:'Глубина клея по умолчанию',
            hollow:'Пустой',
            hollowUpdate:'Пустое обновление',
            interlayerThickness:'* Толщина слоя',

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

@@ -135,7 +135,7 @@
           hollowThickness:'*中空厚度',
           hollowGasType:'*充气方式:',
           hollowType:'*封胶',
           hollowGlueDepth:'*默认胶深:',
           hollowGlueDepth:'默认胶深:',
           hollow:'中空间隔物',
           hollowUpdate:'中空间隔物修改',
           interlayerThickness:'*夹层厚度',

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -781,7 +781,7 @@
            </if>

        </where>
        order by fgi.id desc
        order by fgi.update_time desc

        limit #{offset},#{pageSize};
    </select>
@@ -856,7 +856,7 @@

        </where>

        order by fgi.id desc
        order by fgi.update_time desc
        limit #{offset},#{pageSize}
        ;
    </select>

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

@@ -2462,6 +2462,7 @@
             (select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
             on a.process_id=opd.process_id
        where opd.project_no = #{projectNo}
        order by opd.stock_id,opd.polys_id
        group by  order_id,od.order_number
        order by ogd.child_width desc,ogd.child_height desc
    </select>
</mapper>