修改大件重量

Application/Admin/Controller/ExportController.class.php

@@ -1089,8 +1089,13 @@ $data['s_weight'] = $data['s_weight']/1000;
         $data = M('goods')->find($id);
         $export_ids = explode(',',$data['export_ids']);
         $arr = [];
-        foreach($export_ids as $v){
-            $arr[] = M('qcode_export')->find($v);
+        foreach($export_ids as $key=>$v){
+            $arr[$key] = M('qcode_export')->find($v);
+            $large_str = explode(',',$arr[$key]['large_str']);
+            $map = [];
+            $map['id'] = array('in',$large_str);
+            $large_num = M('qcode_large')->where($map)->sum('l_num');
+            $arr[$key]['l_num'] = $large_num / 10000;
         }
         $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/Controller/NewQcodeController.class.php

@@ -173,12 +173,22 @@ class  NewQcodeController extends AddonController
 //                        $l_reservation=intTochar($Bach_id.I('post.l_reservation'),12);//批次id+0,不够12位在前面补0  具体点击方法看代码
                         $l_reservation=intTochar(I('post.bach_num'),10);//批次+0,不够10位在前面补0  第一个批次  后续会加第二个批次
                         $l_reservation = $l_reservation.'0000000000';
-                        $small_n =  intTochar($tray_num,3);
-                        if(I('post.danwei')==2){//以卷为单位
-                            $remainder = $small_num - $tray_num*$i; //确定最后一个托盘大件里小件的数量
-                            if ($remainder < $tray_num){
-                                $small_n = intTochar($remainder,3);//小件数量3位  不足补零
-                            }
+//                        $small_n =  intTochar($tray_num,3);
+//                        if(I('post.danwei')==2){//以卷为单位
+//                            $remainder = $small_num - $tray_num*$i; //确定最后一个托盘大件里小件的数量
+//                            if ($remainder < $tray_num){
+//                                $small_n = intTochar($remainder,3);//小件数量3位  不足补零
+//                            }
+//                        }
+                        $remainder = $small_num - $tray_num*$i; //确定最后一个托盘大件里小件的数量
+                        if ($remainder < $tray_num){
+                            $small_n = intTochar($remainder,3);//小件数量3位  不足补零
+                        }else{
+                            $small_n =  intTochar($tray_num,3);
+                        }
+                        $l_num = 0;
+                        if(I('post.danwei')==1) {//以箱为单位
+                            $l_num = $small_n * I('post.box_num/d');
                         }
                         $code_data= CodeData($this->sign,$fixed_code,$small_n,$print_date,$l_flow,$l_weight,$this->signLarge,$l_reservation);
 
@@ -192,7 +202,8 @@ class  NewQcodeController extends AddonController
                             'creat_time'=>time(),
                             'p_nums'=>0,
                             'userid'=>$userid,//大码绑定用户id
-                            'l_weight'=>$l_weight//单个大件重量
+                            'l_weight'=>$l_weight,//单个大件重量
+                            'l_num'=>$l_num//单个大件数量
 
                         ];
                         $large_id= $QcodeLarge->data($L_data)->add();

Application/Admin/View/Export/fahuo.html

@@ -308,7 +308,7 @@
                     html+= '<td class="tg-031e">'+arr[i].small_num+'</td>';
                     if(arr[i].mater_type==1){
 						html+= '<td class="tg-031e">万张</td>';
-                        html+='<td class="tg-031e">'+parseFloat(arr[i].num)*parseFloat(arr[i].small_num)/10000+'</td>';
+                        html+='<td class="tg-031e">'+arr[i].l_num+'</td>';
                         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>';