ShuanghongS пре 3 недеља
родитељ
комит
f012b0bb02

+ 5 - 1
main_new_version.php

@@ -22,6 +22,7 @@ include 'service/robot.class.php';
 include 'service/AIClientFactory.php';
 include 'service/destination_delivery.class.php';
 include 'service/report.class.php';
+include 'service/multilingual.class.php';
 
 //为了调用,临时做一个登录动作  如果是正式版 要注释掉菜单System Settings
  //$_POST['uname'] = "ra.admin";
@@ -876,7 +877,10 @@ switch ($action) {
         $name = common::check_input($_POST['uname']);
         $_POST['psw'] = common::excuteOneSql("select ra_password from public.ra_online_user where user_login = '".$name."'");
         login::getInstance()->do_login_auto();
-        break;                              
+        break;
+    case 'multilingual':
+        multilingual::getInstance()->multilingual_config();
+        break;                                  
     default:
         $data = array(
             'msg' => 'Page not found',

+ 5 - 2
service/destination_delivery.class.php

@@ -1134,6 +1134,7 @@ class destination_delivery {
             $db->StartTrans();
             try {
                 $sql = "";
+                $do_serial_nos = "";
                 //审核通过时,才取下放当时应用修改的地址
                 if ($status == "Approve") {
                     $delivery_booking = common::excuteObjectSql("select *,array_to_json(address_country) as address_country,
@@ -1150,14 +1151,16 @@ class destination_delivery {
                     $sql .=common::returnDAddressRecord($delivery_booking["address_country"],$onine_address,$delivery_address_detail);
 
                     //Booking自動同步到Ksmart WO 的逻辑   保存在do_header和do_details表里
-                    $sql .=common::saveWorkOrder($delivery_booking);
+                    $sqlData =common::saveWorkOrder($delivery_booking);
+                    $sql .= $sqlData['sql'];
+                    $do_serial_nos = utils::implode(';',$sqlData['do_serial_no_arr']);
                 }
                 if ($status == "Reject" || $status == "Cancel") {
                     //这种情况,清除当前用户对这一票的修改和添加的信息
                     $sql .= "delete from public.contacts_address_online where delivery_serial_no = '$serial_no';";
                 }
 
-                $sql .= "update public.kln_destination_delivery set status = '$status', modify_by = '"._getLoginName()."',update_time = now() where serial_no = '$serial_no';";
+                $sql .= "update public.kln_destination_delivery set do_serial_no = '$do_serial_nos', status = '$status', modify_by = '"._getLoginName()."',update_time = now() where serial_no = '$serial_no';";
                 $sql .= "INSERT INTO public.kln_destination_delivery_operation_log(
                                 serial_no, action,notes, create_by, created_time, created_zone)
                         VALUES ('$serial_no', '$status','$notes', '$action_user', now(), ''); ";

+ 76 - 0
service/multilingual.class.php

@@ -0,0 +1,76 @@
+<?php
+
+if (!defined('IN_ONLINE')) {
+    exit('Access Denied');
+}
+
+/**
+ * Description of multilingual
+ *
+ * @author Administrator
+ */
+class multilingual{
+
+    private static $_multilingual;
+
+    function __construct() {  
+       
+    }
+
+    public static function getInstance() {
+        global $memory_limit;
+        $memory_limit = ini_get("memory_limit");
+        ini_set("memory_limit", '2048M');
+        if (!self::$_multilingual) {
+            $c = __CLASS__;
+            self::$_multilingual = new $c;
+        }
+        return self::$_multilingual;
+    }
+    public function multilingual_config() {
+        $operate = utils::_get('operate');
+        $operate = strtolower($operate);
+
+        /*
+         * multilingual_load
+         */
+        if ($operate == "multilingual_search") {
+            $this->_multilingual_search();
+        }
+
+        /*
+         * multilingual_save
+         */
+        if ($operate == "multilingual_save") {
+            $multilingual = $_POST['multilingual_param'];
+
+            $unverifiedNumber = $multilingual['unverifiedNumber'];
+            $page = $multilingual['page'];
+            $data = $multilingual['data'];
+
+
+
+        }
+    }
+
+    private function _multilingual_search() {
+        $page = common::check_input($_POST ['page']); 
+        $sql = "SELECT *  from public.i18n_content where page = '$page'";
+        $content = common::excuteObjectSql($sql);
+
+        if(empty($content)){
+            common::echo_json_encode(500,"Page not exist");
+            exit();
+        }
+        
+        $multilingual = array();
+        $multilingual["unverifiedNumber"] = $content['unverifinumber'];
+        $multilingual["page"] = $page;
+        $multilingual["data"] = json_decode($content['content_data'],true);
+       
+        common::echo_json_encode(200,$multilingual);
+        exit();
+    }  
+}
+
+?>

+ 4 - 1
utils/common.class.php

@@ -4345,6 +4345,7 @@ class common {
         $ctnr_db  = $delivery_booking['ctnr'];
         //从UI 设计的case来讲,一个hbol就生成成一个wo ID 
         $sql = "";
+        $do_serial_no_arr = array();
         foreach($h_serial_no_arr as $serial_no){
             $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)
@@ -4446,8 +4447,10 @@ class common {
                     '".$ctnr['ctnr']."','".$ctnr['size']."','".$ctnr['seal_no']."','".$ctnr['is_lcl']."',
                     $l4_length,$l4_width,$l4_height,'$serial_no_sync_key');";
             }
+            $do_serial_no_arr[] = $do_serial_no;
         }
-        return $sql;
+        //do_serial_no_arr 只允许HBOL的层级创建,这里理论上只有一个
+        return array("sql"=>$sql,"do_serial_no_arr"=>$do_serial_no_arr);
     }
 
     public static function combineContactInfoString($contact){