售后流程修改

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -148,6 +148,7 @@ public class SalesOrder implements Serializable {
     private Integer sendTheGoods;//待发货数量
     private Integer playSingle;//待打单数量
     private Integer outbound;//待出库数量
+    private String salesPostFirmName;//快递公司名称
 
     private List<ComplaintDetectInfo> complaintDetectInfoList;
     public Integer getSalesOldOrderStatus() {
@@ -876,4 +877,12 @@ public class SalesOrder implements Serializable {
     public void setComplaintDetectInfoList(List<ComplaintDetectInfo> complaintDetectInfoList) {
         this.complaintDetectInfoList = complaintDetectInfoList;
     }
+
+    public String getSalesPostFirmName() {
+        return salesPostFirmName;
+    }
+
+    public void setSalesPostFirmName(String salesPostFirmName) {
+        this.salesPostFirmName = salesPostFirmName;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintAfterSalesNum.java

@@ -13,6 +13,8 @@ public class ComplaintAfterSalesNum implements Serializable{
     private Integer completeProcessing;//完成处理
     private Integer placeOrderNum;//原机退回,待下单
     private Integer detectplaceOrderNum;//维修完成,待下单
+    private Integer maintenanceCutTimeNum;//超过最晚完成检测时间
+    private Integer completeCutTimeNum;//超过最晚完成维修时间
 
     public Integer getTodaysignNum() {
         return todaysignNum;
@@ -85,4 +87,20 @@ public class ComplaintAfterSalesNum implements Serializable{
     public void setDetectplaceOrderNum(Integer detectplaceOrderNum) {
         this.detectplaceOrderNum = detectplaceOrderNum;
     }
+
+    public Integer getMaintenanceCutTimeNum() {
+        return maintenanceCutTimeNum;
+    }
+
+    public void setMaintenanceCutTimeNum(Integer maintenanceCutTimeNum) {
+        this.maintenanceCutTimeNum = maintenanceCutTimeNum;
+    }
+
+    public Integer getCompleteCutTimeNum() {
+        return completeCutTimeNum;
+    }
+
+    public void setCompleteCutTimeNum(Integer completeCutTimeNum) {
+        this.completeCutTimeNum = completeCutTimeNum;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintDetectInfo.java

@@ -93,7 +93,7 @@ public class ComplaintDetectInfo implements Serializable {
     private String[] configli6;//维修配件集合
 
     private Integer adminId;//登录人id
-    private String adminName;//登录人名称
+    private String adminName;//客服名称
 
     private String startTime;
     private String endTime;

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -515,11 +515,17 @@
         and cd.detect_state in(32,33,36,37)
       </if>
       <if test="afterState != null and afterState == 7">
-        and cd.detect_state in(33,37) and cd.detect_placeorder = 1 AND maintenance_results = 1
+        and cd.detect_state in(33,37) and cd.detect_placeorder = 1
       </if>
       <if test="afterState != null and afterState == 8">
         and cd.detect_state in(32,36) and cd.detect_placeorder = 1 AND maintenance_results = 1
       </if>
+      <if test="afterState != null and afterState == 9">
+        and cd.maintenance_cut_time &lt; now()
+      </if>
+      <if test="afterState != null and afterState == 10">
+        and cd.complete_cut_time &lt; now()
+      </if>
       <if test="warehouseDate != null">
         and cs.signclosed_date = #{warehouseDate}
       </if>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -50,12 +50,14 @@
       	trsi.store_efast  storeEfast,
         trsi.store_name  storeName,
         ci.customer_is_solve customerIsSolve,
-        od.batch_create_time  batchCreateTime
+        od.batch_create_time  batchCreateTime,
+        li.logistics_name  salesPostFirmName
     from tb_rst_sales_order_info t
     LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
     LEFT JOIN tb_rst_store_info trsi ON t.sales_store_id = trsi.store_id
      LEFT JOIN tb_rst_order_batch od ON t.sales_batch_id = od.batch_id
     LEFT JOIN tb_rst_cm_customer_info ci ON t.sales_customer_id = ci.customer_id
+    LEFT JOIN tb_rst_logistics_info li ON t.sales_post_firm = li.logistics_rst_code
     where sales_id = #{salesId}
   </select>
 

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

@@ -323,9 +323,24 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
     public boolean customerConfirm(ComplaintDetectInfo detectInfo,Admin admin) {
         ComplaintDetectInfo detect = complaintDetectInfoMapper.getDetectById(detectInfo.getDetectId());
         /*ProcMethod procMethod = procMethodMapper.getProcMethodById(detectInfo.getProcMethodId());*/
+        //计算待维修完成时间
         Calendar date = Calendar.getInstance();
         date.setTime(new Date());
-        date.set(Calendar.DATE, date.get(Calendar.DATE) + 5);
+        boolean fl = false;
+        for (int i = 1 ; i <= 5; i++){
+            date.set(Calendar.DATE, date.get(Calendar.DATE) + i);
+            int week = date.get(Calendar.DAY_OF_WEEK);//1--7的值,对应：星期日，星期一，星期二，星期三....星期六
+            if(week == 1){
+                fl = true;
+            }
+            date.set(Calendar.DATE, date.get(Calendar.DATE) - i);
+        }
+        if(fl){
+            date.set(Calendar.DATE, date.get(Calendar.DATE) + 6);
+        }else{
+            date.set(Calendar.DATE, date.get(Calendar.DATE) + 5);
+        }
+
         switch (detectInfo.getDetectState()){
             case 30:
                 if(detectInfo.getDetectProcessingResults() == 1){//付费维修

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

@@ -30,10 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedInfoService {
@@ -260,6 +257,23 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                                     detectInfo.setDetectRenovation(0);
                                     detectInfo.setDetectProcessingResults(0);
                                     detectInfo.setSignclosedId(infos.getSignclosedId());
+                                    Calendar date = Calendar.getInstance();
+                                    date.setTime(new Date());
+                                    boolean fl = false;
+                                    for (int i = 1 ; i <= 3; i++){
+                                        date.set(Calendar.DATE, date.get(Calendar.DATE) + i);
+                                        int week = date.get(Calendar.DAY_OF_WEEK);//1--7的值,对应：星期日，星期一，星期二，星期三....星期六
+                                        if(week == 1){
+                                            fl = true;
+                                        }
+                                        date.set(Calendar.DATE, date.get(Calendar.DATE) - i);
+                                    }
+                                    if(fl){
+                                        date.set(Calendar.DATE, date.get(Calendar.DATE) + 4);
+                                    }else{
+                                        date.set(Calendar.DATE, date.get(Calendar.DATE) + 3);
+                                    }
+                                    detectInfo.setMaintenanceCutTime(date.getTime());
                                     try {
                                         complaintDetectInfoMapper.insert(detectInfo);
                                         if(type == 1){//客服关联客诉才发送通知短信
@@ -307,6 +321,23 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                             detectInfo.setDetectRenovation(0);
                             detectInfo.setDetectProcessingResults(0);
                             detectInfo.setSignclosedId(sigInfo.getSignclosedId());
+                            Calendar date = Calendar.getInstance();
+                            date.setTime(new Date());
+                            boolean fl = false;
+                            for (int i = 1 ; i <= 3; i++){
+                                date.set(Calendar.DATE, date.get(Calendar.DATE) + i);
+                                int week = date.get(Calendar.DAY_OF_WEEK);//1--7的值,对应：星期日，星期一，星期二，星期三....星期六
+                                if(week == 1){
+                                    fl = true;
+                                }
+                                date.set(Calendar.DATE, date.get(Calendar.DATE) - i);
+                            }
+                            if(fl){
+                                date.set(Calendar.DATE, date.get(Calendar.DATE) + 4);
+                            }else{
+                                date.set(Calendar.DATE, date.get(Calendar.DATE) + 3);
+                            }
+                            detectInfo.setMaintenanceCutTime(date.getTime());
                             try {
                                 complaintDetectInfoMapper.insert(detectInfo);
                             } catch (Exception e) {

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

@@ -35,6 +35,7 @@
       maintenance_results maintenanceResults,
       detect_number detectNumber,
       complete_cut_time completeCutTime,
+      maintenance_cut_time maintenanceCutTime,
       cd.signclosed_id signclosedId,
       pi.product_name productName,
       ci.color_name colorName,
@@ -108,6 +109,7 @@
     cd.maintenance_results maintenanceResults,
     cd.detect_number detectNumber,
     cd.complete_cut_time completeCutTime,
+    maintenance_cut_time maintenanceCutTime,
     qd.describe_title questionTitle,
     pi.product_name productName,
     pi.product_abbreviation productAbbreviation,
@@ -205,13 +207,13 @@
         AND cs.signclosed_date = #{signclosedDate}
       </if>
       <if test="startTime != null and startTime != ''" >
-        AND cd.detect_create_time &gt; #{startTime}
+        AND cs.signclosed_date &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != ''" >
-        AND cd.detect_create_time  &lt; #{endTime}
+        AND cs.signclosed_date  &lt;= #{endTime}
       </if>
       <if test="todayTime != null and todayTime != ''" >
-        AND to_days(cd.detect_create_time) = to_days(now())
+        AND to_days(cs.signclosed_date) = to_days(now())
       </if>
       <if test="detectIsPrint != null and detectIsPrint != ''" >
         AND cd.detect_is_print  = #{detectIsPrint}
@@ -398,7 +400,8 @@
     detect_version_number,
     detect_is_refurbishing,
     maintenance_results,
-    detect_number
+    detect_number,
+    maintenance_cut_time
     )
     values
       (
@@ -430,7 +433,8 @@
       #{detectVersionNumber},
       #{detectIsRefurbishing},
       #{maintenanceResults},
-      #{detectNumber}
+      #{detectNumber},
+      #{maintenanceCutTime}
       )
   </insert>
 
@@ -582,15 +586,17 @@
   </select>
 
     <select id="getCustomerDetectNum" parameterType="ComplaintDetectInfo" resultType="ComplaintAfterSalesNum">
-        SELECT
-            sum(CASE WHEN detect_state = 1 then 1 else 0 end) AS beDetected,
-            sum(CASE WHEN detect_state in(30,34,38) then 1 else 0 end) AS beConfirmed,
-            sum(CASE WHEN detect_state in(32,33,36,37) then 1 else 0 end) AS completeProcessing,
-            sum(CASE WHEN (detect_state = 37 and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS placeOrderNum,
-            sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS detectplaceOrderNum
-        FROM
-            tb_rst_complaint_detect cd
-        LEFT JOIN tb_rst_cm_customer_info ci ON ci.customer_id = cd.customer_id
+      SELECT
+      sum(CASE WHEN detect_state = 1 then 1 else 0 end) AS beDetected,
+      sum(CASE WHEN detect_state in(30,34,38) then 1 else 0 end) AS beConfirmed,
+      sum(CASE WHEN detect_state in(32,33,36,37) then 1 else 0 end) AS completeProcessing,
+      sum(CASE WHEN (detect_state = 37 and detect_placeorder = 1) then 1 else 0 end) AS placeOrderNum,
+      sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS detectplaceOrderNum,
+      sum(CASE WHEN (maintenance_cut_time &lt; now()) then 1 else 0 end) AS maintenanceCutTimeNum,
+      sum(CASE WHEN (complete_cut_time &lt; now()) then 1 else 0 end) AS completeCutTimeNum
+      FROM
+      tb_rst_complaint_detect cd
+      LEFT JOIN tb_rst_cm_customer_info ci ON ci.customer_id = cd.customer_id
         <where>
             <if test="adminId != null and adminId != ''" >
                 AND ci.admin_id = #{adminId}
@@ -634,6 +640,7 @@
         cd.maintenance_results maintenanceResults,
         cd.detect_number detectNumber,
         cd.complete_cut_time completeCutTime,
+        cd.maintenance_cut_time maintenanceCutTime,
         qd.describe_title questionTitle,
         pi.product_name productName,
         pi.product_abbreviation productAbbreviation,

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

@@ -2607,12 +2607,16 @@ public class AdminCustomerController {
             complaintAfterSalesNum.setCompleteProcessing(0);
             complaintAfterSalesNum.setPlaceOrderNum(0);
             complaintAfterSalesNum.setDetectplaceOrderNum(0);
+            complaintAfterSalesNum.setMaintenanceCutTimeNum(0);
+            complaintAfterSalesNum.setCompleteCutTimeNum(0);
         }else{
             complaintAfterSalesNum.setBeDetected(afterSalesNum.getBeDetected());
             complaintAfterSalesNum.setBeConfirmed(afterSalesNum.getBeConfirmed());
             complaintAfterSalesNum.setCompleteProcessing(afterSalesNum.getCompleteProcessing());
             complaintAfterSalesNum.setPlaceOrderNum(afterSalesNum.getPlaceOrderNum());
             complaintAfterSalesNum.setDetectplaceOrderNum(afterSalesNum.getDetectplaceOrderNum());
+            complaintAfterSalesNum.setMaintenanceCutTimeNum(afterSalesNum.getMaintenanceCutTimeNum());
+            complaintAfterSalesNum.setCompleteCutTimeNum(afterSalesNum.getCompleteCutTimeNum());
         }
         /*查询维修数据 end*/
         /*查询签收数据 state*/

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

@@ -117,12 +117,12 @@ public class AdminDetectController {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
-        Calendar date = Calendar.getInstance();
+        /*Calendar date = Calendar.getInstance();
         for (ComplaintDetectInfo info : result.getDataList()){
             date.setTime(info.getDetectCreateTime());
             date.set(Calendar.DATE, date.get(Calendar.DATE) + 6);
             info.setMaintenanceCutTime(date.getTime());
-        }
+        }*/
         //获取所有产品类型
         ProductType productType = new ProductType();
         List<ProductType> productTypeList = productService.listProductType(productType);
@@ -163,6 +163,25 @@ public class AdminDetectController {
         detectInfo.setIsMaintenance(0);
         detectInfo.setDetectRenovation(0);
         detectInfo.setDetectProcessingResults(0);
+        Calendar date = Calendar.getInstance();
+        date.setTime(new Date());
+        boolean fl = false;
+        for (int i = 1 ; i <= 3; i++){
+            date.set(Calendar.DATE, date.get(Calendar.DATE) + i);
+            int week = date.get(Calendar.DAY_OF_WEEK);//1--7的值,对应：星期日，星期一，星期二，星期三....星期六
+            if(week == 1){
+                fl = true;
+            }
+            date.set(Calendar.DATE, date.get(Calendar.DATE) - i);
+        }
+        if(fl){
+            date.set(Calendar.DATE, date.get(Calendar.DATE) + 4);
+        }else{
+            date.set(Calendar.DATE, date.get(Calendar.DATE) + 3);
+        }
+
+        detectInfo.setMaintenanceCutTime(date.getTime());
+
         if(complaintDetectInfoService.insert(detectInfo) > 0){
             msg.setResultCode(200);
             msg.setReturnCode(200);
@@ -276,6 +295,23 @@ public class AdminDetectController {
             SalesOrder salesOrder = salesOrderService.getSalesOrderById(detectinfo.getDetectSalesId());
             mv.addObject("salesOrder",salesOrder);
         }
+        DetectionItem detectionItem = new DetectionItem();
+        detectionItem.setDetectId(Integer.valueOf(detectId));
+        //查询检测现象
+        detectionItem.setConfigType(1);
+        mv.addObject("detectPhenomenonList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询故障原因
+        detectionItem.setConfigType(2);
+        mv.addObject("detectFailureCauseList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询判定结果
+        detectionItem.setConfigType(3);
+        mv.addObject("detectResultsList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询故障指向
+        detectionItem.setConfigType(4);
+        mv.addObject("detectPointList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询原因分析
+        detectionItem.setConfigType(5);
+        mv.addObject("detectNalysisList",complaintDetectInfoService.listDetectionItem(detectionItem));
         mv.addObject("listTreatmentRecordLog",listTreatmentRecordLog);
         mv.addObject("listQcInfo",listQcInfo);
         mv.addObject("listMaterialItem",listMaterialItem);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -76,6 +76,8 @@ public class AdminSalesOrderController {
     private KuaiDi100 kuaidi100;
     @Autowired
     private SmsService smsService;
+    @Autowired
+    private ComplaintDetectInfoService complaintDetectInfoService;
     /**
      * 分页查询订单列表信息
      * @param request
@@ -207,7 +209,12 @@ public class AdminSalesOrderController {
         order.setSalesOrderItemList(itemList);
         //查询更正信息
         List<OrderCorrectInfo> listOrderCorrectInfo = salesOrderService.listOrderCorrectInfo(order.getSalesId());
+        //查询售后维修信息
+        ComplaintDetectInfo detectInfo = new ComplaintDetectInfo();
+        detectInfo.setDetectSalesId(order.getSalesId());
+        List<ComplaintDetectInfo> listDetectInfo = complaintDetectInfoService.listComplaintDetect(detectInfo);
         mv.addObject("listOrderCorrectInfo",listOrderCorrectInfo);
+        mv.addObject("listDetectInfo",listDetectInfo);
         mv.addObject("order",order);
         return mv;
     }

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

@@ -165,18 +165,101 @@
                 <td width="10" style="font-weight: normal;"><span>${detectinfo.logisticsNumber!''}</span></td>
             </tr>
             <tr>
+                <th width="10">购买时间：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.signclosedDate??>${(detectinfo.salesTime?string("yyyy-MM-dd HH:mm:ss"))!''}<#else>-</#if></span></td>
+                <td width="10"></td>
+                <th width="10" style="font-weight: normal;"></th>
+                <td width="10"></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.customerId!''}</#if></span></td>
+                <td width="10"></td>
                 <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><#if detectinfo.signclosedDate??>${(detectinfo.salesTime?string("yyyy-MM-dd HH:mm:ss"))!''}<#else>-</#if></span></td>
             </tr>
             <tr>
-                <th width="10">生产月份：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectProduction!''}</span></td>
+                <th width="10">客服信息：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.adminName??>${detectinfo.adminName!''}</#if></span></td>
+                <td width="10"></td>
+                <th width="10">客诉描述：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.describeHandleDesc??>${detectinfo.describeHandleDesc!''}</#if></span></td>
+                <td width="10"></td>
+            </tr>
+            <tr>
+                <th width="10">问题回复：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.describeContent??>${detectinfo.describeContent!''}</#if></span></td>
+                <td width="10"></td>
+                <th width="10">客服备注：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectCustomerDesc??>${detectinfo.detectCustomerDesc!''}</#if></span></td>
+                <td width="10"></td>
+            </tr>
+            <tr>
+                <th width="10">问题描述：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionTitle??>${detectinfo.questionTitle!''}-${detectinfo.questionTitle!''}</#if></span></td>
+                <td width="10"></td>
+                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"></td>
+                <td width="10"></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>
+                <#if detectinfo.procTypeId??><#if detectinfo.procTypeId == 3 || detectinfo.detectState == 37><#if detectinfo.detectPlaceorder??>
+                    <#if detectinfo.detectPlaceorder == 1>未下单</#if>
+                    <#if detectinfo.detectPlaceorder == 2>已下单</#if>
+                </#if></#if></#if></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;">
+                <#if detectinfo.detectRenovation == 1>
+                    可翻新
+                <#elseif detectinfo.detectRenovation == 2>
+                    不可翻新
+                </#if>
+                    </span></td>
+                <td width="10"></td>
+                <th width="10">是否有故障：</th>
+                <td width="20" style="font-weight: normal;"><span>
+                <#if detectinfo.isMaintenance == 1>
+                    有故障
+                <#elseif detectinfo.isMaintenance == 2>
+                    无故障
+                </#if>
+                </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>
@@ -200,10 +283,11 @@
                     </#if>
                 </#if>
                 </span></td>
+                <td width="10"></td>
             </tr>
             <tr>
-                <th width="10">版本号：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectVersionNumber!''}</span></td>
+                <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>
@@ -215,96 +299,107 @@
                     </#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>
+                <th width="10">机身条码：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectFuselageBarcode!''}</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>
+                <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.procTypeId??><#if detectinfo.procTypeId == 3 || detectinfo.detectState == 37><#if detectinfo.detectPlaceorder??>
-                    <#if detectinfo.detectPlaceorder == 1>未下单</#if>
-                    <#if detectinfo.detectPlaceorder == 2>已下单</#if>
-                </#if></#if></#if></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>
+                <td width="10" style="  font-weight: normal;" colspan="5"><span>
+                <#if detectPhenomenonList??>
+                                <#if (detectPhenomenonList?size > 0)>
+                                    <#list detectPhenomenonList as detectPhenomenon>
+                                    <li class="b-close" id="configDetele1">
+                                        <input type="hidden" value="${detectPhenomenon.itemConfigId!''}" name="configli1">
+                                        ${detectPhenomenon.itemDetectContent!''}
+                                        <span class="my-close" onclick="deleteli(this)"></span>
+                                    </li>
+                                    </#list>
+                                </#if>
+                </#if>
+                </span></td>
             </tr>
             <tr>
                 <th width="10">故障原因：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectFailureCause!''}</span></td>
-                <td width="10"></td>
+                <td width="10" style="font-weight: normal;" colspan="5"><span>
+                    <#if detectFailureCauseList??>
+                         <#if (detectFailureCauseList?size > 0)>
+                              <#list detectFailureCauseList as detectFailureCause>
+                               <li class="b-close" id="configDetele2">
+                                   <input type="hidden" value="${detectFailureCause.itemConfigId!''}" name="configli2">
+                                   ${detectFailureCause.itemDetectContent!''}
+                                   <span class="my-close" onclick="deleteli(this)"></span>
+                                </li>
+                         </#list>
+                         </#if>
+                    </#if>
+                </span></td>
+            </tr>
+            <tr>
                 <th width="10">判定结果：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectResults!''}</span></td>
+                <td width="10" style="font-weight: normal;" colspan="5"><span>
+                <#if detectResultsList??>
+                                <#if (detectResultsList?size > 0)>
+                                    <#list detectResultsList as detectResults>
+                                    <li class="b-close" id="configDetele3">
+                                        <input type="hidden" value="${detectResults.itemConfigId!''}" name="configli3">
+                                        ${detectResults.itemDetectContent!''}
+                                        <span class="my-close" onclick="deleteli(this)"></span>
+                                    </li>
+                                    </#list>
+                                </#if>
+                </#if>
+                </span></td>
             </tr>
             <tr>
                 <th width="10">故障指向：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectPoint!''}</span></td>
-                <td width="10"></td>
+                <td width="10" style="font-weight: normal;" colspan="5"><span>
+                <#if (detectPointList?size > 0)>
+                                    <#list detectPointList as detectPoint>
+                                    <li class="b-close" id="configDetele4">
+                                        <input type="hidden" value="${detectPoint.itemConfigId!''}" name="configli4">
+                                        ${detectPoint.itemDetectContent!''}
+                                        <span class="my-close" onclick="deleteli(this)"></span>
+                                    </li>
+                                    </#list>
+                </#if>
+                </span></td>
+            </tr>
+            <tr>
                 <th width="10">原因分析：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectNalysis!''}</span></td>
+                <td width="10" style="font-weight: normal;" colspan="5"><span>
+                <#if (detectNalysisList?size > 0)>
+                                    <#list detectNalysisList as detectNalysis>
+                                    <li class="b-close" id="configDetele5">
+                                        <input type="hidden" value="${detectNalysis.itemConfigId!''}" name="configli5">
+                                        ${detectNalysis.itemDetectContent!''}
+                                        <span class="my-close" onclick="deleteli(this)"></span>
+                                    </li>
+                                    </#list>
+                </#if>
+                </span></td>
             </tr>
             <tr>
-                <th width="10">维修记录：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectContent!''}</span></td>
+                <th width="10">维修报价：</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectOffer??>${detectinfo.detectOffer/100}<#else>-</#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>
                 <td width="10"></td>
+            </tr>
+            <tr>
                 <th width="10">备注：</th>
-                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectDesc!''}</span></td>
+                <td width="10" style="font-weight: normal;" colspan="5"><span>${detectinfo.detectDesc!''}</span></td>
             </tr>
             <tr>
-                <th width="10">维修图片：</th>
-                <td width="10" style="font-weight: normal;"><span>
+                <th width="10">维修附件：</th>
+                <td width="10" style="font-weight: normal;" colspan="5"><span>
                 <#if (imgList?size > 0)>
                     <#list imgList as img>
                         <img  src="${img.detectImgUrl!''}"  width="90" height="80">
@@ -312,10 +407,35 @@
                     </#list>
                 </#if>
                 </span></td>
-                <td width="10"></td>
-                <th width="10"></th>
-                <td width="10" style="font-weight: normal;"><span></span></td>
             </tr>
+
+            <tr>
+                <th width="10">维修配件：</th>
+                <td width="10" style="font-weight: normal;" colspan="5"><span>
+                <#if (listMaterialItem?size > 0)>
+                    <#list listMaterialItem as item>
+                        <li class="b-close" >
+                    <input type="hidden" value="">${item.materialName}
+
+                    </li>
+                    </div>
+                    </#list>
+                </#if>
+                </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>
@@ -330,15 +450,23 @@
                 </#if>
                 </span></td>
                 <td width="10"></td>
-                <th width="10"></th>
-                <td width="10" style="font-weight: normal;"><span></span></td>
+                <th width="10">维修内容：</th>
+                <td width="10" style="font-weight: normal;"><span>${detectinfo.detectContent!''}</span></td>
             </tr>
             </thead>
         </table>
         <div class="row cl">
             <label class="form-label col-3">
                 <div class="tit-2">
-                    QC检测记录
+                    QC检测信息
+                <#if listQcInfo?? &&  (listQcInfo?size > 0) >
+                    <#list listQcInfo as item>
+                        <#if listQcInfo?size = (item_index +1) >
+                        (<span class="c-success"><#if item.qcIsThrough == 1>通过</#if></span>
+                        <span class="c-red"><#if item.qcIsThrough == 2>不通过</#if></span>)
+                        </#if>
+                    </#list>
+                </#if>
                 </div>
             </label>
             <div class="formControls col-10 col-sm-10">
@@ -360,13 +488,13 @@
                             </tr>
                         </#list>
                     <#else>
-                        <tr><td class="td-manage text-c" colspan = "2">暂时没有QC操作记录</td></tr>
+                        <tr><td class="td-manage text-c" colspan = "3">暂时没有QC操作记录</td></tr>
                     </#if>
         </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">
@@ -398,6 +526,46 @@
                         <tr><td class="td-manage text-c" colspan = "4">暂时没有客服操作记录</td></tr>
                     </#if>
         </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>
+    <#--<label class="form-label col-2 col-sm-2">购买产品信息：</label>-->
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <tr class="text-c">
+                <th>订单编号</th>
+                <th>物流信息</th>
+                <th>订单状态</th>
+                <th>下单时间</th>
+            </tr>
+                    <#if salesOrder??>
+                            <tr class="text-c">
+                                <td>${salesOrder.salesOrderId!''}</td>
+                                <td>${salesOrder.salesPostFirmName!''}-${salesOrder.salesPostNum!''}</td>
+                                <td>
+                                    <#if salesOrder.salesShippingStatus == 0>
+                                    未发货
+                                <#elseif salesOrder.salesShippingStatus == 1>
+                            已打单
+                                <#elseif salesOrder.salesShippingStatus == 3>
+                            备货中
+                                <#elseif salesOrder.salesShippingStatus == 4>
+                            收货
+                                <#elseif salesOrder.salesShippingStatus == 11>
+                            已通知配货
+                                </#if>
+                                </td>
+                                <td>${salesOrder.salesSalesTime?string("yyyy/MM/dd HH:mm:ss")}</td>
+                            </tr>
+                    <#else>
+                        <tr><td class="td-manage text-c" colspan = "4">暂时订单信息</td></tr>
+                    </#if>
+        </table>
 
          <#--<button type="button" style="cursor:pointer;height: 35px;margin-top: 10px;"onClick="" class="my-btn-search"><<返回</button>-->
     </form>

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

@@ -163,6 +163,7 @@
                 <th width="100">客诉描述</th>
                 <#--<th width="150">客诉描述</th>-->
                 <#--<th width="150">是否转入生产部门</th>-->
+                <th width="100">QC检测</th>
                 <th width="100">备注</th>
                 <th width="100">客服备注</th>
                 <th width="100">检测日期</th>
@@ -180,7 +181,7 @@
                     <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
                     <td class="text-c" width="100">
                         <#if detect.detectState == 1>
-                            <span class="c-red">待检测机器(${detect.maintenanceCutTime?string("yyyy/MM/dd")}前完成)</span>
+                            <span class="c-red">待检测机器<#if detect.maintenanceCutTime??>(${detect.maintenanceCutTime?string("yyyy/MM/dd")}前完成)</#if></span>
                         </#if>
                         <#if detect.detectState == 30>
                             待用户确认
@@ -255,6 +256,15 @@
                     <td class="text-c" width="100"><div  title="${detect.detectContent!}">${detect.detectContent!'-'}</div></td>
                     <td class="text-c" width="100"><#if detect.detectOffer??>${detect.detectOffer/100}<#else>-</#if></td>-->
                     <td class="text-c" width="100"><span class="txt2" title="${detect.questionTitle!}" >${detect.questionTitle!'-'}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if></td>
+                        <td class="text-c" width="100" id="print${detect.detectId}">
+                    <#if detect.maintenanceResults??>
+                        <#if detect.maintenanceResults == 1>
+                                通过
+                        <#elseif detect.maintenanceResults == 2>
+                                不通过
+                        </#if>
+                    </#if>
+                        </td>
                     <td class="text-c" width="100">${detect.detectDesc!'-'}</td>
                     <td class="text-c" width="100">${detect.detectCustomerDesc!'-'}</td>
                     <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!'-'}</td>
@@ -794,6 +804,8 @@
         var detectPoint = cufte($("#detectPoint").val());//故障指向
         var detectNalysis = cufte($("#detectNalysis").val());//原因分析
         var detectClassification = cufte($("#detectClassification").val());//故障分类
+        var startTime = cufte($("#startTime").val());//开始时间
+        var endTime = cufte($("#endTime").val());//结束时间
 
         $.ajax({
             type:'POST',
@@ -808,7 +820,9 @@
                 "detectFailureCause" : detectFailureCause,
                 "detectPoint" : detectPoint,
                 "detectNalysis" : detectNalysis,
-                "detectClassification" : detectClassification
+                "detectClassification" : detectClassification,
+                "startTime" : startTime,
+                "endTime" : endTime
             },
             dataType: 'json',
             async: false,
@@ -827,6 +841,8 @@
                             +"&detectFailureCause="+detectFailureCause
                             +"&detectPoint="+detectPoint
                             +"&detectNalysis="+detectNalysis
+                            +"&startTime="+startTime
+                            +"&endTime="+endTime
                             +"&detectClassification="+detectClassification;
                 }
             }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/customer_signclosed_list.ftl

@@ -69,8 +69,8 @@
                 <th width="200">签收产品</th>
                 <th width="200">状态</th>
                 <th width="130">退货地区</th>
-                <#--<th width="90">售后原因</th>
-                <th width="150">客服备注</th>-->
+                <#--<th width="90">售后原因</th>-->
+                <th width="150">客服备注</th>
                 <th width="150">签收日期</th>
                 <th width="100">仓库备注</th>
                 <th width="100">操作</th>
@@ -116,17 +116,17 @@
                         </#if>
                     </#if></td>
                     <td class="text-c" width="100">${signclosed.signclosedAddrProvincesName!}-${signclosed.signclosedAddrCityName!}-${signclosed.signclosedAddrAreaName!}</td>
-                    <#--<td class="text-c" width="100"><span class="label txt2" title="${signclosed.customerIdDescribe!}" >${signclosed.customerIdDescribe!}</span><br><#if signclosed.customerIdDescribe??><#if signclosed.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${signclosed.signclosedCustomerId!});"style="color : #4149FF;">查看详情</a></#if></#if></td>
-                    <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>-->
+                    <#--<td class="text-c" width="100"><span class="label txt2" title="${signclosed.customerIdDescribe!}" >${signclosed.customerIdDescribe!}</span><br><#if signclosed.customerIdDescribe??><#if signclosed.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${signclosed.signclosedCustomerId!});"style="color : #4149FF;">查看详情</a></#if></#if></td>-->
+                    <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>
                     <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>
 
                     <td class="text-c" width="100">${signclosed.signclosedDesc!}</td>
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c">
-                       <#-- <a style="text-decoration:none" href="javascript:;" title="修改备注"
+                        <a style="text-decoration:none" href="javascript:;" title="修改备注"
                            onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_customer_remark?signclosedId=${signclosed.signclosedId!''}','570','450');">
-                            <i class="Hui-iconfont">修改备注</i>
-                        </a>-->
+                            <i>修改备注</i>
+                        </a><br>
                        <#-- <a style="text-decoration:none" href="javascript:;" title="打印"
                            onclick="print_aftermarket(${signclosed.signclosedId!''});">
                             <i class="Hui-iconfont">&#xe652;</i>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -347,6 +347,128 @@
             </#if>
             </table>
         </#if>
+        <#if listDetectInfo?? &&  (listDetectInfo?size > 0) >
+            <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" >
+                <thead>
+                <tr>
+                    <th>维修编号</th>
+                    <th>当前状态</th>
+                    <th>产品</th>
+                    <th>是否有故障</th>
+                    <th>是否可翻新</th>
+                    <th>维修报价</th>
+                    <th>维修内容</th>
+                    <th>QC检测状态</th>
+                    <th>操作</th>
+                </tr>
+                </thead>
+                <tbody id="trbodyInformationInfoId">
+                            <#if (listDetectInfo?size > 0)>
+                                <#list listDetectInfo as detect>
+                                <tr>
+                                <#--<td class="text-c" width="100">${detect.customerId!}</td>-->
+                                    <td class="text-c" width="100">${detect.detectNumber!''}</td>
+                                    <td class="text-c" width="100" id="detectState${(detect.detectId)!}">
+                                        <#if detect.detectState == 1>
+                                            待检测机器
+                                        </#if>
+                                        <#if detect.detectState == 30>
+                                            待用户确认
+                                        </#if>
+                                        <#if detect.detectState == 31>
+                                            用户同意维修（待维修）
+                                        </#if>
+                                        <#if detect.detectState == 32>
+                                            维修完成
+                                        </#if>
+                                        <#if detect.detectState == 33>
+                                            用户不维修（原机退回）
+                                        </#if>
+                                        <#if detect.detectState == 34>
+                                            待客服确认维修
+                                        </#if>
+                                        <#if detect.detectState == 35>
+                                            客服确认维修，（待维修）
+                                        </#if>
+                                        <#if detect.detectState == 36>
+                                            维修完成
+                                        </#if>
+                                        <#if detect.detectState == 37>
+                                            机器无故障，原机退回
+                                        </#if>
+                                        <#if detect.detectState == 38>
+                                            机器故障，待用户确认
+                                        </#if>
+                                        <#if detect.detectState == 20>
+                                            待翻新入库
+                                        </#if>
+                                        <#if detect.detectState == 21>
+                                            已翻新入库
+                                        </#if>
+                                        <#if detect.detectState == 22>
+                                            不能翻新，待报废
+                                        </#if>
+                                        <#if detect.detectState == 23>
+                                            已报废回收
+                                        </#if>
+                                    </td>
+                                    <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
+                                    <td class="text-c" width="100">
+                                        <#if detect.isMaintenance == 1>
+                                            是
+                                        <#elseif detect.isMaintenance == 2>
+                                            否
+                                        <#else>
+                                            机器待检测
+                                        </#if>
+                                    </td>
+                                    <td class="text-c" width="100">
+                                        <#if detect.detectRenovation??>
+                                            <#if detect.detectRenovation == 1>
+                                                可翻新
+                                            <#elseif detect.detectRenovation == 2>
+                                                不可翻新
+                                            <#else>
+                                                机器待检测
+                                            </#if>
+                                        </#if>
+                                    </td>
+                                    <td class="text-c" width="100"><#if detect.detectOffer??>${detect.detectOffer/100}<#else>-</#if></td>
+                                    <td class="text-c" width="100"><div  title="${detect.detectContent!}">${detect.detectContent!'-'}</div></td>
+                                    <td class="text-c" width="100">
+                                        <#if detect.maintenanceResults??>
+                                            <#if detect.maintenanceResults == 1>
+                                                通过
+                                            <#elseif detect.maintenanceResults == 2>
+                                                不通过
+                                            </#if>
+                                        </#if>
+                                    </td>
+                                    <!-- 遍历操作 -->
+                                    <td class="td-manage text-c" width="100">
+                                        <a onclick="getDetectInfo('${detect.detectId}');">查看详情</a><br>
+                                        <#if detect.detectState == 30 || detect.detectState == 34 || detect.detectState == 38>
+                                            <a onclick="to_updateDetectInfo('${(detect.detectId)!}','${(detect.detectState)!}');">维修处理</a>
+                                        </#if>
+                                    </td>
+                                </tr>
+                                </#list>
+                            <#else >
+                            <tr><td class="td-manage text-c" colspan = "18">暂时没有检测信息</td></tr>
+                            </#if>
+                </tbody>
+            </table>
+        </#if>
          <#--<button type="button" style="cursor:pointer;height: 35px;margin-top: 10px;"onClick="" class="my-btn-search"><<返回</button>-->
     </form>
     </div>

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

@@ -110,8 +110,11 @@
 </div>
 <script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
 <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery-barcode.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/js/LodopFuncs.js"></script>
+
 
 <script type="text/javascript">
+    /*var LODOP=getLodop();*/
     $("#all").on('click',function(){
         console.log($(this).prop('checked'));
         if($(this).prop('checked')){
@@ -168,6 +171,7 @@
         return currentdate;
     }
     function  printList() {
+
         var machineBarcode = null;
         var machineQrcode = null;
         var machineCreateTime = null;
@@ -203,14 +207,14 @@
                     '</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+'" />' +
+                        '<span style="position: absolute;margin-left: 13px;z-index: 99;font-size: 16px;margin-top: 2px;">产品唯一码</span>' +
+                        '<img style="position: absolute; width: 110px;height: 110px;margin-top: 12px;margin-left: -5px;" 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>' +
+                $("#printlist").append('<div style="width: 158px;height: 213px;position: relative;"> ' +
+                        '<span style="position: absolute;margin-left: 6px;z-index: 99;margin-top: 15px;font-size: 16px;">产品唯一码</span>' +
+                        '<img style="position: absolute; width: 130px;height:128px;margin-top: 24px;margin-left: -20px;" src="'+machineQrcode+'" />' +
+                        '<span style="position: absolute;margin-left: 0px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
                         '</div>');
             }
 
@@ -223,6 +227,18 @@
         });
         if (prints != ""){
             $("#printlist").printArea();
+            // 选择打印设备
+            /*LODOP.SELECT_PRINTER();
+            LODOP.PRINT_INIT('打印订单');
+            LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
+            LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#printlist").html());
+            var flag = LODOP.PRINT();
+            if (flag) {
+                layer.msg("打印成功",{icon: 6,time:3000});
+            }else{
+                layer.msg("打印失败",{icon: 2,time:3000});
+            }*/
+
             $("#printlist").html("");
             layer.closeAll();
         } else {
@@ -347,10 +363,10 @@
                     '<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>' +
+            $("#printlist").append('<div style="width: 158px;height: 215px;position: relative;"> ' +
+                    '<span style="position: absolute;margin-left: 6px;z-index: 99;margin-top: 15px;font-size: 16px;">产品唯一码</span>' +
+                    '<img style="position: absolute; width: 130px;height:128px;margin-top: 24px;margin-left: -20px;" src="'+machineQrcode+'" />' +
+                    '<span style="position: absolute;margin-left: 0px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
                     '</div>');
         }
         if(${machineIsPrint} == '1')