更新

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -873,10 +873,6 @@ public class RepairController {
             TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
             taskService.addInvolveUser(taskBto,userId);
             repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
-            if (repairReceiveVo.getStartUserbId()!=null){
-                repairBackBill.setStartUserbId(repairReceiveVo.getStartUserbId());
-                repairBackBill.setAgent(userPublicService.getOne(repairReceiveVo.getStartUserbId()).getName());
-            }
         } else {
             taskBto = new TaskBto();
             repairBackBill = new RepairBackBill();
@@ -886,6 +882,9 @@ public class RepairController {
             repairBackBill.setStartUseraId(repairReceiveVo.getStartUseraId());
             repairBackBill.setStartUserbId(repairReceiveVo.getStartUserbId());
             repairBackBill.setReceiveUserbId(repairReceiveVo.getReceiveUserbId());
+            if (repairReceiveVo.getScriptSaveVos()!=null){
+                repairBackBill.setScriptJson(JacksonUtil.toJSon(repairReceiveVo.getScriptSaveVos()));
+            }
         }
         String deviceIdDetail = repairReceiveVo.getReceiveCheckDetail();
         if (repairBackBill.getReceiveUseraId() == null) {
@@ -894,6 +893,10 @@ public class RepairController {
         if (repairReceiveVo.getRightSignatureId()!=null&&!"".equals(repairReceiveVo.getRightSignatureId())){
             repairBackBill.setRightSignatureId(repairReceiveVo.getRightSignatureId());
         }
+        if (repairReceiveVo.getStartUserbId()!=null){
+            repairBackBill.setStartUserbId(repairReceiveVo.getStartUserbId());
+            repairBackBill.setAgent(userPublicService.getOne(repairReceiveVo.getStartUserbId()).getName());
+        }
         //更新退回单
         repairBackBill.setBackStatus(5);
         repairBackBill.setBillFileName(repairReceiveVo.getBillFileName());
@@ -913,6 +916,10 @@ public class RepairController {
             repairBackBill.setReceiveFiles(FilesUtil.stringFileToList(repairReceiveVo.getReceiveFiles()));
         }
         RepairBackBill repairBackBill1 = deviceRepairBackBillService.update(repairBackBill);
+        Calendar calendar = Calendar.getInstance();
+        String s1 = "NO:第" + calendar.get(Calendar.YEAR) + "LQ" + repairBackBill.getId() + "号";
+        repairBackBill1.setDocNum(s1);
+        deviceRepairBackBillService.save(repairBackBill1);
         TaskBto taskBto2;
         Map<Integer,List<Integer>> messageMap = new HashMap<>();
         if (repairReceiveVo.getTaskId()==null) {

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/RepairReceiveVo.java

 package com.tykj.dev.device.repair.subject.vo;
 
 import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -74,4 +75,6 @@ public class RepairReceiveVo {
 
     @ApiModelProperty(value = "收件单位签章id")
     private String rightSignatureId;
+
+    private List<ScriptSaveVo> scriptSaveVos;
 }