提交修改下 cne的铺货

core/CoreApp/controllers/Systemprint.php

@@ -1406,29 +1406,60 @@ class Systemprint extends Start_Controller {
 				    $barcode = $this->cne->get_data($fullorder);
 					if($barcode['x'] == 1)
 					{
-						$bctime = date('Ymd',$time);
-						$Hwaybill = $barcode['waybill'];
-						$Hyd = $this->_pdfurl($barcode['yd'],'y-'.$Hwaybill,$bctime);
-						//$Hfp = $this->_pdfurl($barcode['fp'],'f-'.$Hwaybill,$bctime);//保留PDF，不需要打印
-						if(isset($barcode['yd']) && isset($Hwaybill))
-						{
-						    if($fullorder['waybill'] != "")
+						if($fullorder['printcode'] == 'FedEx_GD'){
+
+							$bctime = date('Ymd',$time);
+							$Hwaybill = $barcode['waybill'];
+						
+							//$Hfp = $this->_pdfurl($barcode['fp'],'f-'.$Hwaybill,$bctime);//保留PDF，不需要打印
+							if(isset($barcode['yd']) && isset($Hwaybill))
 							{
-								$oldwaybill = $fullorder['oldwaybill'].'-'.date('Ymd',$time).'/'.$fullorder['waybill'];
+								if($fullorder['waybill'] != "")
+								{
+									$oldwaybill = $fullorder['oldwaybill'].'-'.date('Ymd',$time).'/'.$fullorder['waybill'];
+								}
+								else
+								{
+									$oldwaybill = $fullorder['oldwaybill'];
+								}
+								$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
+								$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
+								if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybillid'=>$barcode['waybillid'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
+								{
+									$type = 2;
+									$pdfnum = ($fullorder['printcode'] == "DPEX")?2:1;
+									$text = array('yd'=>'wu','mode'=>100);
+								}
 							}
-							else
+
+						}else{
+
+							$bctime = date('Ymd',$time);
+							$Hwaybill = $barcode['waybill'];
+							$Hyd = $this->_pdfurl($barcode['yd'],'y-'.$Hwaybill,$bctime);
+							//$Hfp = $this->_pdfurl($barcode['fp'],'f-'.$Hwaybill,$bctime);//保留PDF，不需要打印
+							if(isset($barcode['yd']) && isset($Hwaybill))
 							{
-								$oldwaybill = $fullorder['oldwaybill'];
-							}
-							$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
-							$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
-							if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybillid'=>$barcode['waybillid'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
-				   		 	{
-								$type = 1;
-								$pdfnum = ($fullorder['printcode'] == "DPEX")?2:1;
-								$text = array('yd'=>base_url().'data/pdf/'.$bctime.'/y-'.$Hwaybill.'.pdf','mode'=>100);
+								if($fullorder['waybill'] != "")
+								{
+									$oldwaybill = $fullorder['oldwaybill'].'-'.date('Ymd',$time).'/'.$fullorder['waybill'];
+								}
+								else
+								{
+									$oldwaybill = $fullorder['oldwaybill'];
+								}
+								$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
+								$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
+								if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybillid'=>$barcode['waybillid'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
+								{
+									$type = 1;
+									$pdfnum = ($fullorder['printcode'] == "DPEX")?2:1;
+									$text = array('yd'=>base_url().'data/pdf/'.$bctime.'/y-'.$Hwaybill.'.pdf','mode'=>100);
+								}
 							}
+
 						}
+						
 					}
 					else
 					{
@@ -2859,7 +2890,7 @@ class Systemprint extends Start_Controller {
 				die;
 			}
 		}
-		if(!in_array($info['express'],[71])){
+		if(!in_array($info['express'],[71,75])){
 
 			// if(!empty($info['waybill'])&&!empty($info['waybill'])){
 			// 	$yd = base_url()."data/pdf/".date('Ymd',$info['printtime']).'/y-'.$info['waybill'].'.pdf' ;

core/CoreApp/models/Model_cne.php

@@ -134,27 +134,37 @@ function __construct(){
 			$g = array('x'=>'0','Description'=>json_encode($res,JSON_UNESCAPED_UNICODE));
 		}
 		else
-		{
-			$yd = $this->get_yd($res['returnDatas'][0]['corpBillid'],$printcode[2],$ordertype);
-			if($yd != 'c')// && $fp != 'c'
-			{
+		{   
+			if($printcode[1] == 'FED_PB_CA'){
 				$waybill = $res['returnDatas'][0]['trackNumber']."";
 				if(strlen($waybill) == 30){
 					$waybill = substr($waybill, 8);
 				}
-				//FedEx-US2和USPS-US2 不需要获取转单号
-				if($data['printcode'] == 'FedEx_2day' || $data['printcode'] == 'usps_priority'){
-					$g = array('x'=>'1','waybillid'=>'','waybill'=>$waybill,'yd'=>$yd);//'fp'=>$fp
-				}else{
-					$g = array('x'=>'1','waybillid'=>$res['returnDatas'][0]['corpBillid'],'waybill'=>$waybill,'yd'=>$yd);//'fp'=>$fp
-				}
+				$g = array('x'=>'1','waybillid'=>$res['returnDatas'][0]['corpBillid'],'waybill'=>$waybill,'yd'=>'');//'fp'=>$fp
 				
+			}else{
+				$yd = $this->get_yd($res['returnDatas'][0]['corpBillid'],$printcode[2],$ordertype);
+				if($yd != 'c')// && $fp != 'c'
+				{
+					$waybill = $res['returnDatas'][0]['trackNumber']."";
+					if(strlen($waybill) == 30){
+						$waybill = substr($waybill, 8);
+					}
+					//FedEx-US2和USPS-US2 不需要获取转单号
+					if($data['printcode'] == 'FedEx_2day' || $data['printcode'] == 'usps_priority'){
+						$g = array('x'=>'1','waybillid'=>'','waybill'=>$waybill,'yd'=>$yd);//'fp'=>$fp
+					}else{
+						$g = array('x'=>'1','waybillid'=>$res['returnDatas'][0]['corpBillid'],'waybill'=>$waybill,'yd'=>$yd);//'fp'=>$fp
+					}
+					
+				}
+				else
+				{
+					$g = array('x'=>'0','Description'=>'换取运单失败，请重试。'.$res['returnDatas'][0]['corpBillid']);
+					//$g = array('x'=>'0','Description'=>json_encode($res,JSON_UNESCAPED_UNICODE));
+				}
 			}
-			else
-			{
-				$g = array('x'=>'0','Description'=>'换取运单失败，请重试。'.$res['returnDatas'][0]['corpBillid']);
-				//$g = array('x'=>'0','Description'=>json_encode($res,JSON_UNESCAPED_UNICODE));
-			}
+			
 		}
 		$this->logic_ding->sendToDing("云尚快递erp返回信息".$data['number']."【".json_encode($g)."】");
 		$end_time = time();