code

main_new_version.php

@@ -468,7 +468,7 @@ switch ($action) {
                     left join LATERAL (select case when a.code='IFFBCF' then 'Created'
                                     when a.code='IFFCPU' then 'Cargo Received'
                                     when a.code='IFFREC' then 'Cargo Received'
-                                    when a.code='IFFDEP' then 'Departed'
+                                    when a.code='IFFDEP' then 'Departure'
                                     when a.code='IFFARR' then 'Arrived'
                                     when a.code='IFFAFD' then 'Completed'
                                     else 'Created' END as status,

service/ocean_order.class.php

@@ -538,7 +538,7 @@ class ocean_order {
                     CASE
 	    	            WHEN ((m_iffbcf is not null or m_iffbcf is null) and m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffafd is null) THEN 'Created'::text
                         WHEN ((m_iffcpu is not null or m_iffrec is not null) and m_iffdep is null and m_iffarr is null and m_iffafd is null) THEN 'Cargo Received'::text
-                        WHEN (m_iffdep is not null and m_iffarr is null and m_iffafd is null) THEN 'Departed'::text
+                        WHEN (m_iffdep is not null and m_iffarr is null and m_iffafd is null) THEN 'Departure'::text
                         WHEN (m_iffarr is not null and m_iffafd is null) THEN 'Arrived'::text
                         WHEN (m_iffafd is not null) THEN 'Completed'::text
 	    	            ELSE 'Created'
@@ -685,14 +685,16 @@ class ocean_order {
             $cbm_tolal += $rs['cbm'];
             //特殊处理weight
             if(!empty($rss[$key]['grs_kgs'])){
-                $rss[$key]['grs_kgs'] = $rs['grs_kgs']."KG";
+                $rss[$key]['grs_kgs'] = $rs['grs_kgs']."KGS";
             }
             if(!empty($rss[$key]['grs_lbs'])){
-                $rss[$key]['grs_lbs'] = $rs['grs_lbs']."LB";
+                $rss[$key]['grs_lbs'] = $rs['grs_lbs']."LBS";
             }
         }
         $quantity_tolal = "";
         foreach($quantity_unit as $uk => $uv){
+            // 使用substr()截取第一次出现之前的字符串
+            $uk = substr($uk, 0, strpos($uk, "-"));
             $quantity_tolal.=$uv." ".$uk." ";
         }
         $ch_weight_tolal = empty($ch_weight_tolal) ? $ch_weight_tolal_grs_lbs : $ch_weight_tolal;
@@ -1112,7 +1114,7 @@ class ocean_order {
                     CASE
                         WHEN ((m_iffbcf is not null or m_iffbcf is null) and m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffafd is null) THEN 'Created'::text
                         WHEN ((m_iffcpu is not null or m_iffrec is not null) and m_iffdep is null and m_iffarr is null and m_iffafd is null) THEN 'Cargo Received'::text
-                        WHEN (m_iffdep is not null and m_iffarr is null and m_iffafd is null) THEN 'Departed'::text
+                        WHEN (m_iffdep is not null and m_iffarr is null and m_iffafd is null) THEN 'Departure'::text
                         WHEN (m_iffarr is not null and m_iffafd is null) THEN 'Arrived'::text
                         WHEN (m_iffafd is not null) THEN 'Completed'::text
                         ELSE 'Created'::text