修改打印条码数量过少的问题

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -199,20 +199,37 @@
                     /*$("#barcodeId").html(machineBarcode);
                     $("#qrcodeImg").attr('src',machineQrcode);*/
                     if (isPrintQrcode == 2) {
+                        // 不需要二维码
                         if(berGenerateRules === 3){
-                            code128(machineBarcode);
-                            var barcodes2 = $("#bcTarget").html();
-                            $("#printlist").append('<div style="width: 243px;height: 120px;position: relative;">' +
-                                    '<span style="padding-left: 10px;">反渗透净水机</span>' +
-                                   /* '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +*/
-                                    '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
-                                    /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
-                                    '</div>');
+                            if (produceName === "吉尼瓦兰L01净饮机") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                        '<div style="width: 243px;height: 120px;position: relative;">' +
+                                        '<span style="padding-left: 10px;"></span>' +
+                                        /* '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                         '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +*/
+                                        '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
+                                        /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                                        '</div>'
+                                );
+                            } else {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                        '<div style="width: 243px;height: 120px;position: relative;">' +
+                                        '<span style="padding-left: 10px;">反渗透净水机</span>' +
+                                        /* '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                         '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +*/
+                                        '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
+                                        /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                                        '</div>'
+                                );
+                            }
                         }else if(berGenerateRules === 4){
                             code128(machineBarcode);
                             var barcodes2 = $("#bcTarget").html();
-                            $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                            $("#printlist").append('<div style="width: 243px;height: 120px;position: relative;">' +
                                     '<span style="padding-left: 10px;">The One B1系列滤芯</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                     '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
@@ -220,7 +237,7 @@
                                     /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                                     '</div>');
                         }else if(produceName === "净水机基础版水箱" || produceName === "净水机银离子水箱"){
-                            $("#printlist").append('<div style="width: 242px;height: 126px;position: relative;">' +
+                            $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
                                     '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                     '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
@@ -231,7 +248,7 @@
                                     '</div>');
                         } else if(produceName === "西班牙Bermax") {
                             // 西班牙
-                            $("#printlist").append('<div style="width: 242px;height: 122px;position: relative;">' +
+                            $("#printlist").append('<div style="width: 243px;height: 122px;position: relative;">' +
                                     '<span style="position: absolute;left: 10px;font-size: 14px;">Bermax</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                     '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
@@ -242,7 +259,7 @@
                                     '</div>');
                         }else{
                             if (produceName === "杰牌WB-1净水机") {
-                                $("#printlist").append('<div style="width: 242px;height: 126px;position: relative;">' +
+                                $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                                         '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                         '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
@@ -252,7 +269,7 @@
                                         '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                                         '</div>');
                             } else {
-                                $("#printlist").append('<div style="width: 242px;height: 126px;position: relative;">' +
+                                $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                                         '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                         '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
@@ -266,7 +283,7 @@
                     }else{
                         if(isGeneralQrcode == 1 || berGenerateRules == 2){
                             if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
-                                $("#printlist").append('<div style="width: 242px;height: 126px;position: relative;">' +
+                                $("#printlist").append('<div style="width: 242px;height: 125px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">即热台式净水器</span>' +
                                         '<span style="position: absolute;left: 162px;font-size: 9px;"><b>&nbsp;&nbsp;&nbsp;扫码购买滤芯</b></span>' +
                                         '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
@@ -298,7 +315,7 @@
                             }
                         }else{
 
-                            $("#printlist").append('<div style="width: 242px;height: 126px;position: relative;">' +
+                            $("#printlist").append('<div style="width: 242px;height: 125px;position: relative;">' +
                                     '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                     '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +