tijiaoshuju1

core/CoreApp/controllers/Systemprint.php

@@ -1748,7 +1748,7 @@ class Systemprint extends Start_Controller {
 							}
 							$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
 							$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
-							if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybill2'=>$barcode['waybill2'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
+							if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybill2'=>$barcode['waybill2'],'waybillid'=>$barcode['waybillid'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
 				   		 	{
 								$type = 1;
 								$pdfnum = 1;

core/CoreApp/models/Model_itsxb.php

@@ -73,11 +73,11 @@ class Model_itsxb extends Lin_Model {
         //$waybill = empty($res['data']['deliveryNo'])?$res['data']['postalTrackingNo']:$res['data']['deliveryNo'];
 
         if($data['printcode'] == '3PE_EU_DPD'){
-            $g = array('x'=>'1','waybill'=>$res['data']['deliveryNo'],'waybill2'=>$res['data']['waybillNo'],'label'=>$rr['labelUrl']);
+            $g = array('x'=>'1','waybill'=>$res['data']['deliveryNo'],'waybill2'=>'','waybillid'=>$res['data']['waybillNo'],'label'=>$rr['labelUrl']);
         }else{
             $waybill = $res['data']['waybillNo'];
 
-            $g = array('x'=>'1','waybill'=>$waybill,'waybill2'=>'','label'=>$rr['labelUrl']);
+            $g = array('x'=>'1','waybill'=>$waybill,'waybill2'=>'','waybillid'=>'','label'=>$rr['labelUrl']);
         }
        
         $end_time = time();