优化

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -27,6 +27,18 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoDTO extends BaseDTO implements Serializable {
+    private String oldPositionId;//原设备位置 (老设备位置选择设备后自动带出了，新设备位置，让用户自己选择）
+
+    private String newPositionId;//新设备位置
+
+    private String newPositionNo;//新位号（手动填写）
+
+
+
+    private Integer clean;//是否清洗0：否，1：是(下来选择）
+
+    private String sbIntact;//设备完好性（铭牌&零部件&外观）（手动填写）
+
     private String sbUnusedDetailId;
 
     private List<String> notSbIds;

platform-dao/src/main/java/com/platform/dao/dto/sbUnused/SbUnusedDTO.java

@@ -22,6 +22,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDTO extends BaseDTO implements Serializable {
+    private String applyReason;//申请原因
+
+
     private Integer hFlag;
     private Boolean saveFlag;//是否提交？true：提交 false：修改
     private List<Integer> statusList;

platform-dao/src/main/java/com/platform/dao/entity/sbUnused/SbUnused.java

@@ -21,6 +21,8 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_sb_unused")
 public class SbUnused implements Serializable{
+    private String applyReason;//申请原因
+
 
 
     private LocalDateTime updateTime;

platform-dao/src/main/java/com/platform/dao/entity/sbUnuseddetail/SbUnusedDetail.java

@@ -21,7 +21,6 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_sb_unused_detail")
 public class SbUnusedDetail implements Serializable{
-    private String applyReason;//申请原因
 
     private String oldPositionId;//原设备位置 (老设备位置选择设备后自动带出了，新设备位置，让用户自己选择）
 

platform-dao/src/main/java/com/platform/dao/vo/query/sbUnused/SbUnusedVO.java

@@ -24,6 +24,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedVO extends BaseVO implements Serializable{
+    private String applyReason;//申请原因
+
+
     private String verifyUserName2;
     /**
      * 二审人：何经理

platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -382,6 +382,11 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             detail.setCreatedUserId(userInfo.getUserId());
             detail.setUpdateTime(LocalDateTime.now());
             detail.setUpdateUserId(userInfo.getUserId());
+            detail.setOldPositionId(dto.getOldPositionId());
+            detail.setNewPositionId(dto.getNewPositionId());
+            detail.setNewPositionNo(dto.getNewPositionNo());
+            detail.setClean(dto.getClean());
+            detail.setSbIntact(dto.getSbIntact());
             dto.setId(detail.getId());
             this.saveImageFile(dto);