|
|
@@ -138,7 +138,11 @@ function __construct(){
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- $yd = $this->get_yd($res['returnDatas'][0]['corpBillid'],$printcode[2]);
|
|
|
+ $yd_orderType = 1;
|
|
|
+ if($data['printcode'] == 'ZXDPD_UK'){
|
|
|
+ $yd_orderType = 2;
|
|
|
+ }
|
|
|
+ $yd = $this->get_yd($res['returnDatas'][0]['corpBillid'],$printcode[2],$yd_orderType);
|
|
|
//$fp = $this->get_fp($res['returnDatas'][0]['corpBillid']);
|
|
|
if($yd != 'c')// && $fp != 'c'
|
|
|
{
|
|
|
@@ -164,7 +168,7 @@ function __construct(){
|
|
|
return $g;
|
|
|
}
|
|
|
|
|
|
- public function get_yd($waybill,$PrintPaper)
|
|
|
+ public function get_yd($waybill,$PrintPaper,$orderType=1)
|
|
|
{
|
|
|
$url = $this->url."printOrderLabel";
|
|
|
$Clientid = $this->clientid;
|
|
|
@@ -176,7 +180,7 @@ function __construct(){
|
|
|
'Token'=>$Token
|
|
|
),
|
|
|
'CorpBillidDatas'=> array(0=>array('CorpBillid'=>$waybill)),
|
|
|
- 'OrderType'=> "1",//1：快件订单 2：快递制单 3：仓库订单
|
|
|
+ 'OrderType'=> "".$orderType,//1：快件订单 2：快递制单 3：仓库订单
|
|
|
'PrintPaper'=> $PrintPaper,//打印纸张 快递制单只固定为：label 和 A4
|
|
|
'PrintContent'=> "1"//打印内容 1：地址标签 2：报关单 3：配货信息 可自由组合用“,”号隔开 如：1,2,3
|
|
|
);
|
