hexiugang 2 лет назад
Родитель
Сommit
ecaaec3462

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_check_list.ftl

@@ -89,7 +89,7 @@
             <thead style="display:table-header-group">
             <tr>
                 <th colspan="6" >
-                    <span style="text-align:center;font-size: 1.75rem;">核对单</span>
+                    <span style="text-align:center;font-size: 1.75rem;">核对单(爱贝源)</span>
                     <div style="float: right;margin-top: 0.5cm">
                         <span style="margin-right: 2cm;" id="dateId2">时间:</span>
                     </div>

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

@@ -430,6 +430,48 @@
                                     /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                                     '</div>'
                                 );
+                            } else if(produceName == "完美水龙头") {
+                                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(produceName == "完美厨下机") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append('<div style="width: 242px;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(produceName == "完美即热器") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append('<div style="width: 242px;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(produceName == "家里泉F60弱碱净饮机") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append('<div style="width: 242px;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();
@@ -965,6 +1007,48 @@
                             /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                             '</div>'
                         );
+                    } else if(produceName == "完美水龙头") {
+                        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(produceName == "完美厨下机") {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append('<div style="width: 242px;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(produceName == "完美即热器") {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append('<div style="width: 242px;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(produceName == "家里泉F60弱碱净饮机") {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append('<div style="width: 242px;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();