longyi преди 5 месеца
родител
ревизия
89b2bf4520
променени са 3 файла, в които са добавени 28 реда и са изтрити 7 реда
  1. 7 4
      core/CoreApp/controllers/Ac.php
  2. 5 2
      core/CoreApp/controllers/Apipf.php
  3. 16 1
      core/CoreApp/controllers/Systemprint.php

+ 7 - 4
core/CoreApp/controllers/Ac.php

@@ -167,14 +167,16 @@ class Ac extends Start_Controller {
 		$fullorder['printcode'] = $express['printcode'];
 		$fullorder['time'] = date('Y-m-d',time());
 		$fullorder['times'] = date('Y-m-d H:i',time());
-		$declara_info = $this->customsdeclaration->find("ename like %".$fullorder['sbpm']."%","*");
+		$declara_info = $this->customsdeclaration->find("ename like '%".$fullorder['sbpm']."%' ","*");
+	
 		$sbbm = "";
 		if(empty($declara_info)){
-			$sbbm = $declara_info['bname'];
-		}else{
 			$sbbm = "67041100";
+		}else{
+		    $sbbm = $declara_info['bname'];
 		}
-		$fullorder['sbbm']= ($fullorder['sbpm'] == 'Hair Sample') ? 67042000 : 67041100;
+	
+		$fullorder['sbbm']= $sbbm;
 		$fullorder['address'] = str_replace(array('&'),array('&'),$fullorder['address']);
 		$fullorder['address2'] = str_replace(array('&'),array('&'),$fullorder['address2']);
 		$fullorder['shipremarks'] = str_replace(array('&lt;','&gt;'),array('<','>'),$fullorder['shipremarks']);
@@ -206,6 +208,7 @@ class Ac extends Start_Controller {
 		}
 		$fullorder['pt'] = $pt;
 		$fullorder['printnumber'] += 2;
+		echo "<pre>";
 		var_dump($fullorder);
 		die;
 		//$fullorder['printcode'] = 'HUALEIXW-FEDEX';

+ 5 - 2
core/CoreApp/controllers/Apipf.php

@@ -125,8 +125,11 @@ class Apipf extends Start_Controller{
            $data[] = $item; 
            $customer_ids[] = $item['customer_id'];
        }
-       $res = $this->sendHttp($url,$header,['data'=>[$item]]);
-    
+       var_dump($customer_ids);
+       var_dump($data);
+      
+       $res = $this->sendHttp($url,$header,['data'=>$data]);
+        var_dump($res);
         if($res['status']){
             foreach($customer_ids as $k=>$v){
                 $this->customer->save([

+ 16 - 1
core/CoreApp/controllers/Systemprint.php

@@ -47,6 +47,7 @@ class Systemprint extends Start_Controller {
 		$this->load->_model("Model_yuntu","yuntu");
 		$this->load->_model("Model_api","api");
 		$this->load->_model("Model_fedexv1",'fedexv1');
+		$this->load->_model("Model_customsdeclaration","customsdeclaration");
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -815,6 +816,9 @@ class Systemprint extends Start_Controller {
 				 echo json_encode(array('msg'=>$fullorder['number'].' 状态异常,请提交给技术处理','success'=>false));exit;
 			}
 			$fullorder = $this->_text($fullorder);//获取所需信息
+			if(empty($fullorder['sbbm'])){
+			    echo json_encode(array('msg'=>$fullorder['number'].' 海关申报配置异常,请提交给技术处理','success'=>false));exit;
+			}
 			$oldprinttime = ($fullorder['printtime'] > 0)?$fullorder['oldprinttime'].$fullorder['printtime'].'-':'';
 			$fullorder['printtime'] = date('m-d H:i',$time);//打印用时间、发货单用,不能删
 			$pdfnum = 1;//PDF打印几遍
@@ -1824,7 +1828,18 @@ class Systemprint extends Start_Controller {
 		$fullorder['printcode'] = $express['printcode'];
 		$fullorder['time'] = date('Y-m-d',time());
 		$fullorder['times'] = date('Y-m-d H:i',time());
-		$fullorder['sbbm']= ($fullorder['sbpm'] == 'Hair Sample') ? 67042000 : 67041100;
+// 		$fullorder['sbbm']= ($fullorder['sbpm'] == 'Hair Sample') ? 67042000 : 67041100;
+//      修复报关编码问题
+	    $declara_info = $this->customsdeclaration->find("ename like '%".$fullorder['sbpm']."%' ","*");
+	
+		$sbbm = "";
+		if(empty($declara_info)){
+			$sbbm = "";
+		}else{
+		    $sbbm = $declara_info['bname'];
+		}
+	
+		$fullorder['sbbm']= $sbbm;
 		$fullorder['address'] = str_replace(array('&'),array('&#38;'),$fullorder['address']);
 		$fullorder['address2'] = str_replace(array('&'),array('&#38;'),$fullorder['address2']);
 		$fullorder['shipremarks'] = str_replace(array('&lt;','&gt;'),array('<','>'),$fullorder['shipremarks']);