万斤:l_weight

static/basejs/tg_small_v010.js

@@ -88,7 +88,17 @@ function small_v010_print(result,type,idList,reptQty,sign_type) {
                     var proportion = '';
                 }
             }else if(data['largrlabel'][j][k]['l_num']==0){
-                var proportion = data['largrlabel'][j][k]['l_weight'];
+                if(data['largrlabel'][j][k]['main_unit']=='公斤'){
+                    var proportion = data['largrlabel'][j][k]['l_weight'];
+                }else{
+                    //走转换关系
+                    if (data['largrlabel'][j][k]['proportion']){
+                        var proportion = data['largrlabel'][j][k]['numn']*data['largrlabel'][j][k]['proportion'];
+                        proportion = Math.floor(proportion * 100) / 100;
+                    }else{
+                        var proportion = '';
+                    }
+                }
             }else{
                 //箱, 使用l_num
                 var proportion = data['largrlabel'][j][k]['l_num'];
@@ -238,7 +248,17 @@ function small_v010_print(result,type,idList,reptQty,sign_type) {
                             var proportion = '';
                         }
                     }else if(data['largrlabel'][j][k]['l_num']==0){
-                        var proportion = data['largrlabel'][j][k]['l_weight'];
+                        if(data['largrlabel'][j][k]['main_unit']=='公斤'){
+                            var proportion = data['largrlabel'][j][k]['l_weight'];
+                        }else{
+                            //走转换关系
+                            if (data['largrlabel'][j][k]['proportion']){
+                                var proportion = data['largrlabel'][j][k]['numn']*data['largrlabel'][j][k]['proportion'];
+                                proportion = Math.floor(proportion * 100) / 100;
+                            }else{
+                                var proportion = '';
+                            }
+                        }
                     }else{
                         //箱, 使用l_num
                         var proportion = data['largrlabel'][j][k]['l_num'];