处理淘宝发货（顺丰为SFM）。

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

@@ -196,8 +196,6 @@
                 for (var i = 0; i < settingNumber; i++) {
                     code1282(machineBarcode);
                     var barcodes = $("#bcTarget").html();
-                    /*$("#barcodeId").html(machineBarcode);
-                    $("#qrcodeImg").attr('src',machineQrcode);*/
                     if (isPrintQrcode === 2) {
                         // 不需要二维码
                         if(berGenerateRules === 3){
@@ -574,6 +572,16 @@
                                     /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                                     '</div>'
                                 );
+                            } else if(produceName == "德克西H6(富锶)净水机") {
+                                $("#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>' +
+                                    '<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;">'+ produceCreateTime +'</span>' +
+                                    '</div>');
                             } else {
                                 $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
@@ -599,26 +607,7 @@
                                         '<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 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>' +
@@ -641,7 +630,6 @@
                                         '</div>');
                             }
                         }else{
-
                             $("#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>' +
@@ -809,8 +797,6 @@
         for (var i = 0; i < settingNumber; i++) {
             code1282(machineBarcode);
             var barcodes = $("#bcTarget").html();
-            /*$("#barcodeId").html(machineBarcode);
-            $("#qrcodeImg").attr('src',machineQrcode);*/
             if (isPrintQrcode == 2) {
                 // 不需要二维码
                 if(berGenerateRules === 3){
@@ -1151,7 +1137,17 @@
                         '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
                         '</div>'
                     );
-                }else{
+                } else if(produceName == "德克西H6(富锶)净水机") {
+                    $("#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>' +
+                        '<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;">'+ 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>' +