修改后大件码显示优化Merge branch 'master' of https://gitee.com/huangsanjia/dm.line.com

Application/Admin/Controller/ExportController.class.php

@@ -1096,6 +1096,9 @@ $data['s_weight'] = $data['s_weight']/1000;
             $map['id'] = array('in',$large_str);
             $large_num = M('qcode_large')->where($map)->sum('l_num');
             $arr[$key]['l_num'] = $large_num / 10000;
+            $large_weight = M('qcode_large')->where($map)->sum('l_weight');
+            $arr[$key]['l_weight'] = $large_weight / 1000;
+            
         }
         $address = $model->query("select u.company_address as address from qr_goods g left join qr_admin_user u on u.id=g.supplier_id where g.id=".$id)[0]['address'];
         $data['address']=$address;

Application/Admin/View/Export/fahuo.html

@@ -312,7 +312,7 @@
                         html+='<td class="tg-031e" >'+arr[i].small_num+'件*'+parseInt(arr[i].num)+'张'+'</td>';
                     }else if (arr[i].mater_type==2){
 						html+= '<td class="tg-031e">kg</td>';
-                        html+='<td class="tg-031e">'+parseFloat(arr[i].num)*parseFloat(arr[i].small_num)/1000+'</td>';
+                        html+='<td class="tg-031e">'+arr[i].l_weight +'</td>';
                         html+='<td class="tg-031e" >'+arr[i].small_num+'件*'+parseFloat(arr[i].num)/1000+'kg'+'</td>';
                     }else if (arr[i].mater_type==3){
 						html+= '<td class="tg-031e">万支</td>';