美仓不管海关申报编码的问题

core/CoreApp/controllers/Systemprint.php

@@ -818,9 +818,14 @@ class Systemprint extends Start_Controller {
 			}
 			$fullorder = $this->_text($fullorder);//获取所需信息
 			$this->logic_ding->sendToDing("打印快递单，订单的信息".json_encode($fullorder,JSON_UNESCAPED_UNICODE));
-			if(empty($fullorder['sbbm'])){
-			    echo json_encode(array('msg'=>$fullorder['number'].' 海关申报配置异常，请提交给技术处理'.$fullorder['sbbm'],'success'=>false));exit;
+			//美仓不需要海关报关信息，
+			if($fullorder['type'] != 5){
+				//中国发货的 目前是dhl需要海关申报编码
+				if(empty($fullorder['sbbm'])){
+					echo json_encode(array('msg'=>$fullorder['number'].' 海关申报配置异常，请提交给技术处理'.$fullorder['sbbm'],'success'=>false));exit;
+				}
 			}
+			
 			$oldprinttime = ($fullorder['printtime'] > 0)?$fullorder['oldprinttime'].$fullorder['printtime'].'-':'';
 			$fullorder['printtime'] = date('m-d H:i',$time);//打印用时间、发货单用，不能删
 			$pdfnum = 1;//PDF打印几遍
@@ -1836,7 +1841,7 @@ class Systemprint extends Start_Controller {
 	
 		$sbbm = "";
 		if(empty($declara_info)){
-			$sbbm = "67042000";
+			$sbbm = "";
 		}else{
 		    $sbbm = $declara_info['bname'];
 		}