Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

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

@@ -718,46 +718,64 @@ public class AdminMachineController {
         String num = null;
         for (int i = 0; i < number; i++) {
             machineNumber++;
-            switch (String.valueOf(machineNumber).length()) {
-                case 0:
-                    num = "00001";
-                    break;
-                case 1:
-                    num = "0000" + String.valueOf(machineNumber);
-                    break;
-                case 2:
-                    num = "000" + String.valueOf(machineNumber);
-                    break;
-                case 3:
-                    num = "00" + String.valueOf(machineNumber);
-                    break;
-                case 4:
-                    num = "00" + String.valueOf(machineNumber);
-                    break;
-                case 5:
-                    num = String.valueOf(machineNumber);
-                    break;
-            }
             String qrCodeUrl = null;
             //判断机器是水机or牙刷
             if(productType == 3){
+                switch (String.valueOf(machineNumber).length()) {
+                    case 0:
+                        num = "00001";
+                        break;
+                    case 1:
+                        num = "0000" + String.valueOf(machineNumber);
+                        break;
+                    case 2:
+                        num = "000" + String.valueOf(machineNumber);
+                        break;
+                    case 3:
+                        num = "00" + String.valueOf(machineNumber);
+                        break;
+                    case 4:
+                        num = "00" + String.valueOf(machineNumber);
+                        break;
+                    case 5:
+                        num = String.valueOf(machineNumber);
+                        break;
+                }
                 //获取项目地址
                 WebApplicationContext webApplicationContext = ContextLoader.getCurrentWebApplicationContext();
                 ServletContext servletContext = webApplicationContext.getServletContext();
                 String realPath = servletContext.getRealPath(ResultInfo.QRCODE_TOOTH_IMAGE);
-                boolean bl = false;
+
                 try {
-                    bl = QrCodeUtil.createQrCode(scanningQrCode+berQrcode+num,realPath+"/"+berQrcode+num+".",430,430);
+                    QrCodeUtil.createQrCode(scanningQrCode+berQrcode+num,realPath+"/"+berQrcode+num+".",430,430);
+                    StringBuffer url = request.getRequestURL();
+                    //String tempContextUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).append(request.getContextPath()).append("/").toString();
+                    String tempContextUrl = ResultInfo.ROOT_DIRECTORY;
+                    qrCodeUrl = tempContextUrl +ResultInfo.QRCODE_TOOTH_IMAGE+ "/"+berQrcode+num+".png";
                 }catch (Exception e){
                     e.printStackTrace();
                 }
-                    if(bl){
-                        StringBuffer url = request.getRequestURL();
-                        //String tempContextUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).append(request.getContextPath()).append("/").toString();
-                        String tempContextUrl = ResultInfo.ROOT_DIRECTORY;
-                        qrCodeUrl = tempContextUrl +ResultInfo.QRCODE_TOOTH_IMAGE+ "/"+berQrcode+num+".png";
-                    }
+
+
+
             }else{
+                switch (String.valueOf(machineNumber).length()) {
+                    case 0:
+                        num = "0001";
+                        break;
+                    case 1:
+                        num = "000" + String.valueOf(machineNumber);
+                        break;
+                    case 2:
+                        num = "00" + String.valueOf(machineNumber);
+                        break;
+                    case 3:
+                        num = "0" + String.valueOf(machineNumber);
+                        break;
+                    case 4:
+                        num = String.valueOf(machineNumber);
+                        break;
+                }
                   /*获取公众号信息*/
                 WechatMp wechatMp = produceService.getWechatMpById(produce.getWechatMpId());
                 String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix + berQrcode + num);

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

@@ -348,7 +348,7 @@ public class MachineController {
 
 
     /**
-     * 根据barcode查询机器信息
+     * 根据barcode查询机器信息（电动牙刷项目也调用此功能）
      * @param request
      * @return
      */
@@ -365,6 +365,10 @@ public class MachineController {
             rsj.addResponseKeyValue("isBeing",1);
             rsj.addResponseKeyValue("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
             rsj.addResponseKeyValue("producedTime",ptsMachine.getMachineProducedTime() == null?null:ptsMachine.getMachineProducedTime().getTime());
+            rsj.addResponseKeyValue("productId",ptsMachine.getMachineProduceId());//产品id
+            /*rsj.addResponseKeyValue("producePattern",ptsMachine.getProducePattern());//产品型号前俩位
+            rsj.addResponseKeyValue("produceModel",ptsMachine.getProduceModel());//产品型号后俩位
+            rsj.addResponseKeyValue("produceName",ptsMachine.getProduceName());//产品名*/
         }else{
             rsj.addResponseKeyValue("isBeing",2);
         }