NHK的打印条码格式调整，提交内容。

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

@@ -266,15 +266,15 @@
                     }else{
                         if(isGeneralQrcode == 1 || berGenerateRules == 2){
                             if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
-                                $("#printlist").append('<div style="width: 242px;height: 122px;position: relative;">' +
-                                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
-                                        '<span style="position: absolute;left: 162px;font-size: 8px;"><b>淘&nbsp;&nbsp;宝&nbsp;/&nbsp;天&nbsp;&nbsp;猫&nbsp;A&nbsp;P&nbsp;P</b></span>' +
+                                $("#printlist").append('<div style="width: 242px;height: 124px;position: relative;">' +
+                                        '<span style="position: absolute;left: 10px;font-size: 14px;">即热台式净水器</span>' +
+                                        '<span style="position: absolute;left: 162px;font-size: 7px;"><b>&nbsp;&nbsp;&nbsp;扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&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;"><b>扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&nbsp;滤&nbsp;&nbsp;芯</b></span>' +
+                                        '<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>' +
@@ -515,15 +515,15 @@
             }else{
                 if(isGeneralQrcode == 1 || berGenerateRules == 2){
                     if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
-                        $("#printlist").append('<div style="width: 242px;height: 122px;position: relative;">' +
-                                '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
-                                '<span style="position: absolute;left: 162px;font-size: 8px;"><b>淘&nbsp;&nbsp;宝&nbsp;/&nbsp;天&nbsp;&nbsp;猫&nbsp;A&nbsp;P&nbsp;P</b></span>' +
+                        $("#printlist").append('<div style="width: 242px;height: 124px;position: relative;">' +
+                                '<span style="position: absolute;left: 10px;font-size: 14px;">即热台式净水器</span>' +
+                                '<span style="position: absolute;left: 162px;font-size: 7px;"><b>&nbsp;&nbsp;&nbsp;扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&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;"><b>扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&nbsp;滤&nbsp;&nbsp;芯</b></span>' +
+                                '<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>' +