first commit

application/admin/controller/Deliver.php

@@ -682,14 +682,16 @@ class Deliver extends Backend
                 $data[$k] = $export->where('_id',$v)->find();
                 $large_str = explode(',',$data[$k]['large_str']);
                 $large_list = $large->name($userinfo['company'].'_'.'qcode_large')->whereIn('_id',$large_str)->select();
+
                 $large_num = $large_weight = 0;
                 foreach ($large_list as $value){
                     $large_num = $large_num + $value['l_num'];
                     $large_weight = $large_weight + $value['l_weight'];
                 }
                 $data[$k]['l_num'] = $large_num/10000;
-                $data[$k]['l_weight'] = $large_weight;
+                $data[$k]['l_weight'] = $large_weight /100;
             }
+
             $good_list['address'] = $userinfo['company_address'];
             $good_list['data'] = $data;
             $good_list['count'] = count($data);

application/admin/controller/QcodeBach.php

@@ -625,18 +625,21 @@ class QcodeBach extends Backend
                             $rows[$key]['num'] = ($main_unit == '公斤') ? $rowData['l_weight'] /100 : (
                             $proportion ? floor($rows[$key]['sqrcd'] * $proportion * 100) / 100 : ''
                             );
-                        } else {
-                            if($main_unit == '万支'){
-                                $rows[$key]['num'] = $rowData['l_num']/10000;
-                            }else{
-                                $rows[$key]['num'] = $rowData['l_num'];
-                            }
-                            if ($main_unit == '万张') {
+                        } else if($main_unit == '万支') {
+//                            if($main_unit == '万支'){
                                 $rows[$key]['num'] = $rowData['l_num']/10000;
-                            }else{
-                                $rows[$key]['num'] = $rowData['l_num'];
-                            }
-
+//                            }else{
+//                                $rows[$key]['num'] = $rowData['l_num'];
+//                            }
+//                            if ($main_unit == '万张') {
+//                                $rows[$key]['num'] = $rowData['l_num']/10000;
+//                            }else{
+//                                $rows[$key]['num'] = $rowData['l_num'];
+//                            }
+                        }else if($main_unit == '万张'){
+                            $rows[$key]['num'] = $rowData['l_num']/10000;
+                        }else{
+                            $rows[$key]['num'] = $rowData['l_num'];
                         }
                     }
 
@@ -696,17 +699,21 @@ class QcodeBach extends Backend
                     $rows[$key]['num'] = ($main_unit == '公斤') ? $rowData['l_weight'] /100 : (
                     $proportion ? floor($rows[$key]['sqrcd'] * $proportion * 100) / 100 : ''
                     );
-                } else {
-                    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'];
-                    }
+                } else if($main_unit == '万支') {
+//                            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'];
+//                            }
+                }else if($main_unit == '万张'){
+                    $rows[$key]['num'] = $rowData['l_num']/10000;
+                }else{
+                    $rows[$key]['num'] = $rowData['l_num'];
                 }
             }
         }

public/assets/js/LodopFuncs.js

@@ -141,7 +141,7 @@ function getLodop(oOBJECT, oEMBED) {
                     strAlertMessage = strLodop7Update_X86;
                 else if (isLinuxARM && LODOP.CVERSION < "7.0.4.3")
                     strAlertMessage = strLodop7Update_ARM;
-                else if (CLODOP.CVERSION < "6.5.7.2")
+                else if (CLODOP && CLODOP.CVERSION < "6.5.7.2")
                     strAlertMessage = strCLodopUpdate;
 
                 if (strAlertMessage)
@@ -182,7 +182,17 @@ function getLodop(oOBJECT, oEMBED) {
         //===============================================================================
         return LODOP;
     } catch (err) {
-        alert("getLodop出错:" + err);
+        console.error("getLodop出错:", err);
+        // 返回一个空对象以避免后续调用出错
+        return {
+            SET_LICENSES: function(){}, 
+            PRINT_INIT: function(){}, 
+            SET_PRINT_STYLE: function(){}, 
+            SET_PRINT_PAGESIZE: function(){}, 
+            ADD_PRINT_HTM: function(){}, 
+            PREVIEW: function(){}, 
+            PRINT: function(){}
+        };
     }
 }
 

public/assets/js/backend/deliver.js

@@ -212,7 +212,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                if (plate_number == null || plate_number === ''){
                    layer.confirm('车牌号不能为空');
                }
-               var note = $('c-note').val();
+               var note = $('#c-note').val();
                Fast.api.ajax({
                    url:'deliver/apply_add',
                    data:{