修改报废单保存时候相关字段缺失问题

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java

@@ -8,7 +8,7 @@ import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springframework.data.annotation.Id;
 
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -49,7 +49,7 @@ public class Instrument extends BaseEntity implements Serializable {
     private Date productionDate;
 
     // 启用日期
-    @NotBlank(message = "设备启用时间不能为空")
+    @NotNull(message = "设备启用时间不能为空")
     private Date enableDate;
 
     public String manufacturerBrand;

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java

@@ -154,6 +154,13 @@ public class RepairApplicationController extends BladeController {
                 scrapApplication.setModel(application.getVersion());
                 scrapApplication.setStatus(0);
                 scrapApplication.setReasonAndState(repairApplication.getReasonForScrapping());
+                //维修金额
+                scrapApplication.setMoney(application.getTotalCost() == null ? 0 : application.getTotalCost());
+                //购置日期
+                Instrument instrumentThis = instrumentService.getById(application.getInstrumentId());
+                scrapApplication.setPurchaseTime(instrumentThis.getPurchaseTime());
+                //处理情况，使用维修单的维修记录
+                scrapApplication.setHandling(application.getMaintenanceRecord() == null ? "" : application.getMaintenanceRecord());
                 scrapApplicationService.save(scrapApplication);
             }
         }