售后流程修改

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/InventoryService.java

@@ -27,4 +27,8 @@ public interface InventoryService {
      * @return
      */
     InventoryInfo getByInventoryByBar(String inventoryProductBar);
+    /**
+     * 新增
+     */
+    Integer insert(InventoryInfo inventoryInfo);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/InventoryServiceImpl.java

@@ -43,4 +43,9 @@ public class InventoryServiceImpl implements InventoryService {
     public InventoryInfo getByInventoryByBar(String inventoryProductBar) {
         return inventoryMapper.getByInventoryByBar(inventoryProductBar);
     }
+
+    @Override
+    public Integer insert(InventoryInfo inventoryInfo) {
+        return inventoryMapper.insert(inventoryInfo);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/InventoryMapper.java

@@ -28,4 +28,8 @@ public interface InventoryMapper {
      * 获取库存信息列表
      */
     Integer updateById(InventoryInfo inventoryInfo);
+    /**
+     * 新增
+     */
+    Integer insert(InventoryInfo inventoryInfo);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -38,13 +38,18 @@
       pi.product_name productName,
       ci.color_name colorName,
       cci.customer_create_time customerCreateTime,
-	  oi.sales_pay_time salesPayTime
+	  oi.sales_pay_time salesPayTime,
+	  cpm.proc_method_name procMethodName,
+      cpt.proc_type_name procTypeName
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
     LEFT JOIN tb_rst_cm_customer_info cci on cci.customer_id = cd.customer_id
     LEFT JOIN tb_rst_sales_order_info oi on oi.sales_customer_id = cci.customer_id
+    LEFT JOIN tb_rst_cm_relation cr ON cd.customer_id = cr.customer_id
+    LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
+    LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
     where detect_id = #{detectId,jdbcType=INTEGER}
     GROUP BY cci.customer_id
   </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/inventoryMapper.xml

@@ -202,4 +202,30 @@
     where fi.inventory_product_bar = #{inventoryProductBar}
   </select>
 
+  <insert id="insert" parameterType="InventoryInfo">
+    insert INTO tb_rst_fm_inventory
+    (inventory_id,
+    inventory_product_name,
+    inventory_product_bar,
+    inventory_remaining_num,
+    inventory_state,
+    inventory_desc,
+    inventory_product_color_id,
+    inventory_good_product_num,
+    inventory_defective_product_num,
+    inventory_recent_record)
+     VALUES
+      (
+      #{inventoryId},
+    #{inventoryProductName},
+    #{inventoryProductBar},
+    #{inventoryRemainingNum},
+    #{inventoryState},
+    #{inventoryDesc},
+    #{inventoryProductColorId},
+    #{inventoryGoodProductNum},
+    #{inventoryDefectiveProductNum},
+    #{inventoryRecentRecord}
+    )
+  </insert>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -221,6 +221,24 @@ public class AdminDetectController {
         mv.addObject("detectinfo",detectinfo);
         return mv;
     }
+
+    /**
+     * 跳转到检测详情页面
+     *
+     * @return
+     */
+    @RequiresPermissions("info:update:info")
+    @RequestMapping(value = "/to_detail")
+    public ModelAndView toAddDetail(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/inspection/detect_detail");
+        String detectId = request.getParameter("detectId");
+        if(detectId == null || detectId.equals("")){
+            return mv;
+        }
+        ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
+        mv.addObject("detectinfo",detectinfo);
+        return mv;
+    }
     /**
      * 跳转到添加修改转入信息页面
      *

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

@@ -253,14 +253,14 @@ public class InventoryController {
             InventoryInfo inventoryInfo = new InventoryInfo();
             inventoryInfo.setInventoryProductName(product.getProductName());
             inventoryInfo.setInventoryProductBar(productColor.getColorBar());
-            inventoryInfo.setInventoryRemainingNum(0);
+            inventoryInfo.setInventoryRemainingNum(10000);
             inventoryInfo.setInventoryState(1);
             inventoryInfo.setInventoryProductColorId(productColor.getColorId());
             inventoryInfo.setInventoryGoodProductNum(0);
             inventoryInfo.setInventoryDefectiveProductNum(0);
-
+            inventoryService.insert(inventoryInfo);
         }
-        return "";
+        return "true";
     }
 
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_detail.ftl

@@ -0,0 +1,326 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+
+        #suggest, #suggest2 {width:200px}
+        .gray {color:gray}
+        .ac_results {background:#fff;border:1px solid #7f9db9;position: absolute;z-index: 10000;display: none}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_over, .ac_results li a:hover {background:#c8e3fc}
+        .ac_results li a span {float:right}
+        .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
+
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .dalog-ask .ask{color: #000;margin: 10px 0 5px 0;}
+        .dalog-ask .answer{color: #666;margin-bottom: 10px;}
+        .dalog-ask .answer:hover{color: #32a3d8;cursor: pointer;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list .red{display: inline-block; padding: 2px; background: red;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
+        .txt-red{color:red}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+    </style>
+    <title>订单详细信息</title>
+</head>
+<body>
+
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">/</span> 维修管理
+    <span class="c-gray en">/</span> 维修详情
+    <a class="btn radius r"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
+</nav>
+
+
+<article class="cl pd-20">
+    <form action="" method="post" class="form form-horizontal" id="form-article-add">
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">维修详细信息</div>
+            </label>
+            <div class="formControls col-9">
+            </div>
+        </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">维修编号：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectNumber!''}</span></td>
+                <td width="10"></td>
+                <th width="10">产品名称：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.productName!''}（${detectinfo.colorName!''}）</span></td>
+            </tr>
+            <tr>
+                <th width="10">是否可翻新：</th>
+                <td width="10" style="font-weight: normal;">
+                <#if detectinfo.detectRenovation == 1>
+                    可翻新
+                <#elseif detectinfo.detectRenovation == 2>
+                    不可翻新
+                </#if>
+                </span></td>
+                <td width="10"></td>
+                <th width="10">是否有故障：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if detectinfo.isMaintenance == 1>
+                    有故障
+                <#elseif detectinfo.isMaintenance == 2>
+                    无故障
+                </#if>
+                </span></td>
+            </tr>
+            <tr>
+                <th width="10">当前状态：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if detectinfo.detectState == 1>
+                            <span class="c-red">待检测机器(${detectinfo.maintenanceCutTime?string("yyyy/MM/dd")}前完成)</span>
+                </#if>
+                        <#if detectinfo.detectState == 30>
+                            待用户确认
+                        </#if>
+                        <#if detectinfo.detectState == 31>
+                            <span class="c-red">待维修</span>
+                        </#if>
+                        <#if detectinfo.detectState == 32>
+                            <span class="c-success">维修完成</span>
+                        </#if>
+                        <#if detectinfo.detectState == 33>
+                            <span class="c-success">用户不维修（原机退回）</span>
+                        </#if>
+                        <#if detectinfo.detectState == 34>
+                            待客服确认维修
+                        </#if>
+                        <#if detectinfo.detectState == 35>
+                            <span class="c-red">待维修</span>
+                        </#if>
+                        <#if detectinfo.detectState == 36>
+                            <span class="c-success">维修完成</span>
+                        </#if>
+                        <#if detectinfo.detectState == 37>
+                            机器无故障，原机退回
+                        </#if>
+                        <#if detectinfo.detectState == 38>
+                            机器故障，待用户确认
+                        </#if>
+                        <#if detectinfo.detectState == 20>
+                            待翻新入库
+                        </#if>
+                        <#if detectinfo.detectState == 21>
+                        <span class="c-success">已翻新入库</span>
+                        </#if>
+                        <#if detectinfo.detectState == 22>
+                            不能翻新，待报废
+                        </#if>
+                        <#if detectinfo.detectState == 23>
+                            <span class="c-success">已报废回收</span>
+                        </#if>
+                </span></td>
+                <td width="10"></td>
+                <th width="10">维修报价：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectOffer??>${detectinfo.detectOffer/100}<#else>-</#if></span></td>
+            </tr>
+            <tr>
+                <th width="10">生产月份：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectProduction!''}</span></td>
+                <td width="10"></td>
+                <th width="10">机身条码：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectFuselageBarcode!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">厚膜类型：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if detectinfo.detectFilmType??>
+                    <#if detectinfo.detectFilmType == 1>
+                        圆
+                    <#elseif detectinfo.detectFilmType == 2>
+                        扁
+                    </#if>
+                </#if>
+                </span></td>
+                <td width="10"></td>
+                <th width="10">浮子类型：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if detectinfo.detectFloatType??>
+                    <#if detectinfo.detectFloatType == 1>
+                        长
+                    <#elseif detectinfo.detectFloatType == 2>
+                        短
+                    </#if>
+                </#if>
+                </span></td>
+            </tr>
+            <tr>
+                <th width="10">版本号：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectVersionNumber!''}</span></td>
+                <td width="10"></td>
+                <th width="10">是否翻新机：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if detectinfo.detectIsRefurbishing??>
+                    <#if detectinfo.detectIsRefurbishing == 1>
+                        是
+                    <#elseif detectinfo.detectIsRefurbishing == 2>
+                        否
+                    </#if>
+                </#if>
+                </span></td>
+            </tr>
+            <tr>
+                <th width="10">QC检测结果：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if detectinfo.maintenanceResults??>
+                    <#if detectinfo.maintenanceResults == 1>
+                        通过
+                    <#elseif detectinfo.maintenanceResults == 2>
+                        不通过
+                    </#if>
+                </#if></span></td>
+                <td width="10"></td>
+                <th width="10">检测日期：</th>
+                <td width="10" style="font-weight: normal;"><span>${(detectinfo.detectDate?string("yyyy-MM-dd"))!''}</span></td>
+            </tr>
+            </thead>
+        </table>
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    客诉信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">客诉处理：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.customerId??>${detectinfo.procTypeName!''}-${detectinfo.procMethodName!''}</#if></span></td>
+                <td width="10"></td>
+                <th width="10">客诉描述：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.questionTitle!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">客服备注：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectCustomerDesc!''}</span></td>
+                <td width="10"></td>
+                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span></span></td>
+            </tr>
+            </thead>
+        </table>
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    检测信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">检测现象：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectPhenomenon!''}</span></td>
+                <td width="10"></td>
+                <th width="10">故障分类：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectClassification!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">故障原因：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectFailureCause!''}</span></td>
+                <td width="10"></td>
+                <th width="10">判定结果：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectResults!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">故障指向：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectPoint!''}</span></td>
+                <td width="10"></td>
+                <th width="10">原因分析：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectNalysis!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">维修记录：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectContent!''}</span></td>
+                <td width="10"></td>
+                <th width="10">备注：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectDesc!''}</span></td>
+            </tr>
+            </thead>
+        </table>
+
+
+         <#--<button type="button" style="cursor:pointer;height: 35px;margin-top: 10px;"onClick="" class="my-btn-search"><<返回</button>-->
+    </form>
+    </div>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.parse.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    $(function(){
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+        $("#province").ProvinceCity();
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+        $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
+            console.log($(this)[0].value);
+            //		$("#city2").click()
+        },
+            attachObject:'#suggest'
+        });
+    });
+    /*查看物流*/
+    function openLogistics(title, url, w, h) {
+        layer_show(title,url,w,h);
+    }
+
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -247,6 +247,10 @@
                            onclick="add_remark('QC检测','${path}/admin/detect/to_add_QC?detectId=${detect.detectId!''}','570','450');">
                             <i class="Hui-iconfont">QC检测</i>
                         </a><br>
+                        <a style="text-decoration:none" href="javascript:;" title="详情"
+                           onclick="detail('${path}/admin/detect/to_detail?detectId=${detect.detectId!''}');">
+                            <i class="Hui-iconfont">详情</i>
+                        </a><br>
                         <#--<a style="text-decoration:none" href="javascript:;" title="删除"
                            onclick="detele(${detect.detectId!''});">
                             <i class="Hui-iconfont">&#xe609;</i>
@@ -527,6 +531,10 @@
     function update_info(title,url,w,h){
         layer_show(title,url,w,h);
     }
+    /*详情*/
+    function detail(url){
+        location.href = url;
+    }
     /**
      * 进入查询问题描述信息页面
      */

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

@@ -76,7 +76,7 @@
                     <td class="text-c" style="font-size: 24px" width="10">${list.machineBarcode?substring(list.machineBarcode?length-5) }</td>
                     <td class="text-c" width="10">${list.machineBarcode }</td>
                     <td class="text-c" width="6">
-                    ${list.produceName }/${list.producePattern }-${list.produceModel }
+                        ${list.produceName }/${list.producePattern }-${list.produceModel }
                     </td>
                     <td>${(list.machineCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
                     <!-- 遍历操作 -->
@@ -104,7 +104,7 @@
     <input type="hidden" value="" name="codeId" id="codeId">
     <div style="position: absolute;top: 80px;height: 23px;display:none;" id="bcTarget" class="barcodeImg"></div>
     <div>
-        <div id="printlist" style="margin-left: 31px;">
+        <div id="printlist" style="margin-left: 55px;">
         </div>
     </div>
 </div>
@@ -175,8 +175,8 @@
         var prints = "";
         var settingNumber = $("#settingNumber").val();
         var selectNum = $("#listid").find("input[name='checkbox']:checked").length;
-        if(selectNum > 50){
-            layer.msg('每次打印条数最多可支持50条', {icon: 2, time: 2000});
+        if(selectNum > 30){
+            layer.msg('每次打印条数最多可支持30条', {icon: 2, time: 2000});
             return;
         }
         $("input[name='checkbox']:checkbox:checked").each(function (index,element) {
@@ -187,14 +187,33 @@
             machineQrcode = $("#machineQrcode"+machineId).val();
             machineCreateTime = $("#machineCreateTime"+machineId).val();
             machineProduceType = $("#machineProduceType"+machineId).val();
+            var produce = getProduce(machineId);
+            var producePattern =  produce.producePattern;    //获取产品型号前两位
+            var produceModel =  produce.produceModel;        //获取产品型号后两位
+            var produceName = produce.produceName;            //获取产品名称
+            var produceBrand = produce.produceBrand;            //获取品牌字母
             /*if((index+1)%10 == 0){
                 num = parseInt(num) + 1;
-            }*/
-            $("#printlist").append('<div style="width: 158px;height: 188px;position: relative;/*position: relative;margin-bottom: 4px;*/"> ' +
+            }*//*
+
+            $("#printlist").append('<div style="width: 158px;height: 188px;position: relative;/!*position: relative;margin-bottom: 4px;*!/"> ' +
                     '<span style="position: absolute;margin-left: 26px;z-index: 99;margin-top: 15px;font-size: 16px;">产品唯一码</span>' +
                     '<img style="position: absolute; width: 130px;height: 128px;margin-top: 24px;" src="'+machineQrcode+'" />' +
                     '<span style="position: absolute;margin-left: 20px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
-                    '</div>');
+                    '</div>');*/
+            if(produceName === "上朵Lips系列便携声波牙刷（贝母白）" ||produceName === "上朵Lips系列便携声波牙刷（樱花粉）" ||produceName === "上朵Lips系列便携声波牙刷（幻影黑）"){
+                $("#printlist").append('<div style="width: 160px;height: 151px;position: relative;"> ' +
+                        '<span style="position: absolute;margin-left: 15px;z-index: 99;font-size: 16px;margin-top: 2px;">产品唯一码</span>' +
+                        '<img style="position: absolute; width: 110px;height: 110px;margin-top: 12px;" src="'+machineQrcode+'" />' +
+                        '</div>');
+            }else{
+                $("#printlist").append('<div style="width: 158px;height: 188px;position: relative;"> ' +
+                        '<span style="position: absolute;margin-left: 26px;z-index: 99;margin-top: 15px;font-size: 16px;">产品唯一码</span>' +
+                        '<img style="position: absolute; width: 130px;height: 128px;margin-top: 24px;" src="'+machineQrcode+'" />' +
+                        '<span style="position: absolute;margin-left: 20px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
+                        '</div>');
+            }
+
 
             if(${machineIsPrint} == '1')
             {
@@ -317,11 +336,23 @@
         var machineCreateTime = $("#machineCreateTime"+machineId).val();
         var  machineBarcode = barCode;
         var machineQrcode = $("#machineQrcode"+machineId).val();
-        $("#printlist").append('<div style="width: 158px;height: 188px;position: relative;/*position: relative;margin-bottom: 4px;*/"> ' +
-                '<span style="position: absolute;margin-left: 26px;z-index: 99;margin-top: 15px;font-size: 16px;">产品唯一码</span>' +
-                '<img style="position: absolute; width: 130px;height: 128px;margin-top: 24px;" src="'+machineQrcode+'" />' +
-                '<span style="position: absolute;margin-left: 20px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
-                '</div>');
+        var produce = getProduce(machineId);
+        var producePattern =  produce.producePattern;    //获取产品型号前两位
+        var produceModel =  produce.produceModel;        //获取产品型号后两位
+        var produceName = produce.produceName;            //获取产品名称
+        var produceBrand = produce.produceBrand;            //获取品牌字母
+        if(produceName === "上朵Lips系列便携声波牙刷（贝母白）" || produceName === "上朵Lips系列便携声波牙刷（樱花粉）" || produceName === "上朵Lips系列便携声波牙刷（幻影黑）"){
+            $("#printlist").append('<div style="width: 160px;height: 154px;position: relative;"> ' +
+                    '<span style="position: absolute;margin-left: 15px;z-index: 99;font-size: 16px;margin-top: 2px;">产品唯一码</span>' +
+                    '<img style="position: absolute; width: 110px;height: 110px;margin-top: 12px;" src="'+machineQrcode+'" />' +
+                    '</div>');
+        }else{
+            $("#printlist").append('<div style="width: 158px;height: 188px;position: relative;"> ' +
+                    '<span style="position: absolute;margin-left: 26px;z-index: 99;margin-top: 15px;font-size: 16px;">产品唯一码</span>' +
+                    '<img style="position: absolute; width: 130px;height: 128px;margin-top: 24px;" src="'+machineQrcode+'" />' +
+                    '<span style="position: absolute;margin-left: 20px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
+                    '</div>');
+        }
         if(${machineIsPrint} == '1')
         {
             updatePrint(machineBarcode,false);