提交修改惠城的欧洲ges问题

core/CoreApp/controllers/Systemprint.php

@@ -1544,12 +1544,15 @@ class Systemprint extends Start_Controller {
        	 					}
 							$bctime = date('Ymd',$time);
 							$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
-							$waybill2 = '';
+							$waybill2 = '';$waybillid ='';
 							if(isset($barcode['waybill2']))
 							{
 								$waybill2 = $barcode['waybill2'];
 							}
-							if($this->$fullorder_name->save(array('waybill'=>$barcode['waybill'],'waybill2'=>$waybill2,'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldprinttime'=>$oldprinttime),$va[$n]))
+							if(isset($barcode['waybillid'])){
+								$waybillid = $barcode['waybillid'];
+							}
+							if($this->$fullorder_name->save(array('waybill'=>$barcode['waybill'],'waybill2'=>$waybill2,'waybillid'=>$waybillid,'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldprinttime'=>$oldprinttime),$va[$n]))
 				   			{
 								$type = 2;
 							}