打印机页面修改

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -381,7 +381,8 @@
             TRPP.produce_id AS produceId,
             TRPP.produce_pattern AS producePattern,
             TRPP.produce_model AS produceModel,
-            TRPP.produce_feature AS produceFeature
+            TRPP.produce_feature AS produceFeature,
+			TRPP.produce_name AS produceName
         FROM
             tb_rst_pts_produce TRPP
         WHERE

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

@@ -168,6 +168,7 @@
                     var produce = getProduce(machineId);
                     var producePattern =  produce.producePattern;    //获取产品型号前两位
                     var produceModel =  produce.produceModel;        //获取产品型号后两位
+                    var produceName = produce.produceName;            //获取产品名称
 
                     var machineNo = "NO." + $("#"+machineBarcode+"Id").val();
                     for (var i = 0; i < settingNumber; i++) {
@@ -177,7 +178,7 @@
                         $("#qrcodeImg").attr('src',machineQrcode);*/
                         if (machineProduceType == 1) {//净水机模板
                             $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                    '<span style="position: absolute;left: 10px;font-size: 14px;">aiberle可移动智能净水机</span>' +
+                                    '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                     '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
                                     '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
@@ -188,7 +189,7 @@
                         }
                         if (machineProduceType == 2) {//冲奶机模板
                             $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                    '<span style="position: absolute;left: 10px;font-size: 14px;">爱贝源冲奶机</span>' +
+                                    '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                     '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
                                     '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
@@ -340,6 +341,7 @@
                  var produce = getProduce(machineId);
                  var producePattern =  produce.producePattern;    //获取产品型号前两位
                  var produceModel =  produce.produceModel;        //获取产品型号后两位
+                 var produceName = produce.produceName;            //获取产品名称
 
                 for (var i=0;i<settingNumber;i++){
                     code128(machineBarcode);
@@ -359,7 +361,7 @@
 
                     if(machineProduceType == 1){//净水机模板
                         $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                '<span style="position: absolute;left: 10px;font-size: 14px;">aiberle可移动智能净水机</span>' +
+                                '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
                                 '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                 '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
                                 '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
@@ -370,7 +372,7 @@
                     }
                     if(machineProduceType == 2){//冲奶机模板
                         $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                '<span style="position: absolute;left: 10px;font-size: 14px;">爱贝源冲奶机</span>' +
+                                '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
                                 '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                 '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
                                 '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
@@ -411,6 +413,7 @@
                             produce.producePattern = data.producePattern;
                             produce.produceModel = data.produceModel;
                             produce.produceFeature = data.produceFeature;
+                            produce.produceName = data.produceName;
                         }
                     },
                     error: function(){