1

core/CoreApp/controllers/Aac.php

@@ -138,7 +138,9 @@ class Aac extends Start_Controller {
 			'pm',
 			'weight'
 		];
-		$this->logic_whlabel->dataTran($list,$condition);
+		$list = $this->logic_whlabel->dataTran($list,$condition);
+		echo "<pre>";
+		var_dump($list);
 	}
 	
 }

core/CoreApp/models/Model_logic_whlabel.php

@@ -26,11 +26,11 @@ class Model_logic_whlabel extends Lin_Model {
             }
         }
         foreach($list as $k=>$v){
-            if($v == 'pm'){
+            if(in_array('pm',$condition)){
                 $list[$k]['pm'] = $this->getPm($v['features']);
             }
-            if($v == 'weight'){
-                $list[$k]['weight'] = $this->getPm($v['features']);
+            if(in_array('weight',$condition)){
+                $list[$k]['weight'] = $this->getWeight($v['features']);
             }
         }
 
@@ -80,6 +80,8 @@ class Model_logic_whlabel extends Lin_Model {
         if(in_array(130,$features)){
             $type = 130;
         }
+        
+    
 
         return $this->logic_weight->getWeightByFeature($type,$features);
     }