ShuanghongS 3 weken geleden
bovenliggende
commit
c0cc177c02
2 gewijzigde bestanden met toevoegingen van 7 en 5 verwijderingen
  1. 5 2
      service/destination_delivery.class.php
  2. 2 3
      utils/common.class.php

+ 5 - 2
service/destination_delivery.class.php

@@ -1146,12 +1146,15 @@ class destination_delivery {
                     $delivery_address_detail = json_decode($delivery_booking["delivery_address_detail"],true);
                     $onine_address = common::excuteListSql("select * from public.contacts_address_online 
                         where (delivery_serial_no = '$serial_no' or sync_key = '".$delivery_address_detail['sync_key']."')");
-
+                    error_log("review: 1.2");
                     //$sql .= "delete from public.contacts_address_online where delivery_serial_no = '$serial_no';";
                     $sql .=common::returnDAddressRecord($delivery_booking["address_country"],$onine_address,$delivery_address_detail);
+                    error_log("review: 1.3");
 
                     //Booking自動同步到Ksmart WO 的逻辑   保存在do_header和do_details表里
-                    common::saveWorkOrder($delivery_booking);
+                    error_log("review: 1.4");
+                    $sql .=common::saveWorkOrder($delivery_booking);
+                    error_log("review: 1.5");
                 }
                 if ($status == "Reject" || $status == "Cancel") {
                     //这种情况,清除当前用户对这一票的修改和添加的信息

+ 2 - 3
utils/common.class.php

@@ -4339,14 +4339,13 @@ class common {
      * Booking自動同步到Ksmart WO 的逻辑   保存在do_header和do_details表里
      */
     public static function saveWorkOrder($delivery_booking){
-        global $db;
         $h_serial_no_json  = $delivery_booking['h_serial_no_json'];
         $h_serial_no_arr  =json_decode($h_serial_no_json,true);
 
         $ctnr_db  = $delivery_booking['ctnr'];
         //从UI 设计的case来讲,一个hbol就生成成一个wo ID 
+        $sql = "";
         foreach($h_serial_no_arr as $serial_no){
-            $sql = "";
             $oceanInfo = common::excuteObjectSql("select *,
                 case when order_from = 'public' and transport_mode ='sea' then (select manifest_type from public.ocean o where o.serial_no = oo.serial_no  limit 1)
                      when order_from = 'sfs' and transport_mode ='sea' then (select manifest_type from sfs.ocean o where o.serial_no = oo.serial_no  limit 1)
@@ -4447,8 +4446,8 @@ class common {
                     '".$ctnr['ctnr']."','".$ctnr['size']."','".$ctnr['seal_no']."','".$ctnr['is_lcl']."',
                     $l4_length,$l4_width,$l4_height,'$serial_no_sync_key');";
             }
-            $db->Execute($sql) or ( (!$db->ErrorMsg()) or error_log(common::dbLog($db, $sql), 0)); 
         }
+        return $sql;
     }
 
     public static function combineContactInfoString($contact){