凯和修改

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrnoMapper.xml

@@ -582,7 +582,7 @@
         MAX(case when tc.fNo = '20RF' then tc.boxNumber ELSE 0 end) AS 'TWENTYRF',
         MAX(case when tc.fNo = '20OT' then tc.boxNumber ELSE 0 end) AS 'TWENTYOT',
         MAX(case when tc.fNo = '20FR' then tc.boxNumber ELSE 0 end) AS 'TWENTYFR',
-        MAX(case when tc.fNo = '20TK' then tc.boxNumber ELSE 0 end) AS 'TWENTYTK',
+        MAX(case when tc.fNo = '20HC' then tc.boxNumber ELSE 0 end) AS 'TWENTYTK',
         MAX(case when tc.fNo = '40GP' then tc.boxNumber ELSE 0 end) AS 'FORTYGP',
         MAX(case when tc.fNo = '40HC' then tc.boxNumber ELSE 0 end) AS 'FORTYHC',
         MAX(case when tc.fNo = '40HR' then tc.boxNumber ELSE 0 end) AS 'FORTYHR',

ruoyi-shipping/src/main/resources/mapper/shipping/TVoyageMapper.xml

@@ -634,6 +634,8 @@ WHERE tr.f_no IS NOT NULL
 GROUP BY tc.vesselName,tc.voyageName
 )tb
 ON ta.voyid = tb.voyageName AND ta.vslid = tb.vesselName
+ORDER BY ta.fETA DESC
+LIMIT 10
     </select>
 
 </mapper>

ruoyi-shipping/src/main/resources/mapper/shipping/TWarehousebillsCntritemsMapper.xml

@@ -239,6 +239,8 @@ FROM
 	)tc
 	LEFT JOIN t_corps tp ON tc.fCorpid = tp.f_id
 	GROUP BY tc.fCorpid
+	ORDER BY CONVERT(tp.f_name USING gbk) asc
+	LIMIT 10
     </select>
     
 </mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -806,5 +806,6 @@ FROM
 	AND tf.f_dc = 'D'
 	AND YEAR(tf.create_time) = YEAR(NOW())
 	GROUP BY tf.f_corpid
+	LIMIT 10
     </select>
 </mapper>