first commit

application/admin/controller/QcodeBach.php

@@ -618,7 +618,6 @@ class QcodeBach extends Backend
                                 ltrim(substr($code, 66, 10), '0') . '、' . ltrim(substr($code, 76, 10), '0')
                         ];
 
-
                         // 数量处理
                         if ($rowData['l_num'] === null) {
                             $rows[$key]['num'] = $proportion ? floor($rows[$key]['sqrcd'] * $proportion * 100) / 100 : '';
@@ -627,7 +626,17 @@ class QcodeBach extends Backend
                             $proportion ? floor($rows[$key]['sqrcd'] * $proportion * 100) / 100 : ''
                             );
                         } else {
-                            $rows[$key]['num'] = $rowData['l_num'];
+                            if($main_unit == '万支'){
+                                $rows[$key]['num'] = $rowData['l_num']/10000;
+                            }else{
+                                $rows[$key]['num'] = $rowData['l_num'];
+                            }
+                            if ($main_unit == '万张') {
+                                $rows[$key]['num'] = $rowData['l_num']/10000;
+                            }else{
+                                $rows[$key]['num'] = $rowData['l_num'];
+                            }
+
                         }
                     }
 
@@ -688,7 +697,16 @@ class QcodeBach extends Backend
                     $proportion ? floor($rows[$key]['sqrcd'] * $proportion * 100) / 100 : ''
                     );
                 } else {
-                    $rows[$key]['num'] = $rowData['l_num'];
+                    if($main_unit == '万支'){
+                        $rows[$key]['num'] = $rowData['l_num']/10000;
+                    }else{
+                        $rows[$key]['num'] = $rowData['l_num'];
+                    }
+                    if ($main_unit == '万张') {
+                        $rows[$key]['num'] = $rowData['l_num']/10000;
+                    }else{
+                        $rows[$key]['num'] = $rowData['l_num'];
+                    }
                 }
             }
         }
@@ -1024,7 +1042,8 @@ class QcodeBach extends Backend
             $qcodeLarge = new QcodeLarge();
 
             if($req['row']['type']==1){//修改大件重量
-                $data['l_weight'] = intval($req['row']['numn']*100);
+                $data['l_weight'] = intval(round($req['row']['numn']*100));
+//                $data['l_weight'] = intval($req['row']['numn']*100);
 
                 foreach($ids as $val){
                     //查询code
@@ -1042,7 +1061,8 @@ class QcodeBach extends Backend
                 $this->success('修改成功');
             }
             if($req['row']['type']==2){//修改大件总张数
-                $data['l_num'] = intval($req['row']['numn']);
+                $data['l_num'] = intval(round($req['row']['numn']));
+//                $data['l_num'] = intval($req['row']['numn']);
                 foreach($ids as $val){
                     //查询l_num, 判断是否可以修改总张数
                     $large = $qcodeLarge->name($company_id.'_'."qcode_large")->field('l_num')->where('_id',$val)->find();

application/admin/view/qcode_add/index.html

@@ -88,6 +88,7 @@
                         <option value="96">========>96箱<========</option>
                         <option value="105">========>105箱<========</option>
                         <option value="108">========>108箱<========</option>
+                        <option value="120">========>120箱<========</option>
                         <option value="144">========>144箱<========</option>
                         <option value="180">========>180箱<========</option>
                         <option value="240">========>240箱<========</option>