优化

platform-dao/src/main/java/com/platform/dao/dto/sbUnuseddetail/SbUnusedDetailDTO.java

@@ -29,6 +29,9 @@ public class SbUnusedDetailDTO extends BaseDTO implements Serializable {
 
     private String newPositionNo;//新位号（手动填写）
 
+    private String oldPositionNo;//旧位号
+
+
 
 
     private Integer clean;//是否清洗0：否，1：是(下来选择）

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

@@ -28,7 +28,7 @@ public class SbUnusedDetail implements Serializable{
 
     private String newPositionNo;//新位号（手动填写）
 
-
+    private String oldPositionNo;//旧位号
 
     private Integer clean;//是否清洗0：否，1：是(下来选择）
 

platform-dao/src/main/java/com/platform/dao/vo/query/sbUnuseddetail/SbUnusedDetailVO.java

@@ -35,6 +35,9 @@ public class SbUnusedDetailVO extends BaseVO implements Serializable{
 
     private String newPositionNo;//新位号（手动填写）
 
+    private String oldPositionNo;//旧位号
+
+
 
 
     private Integer clean;//是否清洗0：否，1：是(下来选择）

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

@@ -355,9 +355,24 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                     record.setOldPositionId(vo.getOldPositionId());
                     record.setPositionId(vo.getNewPositionId());
                     record.setId(IdGeneratorUtils.getObjectId());
-                    record.setContent("编号："+ sbInfoVO.getNo()+"的设备的位置由:"+sbInfoVO.getPositionName()+"变为："+position.getName()+",设备位号由："+
-                            sbInfoVO.getPositionNo()+"变为："+vo.getNewPositionNo());
+                    record.setContent("编号："+ sbInfoVO.getNo()+"的设备的位置由:"+sbInfoVO.getPositionName()+"变为："+position.getName());
                     record.setTransformType(6);
+
+                    SbChangeRecord record2 = new SbChangeRecord();
+                    record2.setSbId(vo.getSbId());
+                    record2.setSbNoId(vo.getNewPositionNo());
+                    record2.setCreatedUserId(userInfo.getUserId());
+                    record2.setCreatedUserName(userInfo.getUsername());
+                    record2.setCreatedTime(LocalDateTime.now());
+                    record2.setOldPositionId(vo.getOldPositionId());
+                    record2.setPositionId(vo.getNewPositionId());
+                    record2.setId(IdGeneratorUtils.getObjectId());
+                    record2.setContent("编号："+ sbInfoVO.getNo()+"的设备位号由："+
+                            sbInfoVO.getPositionNo()+"变为："+vo.getNewPositionNo());
+                    record.setTransformType(7);
+
+                    sbChangeRecords.add(record2);
+
                     sbChangeRecords.add(record);
                 }
                 sbInfoMapper.updateUnusedBatch(sbInfoDTOS);
@@ -399,6 +414,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             detail.setNewPositionNo(dto.getNewPositionNo());
             detail.setClean(dto.getClean());
             detail.setSbIntact(dto.getSbIntact());
+            detail.setOldPositionNo(dto.getPositionNo());
             dto.setId(detail.getId());
             this.saveImageFile(dto);