取消维修备注，备件回收备注

src/main/java/com/fdkankan/sale/service/impl/RepairCustomerService.java

@@ -86,17 +86,21 @@ public class RepairCustomerService {
             BigDecimal robAmount = priceListService.getRobAmountByRepairId(repair.getRepairId());
 
             repairService.updateCancelStatus(repair.getRepairId(),1,param.getRemark());
-
+            Integer status = null;
             if(robAmount.compareTo(BigDecimal.ZERO) <=0  || StatusUtil.getWarranty(repair.getWarrantyType())){
                 if(partVoList.size() >0){
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),repair.getStatus(),"取消维修","取消维修备注："+param.getRemark());
+                    status = RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status();
                 }else {
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修","取消维修备注："+param.getRemark());
+                    status = RepairStatusEnum.TO_BE_SHIPPED.status();
                 }
             } else {
-                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),repair.getStatus(),"取消维修","取消维修备注："+param.getRemark());
+                status = RepairStatusEnum.TO_BE_CANCELED.status();
             }
-
+            String remark = null;
+            if(StringUtils.isNotBlank(param.getRemark())){
+                 remark = "取消维修备注："+param.getRemark();
+            }
+            repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),status,repair.getStatus(),remark);
         }
     }
 

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -293,6 +293,7 @@ public class RepairInfoService {
         vo.setSaleName(repairDetailVo.getOrderReceivingVo().getSysUserName());
         vo.setSaleDate(repairDetailVo.getOrderReceivingVo().getCreateTime());
         vo.setWarrantyExpirationDate(repairDetailVo.getRepairerVo().getWarrantyDate());
+        vo.setAnnex(repairDetailVo.getOrderReceivingVo().getAnnex());
 
         vo.setExportImg(repairDetailVo.getRepairRegisterVo().getCheckImg());
         vo.setRepairMan(repairDetailVo.getRepairRegisterVo().getSysUserName());

src/main/java/com/fdkankan/sale/service/impl/RepairSupplyService.java

@@ -163,7 +163,10 @@ public class RepairSupplyService {
         for (RepairRegisterPartVo partVo : partVoList) {
             partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus());
         }
-
-        repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"备件回收","回收备注："+param.getRemark());
+        String remark = null;
+        if(StringUtils.isNotBlank(param.getRemark())){
+            remark = "回收备注："+param.getRemark();
+        }
+        repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"备件回收",remark);
     }
 }

src/main/java/com/fdkankan/sale/util/OrderListVo.java

@@ -42,6 +42,8 @@ public class OrderListVo {
     private String invoiceType;               //发票种类
     private String buyDate;
 
+    private String annex;       //接单附件
+
     private List<PriceListExcelVo> priceListExcelVos;
     private ExportImg exportImg;