From c7da09314b249df0e516af98c3faa2f52ef79d50 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 16 七月 2025 17:57:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 24747ca..34d5198 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -1047,23 +1047,23 @@
                                    CASE
 
                                        WHEN width &lt; 4000 AND width >= 3660 and width>height THEN
-                                           '3660&lt;W&lt;4000'
+                                           '3660&lt;H&lt;4000'
                                        WHEN width &lt; 5000 AND width >= 4000 and width>height THEN
-                                           '4000&lt;W&lt;5000'
+                                           '4000&lt;H&lt;5000'
                                        WHEN width &lt; 6000 AND width >= 5000 and width>height THEN
-                                           '5000&lt;W&lt;6000'
+                                           '5000&lt;H&lt;6000'
                                        WHEN width &lt; 7000 AND width >= 6000 and width>height THEN
-                                           '6000&lt;W&lt;7000'
+                                           '6000&lt;H&lt;7000'
                                        WHEN width &lt; 8000 AND width >= 7000 and width>height THEN
-                                           '7000&lt;W&lt;8000'
+                                           '7000&lt;H&lt;8000'
                                        WHEN width &lt; 9000 AND width >= 8000 and width>height THEN
-                                           '8000&lt;W&lt;9000'
+                                           '8000&lt;H&lt;9000'
                                        WHEN width &lt; 10000 AND width >= 9000 and width>height THEN
-                                           '9000&lt;W&lt;10000'
+                                           '9000&lt;H&lt;10000'
                                        WHEN width &lt; 11000 AND width >= 10000 and width>height THEN
-                                           '10000&lt;W&lt;11000'
+                                           '10000&lt;H&lt;11000'
                                        WHEN width &lt; 12000 AND width >= 11000 and width>height THEN
-                                           '11000&lt;W&lt;12000'
+                                           '11000&lt;H&lt;12000'
                                        ELSE
                                            ''
                                        END width
@@ -1116,23 +1116,23 @@
                                    CASE
 
                                        WHEN width &lt; 4000 AND width >= 3660 and width>height THEN
-                                           '3660&lt;W&lt;4000'
+                                           '3660&lt;H&lt;4000'
                                        WHEN width &lt; 5000 AND width >= 4000 and width>height THEN
-                                           '4000&lt;W&lt;5000'
+                                           '4000&lt;H&lt;5000'
                                        WHEN width &lt; 6000 AND width >= 5000 and width>height THEN
-                                           '5000&lt;W&lt;6000'
+                                           '5000&lt;H&lt;6000'
                                        WHEN width &lt; 7000 AND width >= 6000 and width>height THEN
-                                           '6000&lt;W&lt;7000'
+                                           '6000&lt;H&lt;7000'
                                        WHEN width &lt; 8000 AND width >= 7000 and width>height THEN
-                                           '7000&lt;W&lt;8000'
+                                           '7000&lt;H&lt;8000'
                                        WHEN width &lt; 9000 AND width >= 8000 and width>height THEN
-                                           '8000&lt;W&lt;9000'
+                                           '8000&lt;H&lt;9000'
                                        WHEN width &lt; 10000 AND width >= 9000 and width>height THEN
-                                           '9000&lt;W&lt;10000'
+                                           '9000&lt;H&lt;10000'
                                        WHEN width &lt; 11000 AND width >= 10000 and width>height THEN
-                                           '10000&lt;W&lt;11000'
+                                           '10000&lt;H&lt;11000'
                                        WHEN width &lt; 12000 AND width >= 11000 and width>height THEN
-                                           '11000&lt;W&lt;12000'
+                                           '11000&lt;H&lt;12000'
                                        ELSE
                                            ''
                                        END width

--
Gitblit v1.8.0