熊小夕打印。

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

@@ -198,7 +198,7 @@
                     var barcodes = $("#bcTarget").html();
                     /*$("#barcodeId").html(machineBarcode);
                     $("#qrcodeImg").attr('src',machineQrcode);*/
-                    if (isPrintQrcode == 2) {
+                    if (isPrintQrcode === 2) {
                         // 不需要二维码
                         if(berGenerateRules === 3){
                             // 博乐宝生成规则
@@ -382,6 +382,54 @@
                                     /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                                     '</div>'
                                 );
+                            } else if(produceName == "熊小夕F10净饮机PLUS版 天青ANF") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                    '<div style="width: 243px;height: 120px;position: relative;">' +
+                                    '<span style="padding-left: 10px;">即热台式净饮机 矿泉Plus版（ANF）</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(produceName == "熊小夕F10净饮机 天青ANF") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                    '<div style="width: 243px;height: 120px;position: relative;">' +
+                                    '<span style="padding-left: 10px;">即热台式净饮机 矿泉版（ANF）</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(produceName == "熊小夕F10净饮机矿泉PLUS版") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                    '<div style="width: 243px;height: 120px;position: relative;">' +
+                                    '<span style="padding-left: 10px;">即热台式净饮机 矿泉Plus版</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(produceName == "熊小夕F10净饮机矿泉版") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                    '<div style="width: 243px;height: 120px;position: relative;">' +
+                                    '<span style="padding-left: 10px;">熊小夕F10净饮机矿泉版</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();
@@ -474,7 +522,7 @@
                         }
                     }else{
                         if(isGeneralQrcode == 1 || berGenerateRules == 2){
-                            if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机" || produceName === "GW-8诺米克OEM净水机"){
+                            if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
                                 $("#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>' +
@@ -494,6 +542,27 @@
                                         '<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 if(produceName === "GW-8诺米克OEM净水机") {
+                                /*$("#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;">型号：GW-8(黛蓝)</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: 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: 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>' +
+                                    '<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: 8px;top: 87px;font-size: 8px;visibility:hidden"><b>扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&nbsp;滤&nbsp;&nbsp;芯</b></span>' +
+                                    '</div>');
                             } else{
                                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;"></span>' +
@@ -848,6 +917,54 @@
                             /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                             '</div>'
                         );
+                    } else if(produceName == "熊小夕F10净饮机PLUS版 天青ANF") {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append(
+                            '<div style="width: 243px;height: 120px;position: relative;">' +
+                            '<span style="padding-left: 10px;">即热台式净饮机 矿泉Plus版（ANF）</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(produceName == "熊小夕F10净饮机 天青ANF") {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append(
+                            '<div style="width: 243px;height: 120px;position: relative;">' +
+                            '<span style="padding-left: 10px;">即热台式净饮机 矿泉版（ANF）</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(produceName == "熊小夕F10净饮机矿泉PLUS版") {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append(
+                            '<div style="width: 243px;height: 120px;position: relative;">' +
+                            '<span style="padding-left: 10px;">即热台式净饮机 矿泉Plus版</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(produceName == "熊小夕F10净饮机矿泉版") {
+                        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();
@@ -918,7 +1035,7 @@
                 }
             }else{
                 if(isGeneralQrcode == 1 || berGenerateRules == 2){
-                    if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机" || produceName === "GW-8诺米克OEM净水机"){
+                    if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
                         $("#printlist").append('<div style="width: 242px;height: 126px;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>' +
@@ -929,7 +1046,28 @@
                                 '<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>');
-                    }else{
+                    } else if(produceName === "GW-8诺米克OEM净水机")  {
+                        /*$("#printlist").append('<div style="width: 242px;height: 126px;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;">型号：GW-8(黛蓝)</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: 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: 126px;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>' +
+                            '<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: 8px;top: 87px;font-size: 8px;visibility:hidden;"><b>扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&nbsp;滤&nbsp;&nbsp;芯</b></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;"></span>' +