净水机二维码生成修改

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -609,6 +609,7 @@ public class AdminMachineController {
     }
 
 
+    private String producePattern = "WA";//产品型号
     private String productModel = "1X";//产品型号
     private String productFeatures = "A";//产品特性
     private String softwareVersion = "30";//软件版本
@@ -623,10 +624,11 @@ public class AdminMachineController {
         if (month < 10) {
             months = "0" + months;
         }
+        producePattern = produce.getProducePattern();
         productModel = produce.getProduceModel();
         productFeatures = produce.getProduceFeature();
         //拼接
-        String barcode = productModel + productFeatures + softwareVersion + String.valueOf(year).substring(2, 4) + months;
+        String barcode = producePattern + productModel + productFeatures +  String.valueOf(year).substring(2, 4) + months;
         return barcode;
     }