From 45f64d8b130c57ff2b8e8442d65ab7a490e915e3 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 26 十一月 2024 14:21:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 2 +-
north-glass-erp/northglass-erp/src/lang/ru.js | 2 +-
north-glass-erp/northglass-erp/src/lang/zh.js | 2 +-
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 4 ++--
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 3 ++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 20b68c8..c957b27 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/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',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 219b04b..7502338 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -135,7 +135,7 @@
hollowThickness:'* 小褉械写薪褟褟 褌芯谢褖懈薪邪',
hollowGasType:'* 小锌芯褋芯斜 薪邪锌芯谢薪械薪懈褟',
hollowType:'* 袚械谢褜',
- hollowGlueDepth:'* 袚谢褍斜懈薪邪 泻谢械褟 锌芯 褍屑芯谢褔邪薪懈褞',
+ hollowGlueDepth:'袚谢褍斜懈薪邪 泻谢械褟 锌芯 褍屑芯谢褔邪薪懈褞',
hollow:'袩褍褋褌芯泄',
hollowUpdate:'袩褍褋褌芯械 芯斜薪芯胁谢械薪懈械',
interlayerThickness:'* 孝芯谢褖懈薪邪 褋谢芯褟',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 5f5fab5..0ccf58d 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -135,7 +135,7 @@
hollowThickness:'*涓┖鍘氬害',
hollowGasType:'*鍏呮皵鏂瑰紡:',
hollowType:'*灏佽兌',
- hollowGlueDepth:'*榛樿鑳舵繁:',
+ hollowGlueDepth:'榛樿鑳舵繁:',
hollow:'涓┖闂撮殧鐗�',
hollowUpdate:'涓┖闂撮殧鐗╀慨鏀�',
interlayerThickness:'*澶瑰眰鍘氬害',
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index fc48579..26e6485 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/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>
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 55ca7bf..691a4f1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/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>
\ No newline at end of file
--
Gitblit v1.8.0