增加戈登的二维码打印

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

@@ -201,6 +201,7 @@
                     if (isPrintQrcode == 2) {
                         // 不需要二维码
                         if(berGenerateRules === 3){
+                            // 博乐宝生成规则
                             if (produceName === "吉尼瓦兰L01净饮机") {
                                 code128(machineBarcode);
                                 var barcodes2 = $("#bcTarget").html();
@@ -275,6 +276,7 @@
                                 );
                             }
                         }else if(berGenerateRules === 4){
+                            // 博乐宝滤芯生成规则
                             code128(machineBarcode);
                             var barcodes2 = $("#bcTarget").html();
                             $("#printlist").append('<div style="width: 243px;height: 120px;position: relative;">' +
@@ -316,6 +318,18 @@
                                         '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
                                         '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                                         '</div>');
+                            } else if(produceName == "宜盾普牌反渗透净饮机 S7") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                        '<div style="width: 243px;height: 120px;position: relative;">' +
+                                        '<span style="padding-left: 10px;visibility:hidden">反渗透净水机</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 {
                                 $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
@@ -533,8 +547,10 @@
             /*$("#barcodeId").html(machineBarcode);
             $("#qrcodeImg").attr('src',machineQrcode);*/
             if (isPrintQrcode == 2) {
+                // 不需要二维码
                 if(berGenerateRules === 3){
-                    if(produceName == "熊小夕F10净饮机PLUS款 白色"){
+                    // 博乐宝生成规则
+                    if(produceName === "熊小夕F10净饮机PLUS款 白色"){
                         code128(machineBarcode);
                         var barcodes2 = $("#bcTarget").html();
                         $("#printlist").append(
@@ -595,6 +611,7 @@
                     }
                     // $("#printlist").append();
                 }else if(berGenerateRules === 4){
+                    // 博乐宝滤芯生成规则
                     code128(machineBarcode);
                     var barcodes2 = $("#bcTarget").html();
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
@@ -616,7 +633,17 @@
                             '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
                             '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                             '</div>');
-                } else{
+                } else if(produceName === "宜盾普牌反渗透净饮机 S7") {
+                    $("#printlist").append('<div style="width: 243px;height: 120px;position: relative;">' +
+                            '<span style="position: absolute;left: 10px;font-size: 14px;visibility:hidden">反渗透净水机</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;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                            '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                            '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                            '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;visibility:hidden;">'+ produceCreateTime +'</span>' +
+                    '</div>');
+                }else{
                     $("#printlist").append('<div style="width: 242px;height: 120px;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>' +
@@ -640,15 +667,6 @@
                                 '<img style="position: absolute;right: 5px;top:13px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
                                 '<span style="position: absolute;right: 8px;top: 87px;font-size: 8px;visibility:hidden;"><b>扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&nbsp;滤&nbsp;&nbsp;芯</b></span>' +
                                 '</div>');
-                        /*$("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
-                                '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
-                                '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                                '<div style="position: absolute;left: -2px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                                '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                                '<img style="position: absolute;right: 5px;top:13px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                                '<span style="position: absolute;right: 0px;top: 87px;font-size: 8px;display: none;"><b>淘宝/天猫APP 滤芯购买</b></span>' +
-                                '</div>');*/
                     }else{
                         $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                                 '<span style="position: absolute;left: 10px;font-size: 14px;"></span>' +