更改博乐宝的条码打印规则：

通过品牌+型号来生产条码前缀

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

@@ -114,11 +114,11 @@ public class MachineBarQrcode {
             berQrcode = randomBarCode(produce);
         }else if(produce.getBerGenerateRules() == 3){
             // 博乐宝水机生产规则
-            String model = produce.getProducePattern() + produce.getProduceModel();
+            String model = produce.getProduceBrand() + produce.getProducePattern() + produce.getProduceModel();
             berQrcode =  generationBarCode(num,model);
         }else if(produce.getBerGenerateRules() == 4){
             // 博乐宝滤芯生成规则
-            String model = produce.getProducePattern() + produce.getProduceModel();
+            String model = produce.getProduceBrand() + produce.getProducePattern() + produce.getProduceModel();
             berQrcode =  generationElementBarCode(num,model);
         }
 
@@ -272,7 +272,7 @@ public class MachineBarQrcode {
         }
         int num = (Integer.valueOf(nums[4]) + Integer.valueOf(nums[2]) + Integer.valueOf(nums[0])) * 5 + (Integer.valueOf(nums[3]) + Integer.valueOf(nums[1])) * 3;
         double checkCode = Math.ceil((double)num / 10) * 10 - num;
-        barcode = model + PRODUCTCODEMODEL + dateMonthYear + serialNumber + (int)checkCode;
+        barcode = model + dateMonthYear + serialNumber + (int)checkCode;
         return barcode;
     }