lvhao преди 5 месеца
родител
ревизия
81d4ad06ba
променени са 2 файла, в които са добавени 16 реда и са изтрити 15 реда
  1. 12 11
      core/CoreApp/controllers/Systemprint.php
  2. 4 4
      core/CoreApp/models/Model_usps.php

+ 12 - 11
core/CoreApp/controllers/Systemprint.php

@@ -900,20 +900,21 @@ class Systemprint extends Start_Controller {
 				{
 				    $barcode = $this->usps->get_data($fullorder);
 					//改新的去掉
-					if(isset($barcode[0]))
-					{
-						$barcode = $barcode[0];
-					}
-					if(isset($barcode['LabelImage']) || isset($barcode[0]['LabelImage']))
+					// if(isset($barcode[0]))
+					// {
+					// 	$barcode = $barcode[0];
+					// }
+					//if(isset($barcode['LabelImage']) || isset($barcode[0]['LabelImage']))
 					//改新的去掉
-					//if(isset($barcode['labelImage']))
+					if(isset($barcode['labelImage']))
 					{
 						$bctime = date('Ymd',$time);
-						$Hwaybill = substr($barcode['BarcodeNumber'], 8); //改新的去掉  新的 Labellmage 改  labelImage
-						//$Hwaybill = $barcode['trackingNumber'];
-					   // $Hyd = $this->_pdf($barcode['labelImage'],'y-'.$Hwaybill,$bctime);
-					    $Hyd = $this->_pdf($barcode['LabelImage'],'y-'.$Hwaybill,$bctime);
-						if(isset($barcode['LabelImage']) && isset($Hwaybill))
+						//$Hwaybill = substr($barcode['BarcodeNumber'], 8); //改新的去掉  新的 Labellmage 改  labelImage
+						$Hwaybill = $barcode['trackingNumber'];
+					    $Hyd = $this->_pdf($barcode['labelImage'],'y-'.$Hwaybill,$bctime);
+					    //$Hyd = $this->_pdf($barcode['LabelImage'],'y-'.$Hwaybill,$bctime);
+						//if(isset($barcode['LabelImage']) && isset($Hwaybill))
+						if(isset($barcode['labelImage']) && isset($Hwaybill))
 						{
 							if($fullorder['waybill'] != "")
 							{

Файловите разлики са ограничени, защото са твърде много
+ 4 - 4
core/CoreApp/models/Model_usps.php