|
|
@@ -1573,12 +1573,15 @@ class Systemprint extends Start_Controller {
|
|
|
}
|
|
|
$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
|
|
|
$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
|
|
|
- $waybill2 = '';
|
|
|
+ $waybill2 = '';$waybillid ='';
|
|
|
if(isset($barcode['waybill2']))
|
|
|
{
|
|
|
$waybill2 = $barcode['waybill2'];
|
|
|
}
|
|
|
- if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybill2'=>$waybill2,'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
|
|
|
+ if(isset($barcode['waybillid'])){
|
|
|
+ $waybillid = $barcode['waybillid'];
|
|
|
+ }
|
|
|
+ if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybill2'=>$waybill2,'waybillid'=>$waybillid,'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
|
|
|
{
|
|
|
if($fullorder['printcode'] == "HUALEI-FEDEX" || $fullorder['printcode'] == "HUALEI-MLXY" )
|
|
|
{
|
