longyi hai 1 día
pai
achega
dc6248fcba

+ 2 - 2
core/CoreApp/controllers/Systemprint.php

@@ -777,7 +777,7 @@ class Systemprint extends Start_Controller {
 							if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
 				   		 	{
 								$type = 1;
-								$text = array('yd'=>base_url().'data/pdf/'.$bctime.'/y-'.$Hwaybill.'.pdf','mode'=>70);
+								$text = array('yd'=>base_url().'data/pdf/'.$bctime.'/y-'.$Hwaybill.'.pdf','mode'=>85);
 							}
 						}
 					}
@@ -1690,7 +1690,7 @@ class Systemprint extends Start_Controller {
 				   		 	{
 								$type = 1;
 								$pdfnum = 1;
-								$text = array('yd'=>base_url().'data/pdf/'.$bctime.'/y-'.$Hwaybill.'.pdf','mode'=>100);
+								$text = array('yd'=>base_url().'data/pdf/'.$bctime.'/y-'.$Hwaybill.'.pdf','mode'=>90);
 							}
 						}
 					}

+ 20 - 20
core/CoreApp/models/Model_express_tt.php

@@ -126,16 +126,16 @@ class Model_express_tt extends Lin_Model {
     private function getFBTPackage($info,$shop_info){
         $extra_text = $info['extra_text'];
         $packages = $extra_text['packages'];
-        if(!isset($extra_text['server_info'])){
-            $rr1 = $this->getExpressCompany($info,$shop_info);
-            if($rr1['x'] == 0){
-                return $rr1;
-            }
-            $info = $rr1['data'];
-            if(is_string($info['extra_text'])){
-                $info['extra_text'] = json_decode($info['extra_text'],true);
-            }
-        }
+        // if(!isset($extra_text['server_info'])){
+        //     $rr1 = $this->getExpressCompany($info,$shop_info);
+        //     if($rr1['x'] == 0){
+        //         return $rr1;
+        //     }
+        //     $info = $rr1['data'];
+        //     if(is_string($info['extra_text'])){
+        //         $info['extra_text'] = json_decode($info['extra_text'],true);
+        //     }
+        // }
         // 确定没有多包裹的情况 就不再写循环了 直接获取第一个包裹
         // foreach($packages as $package){
         //     $rr = $this->apitt->downloadLabel($package['id'],$shop_info[0],$info);
@@ -150,16 +150,16 @@ class Model_express_tt extends Lin_Model {
         //     }
         // }
 
-        if(!isset($extra_text['label_info'])){
-            $rr2 = $this->createExpressLabel($info,$shop_info);
-            if($rr2['x'] == 0){
-                return $rr2;
-            }
-            $info = $rr2['data'];
-            if(is_string($info['extra_text'])){
-                $info['extra_text'] = json_decode($info['extra_text'],true);
-            }
-        }
+        // if(!isset($extra_text['label_info'])){
+        //     $rr2 = $this->createExpressLabel($info,$shop_info);
+        //     if($rr2['x'] == 0){
+        //         return $rr2;
+        //     }
+        //     $info = $rr2['data'];
+        //     if(is_string($info['extra_text'])){
+        //         $info['extra_text'] = json_decode($info['extra_text'],true);
+        //     }
+        // }
         $packageid = $packages[0]['id'];
         $rr = $this->apitt->downloadLabel($packageid,$shop_info[0],$info);
         if($rr['code']!=0){