批量检定优化

platform-common/src/main/java/com/platform/common/constant/CommonConstants.java

@@ -297,4 +297,5 @@ public interface CommonConstants {
     String CHANGE_TYPE_SB_NO = "2"; // 设备位号变动
     String CHANGE_TYPE_SB_PARENT = "3"; // 父设备变动
     String CHANGE_TYPE_SB_STATUS = "4"; // 设备状态变动
+    String CHANGE_TYPE_SB_ZZH = "5"; // 设备原号变动
 }

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

@@ -118,7 +118,7 @@ public class SbMeasureLogDTO extends BaseDTO implements Serializable {
      * 设备状态
      */
     @Transient
-    private Integer sbStatus;
+    private Boolean sbStatus;
     /**
      * 标准工时
      */
@@ -226,4 +226,9 @@ public class SbMeasureLogDTO extends BaseDTO implements Serializable {
      * 设备位号
      */
     private String sbPositionNo;
+
+    /**
+     * 设备原号
+     */
+    private String zzh;
 }

platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -143,7 +143,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         SbInfo tempInfo = new SbInfo();
         tempInfo.setId(sbInfo.getId());
         // 判断设备状态，如果是在库，直接修改设备状态即可
-        if(model.getSbStatus() == 1){
+        if(model.getSbStatus()){
             sbInfo.setStatus(SbInfoStatusEnum.IN_STORE.getValue());
             String remark = "设备状态由【"+SbInfoStatusEnum.getNameByValue(sbInfo.getStatus())+"】 ---> 【";
             remark += "在库】";
@@ -180,12 +180,15 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
             boolean insertAllocate = Boolean.FALSE; // 设备位置
             boolean insertParent = Boolean.FALSE; // 父设备
             boolean insertNo = Boolean.FALSE; // 设备位号
+            boolean insertZzh = Boolean.FALSE; // 出厂编码
             String oldPositionId = getPureString(sbInfo.getPositionId());
             String oldParentId = getPureString(sbInfo.getParentId());
             String positionId = getPureString(model.getSbPositionId());
             String parentId = getPureString(model.getSbParentId());
             String oldSbPositionNo = getPureString(sbInfo.getPositionNo()); // 设备位号
             String positionNo = getPureString(model.getSbPositionNo());
+            String oldZzh = getPureString(sbInfo.getZzh()); // 原出厂编码
+            String zzh = getPureString(model.getZzh()); // 出厂编码
             StringBuilder remark1 = new StringBuilder();
             StringBuilder remark2 = new StringBuilder();
             StringBuilder remark3 = new StringBuilder();
@@ -225,6 +228,13 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
                 }
                 sbInfo.setPositionNo(model.getSbPositionNo()); // 设备位号
             }
+            StringBuilder remark4 = new StringBuilder();
+            if(!oldZzh.equals(zzh)){
+                insertZzh = Boolean.TRUE;
+                remark4.append("设备原号变动【"+oldZzh).append("】 ---> ");
+                remark4.append("【"+zzh+"】");
+                sbInfo.setZzh(zzh);
+            }
             // 保存文件
             sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_IMGS.getValue(), model.getCheckImgList());
             sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_FILES.getValue(), model.getCheckFileList());
@@ -238,6 +248,9 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
             if(insertNo){
                 handleSbChangeRecord(remark3.toString(),model,tempInfo,CommonConstants.CHANGE_TYPE_SB_NO);
             }
+            if(insertZzh){
+                handleSbChangeRecord(remark4.toString(),model,tempInfo,CommonConstants.CHANGE_TYPE_SB_ZZH);
+            }
             sbInfoMapper.updateByPrimaryKey(sbInfo);
             return sbMeasureLog;
         }
@@ -299,6 +312,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
                 record.setParentId(model.getSbParentId());
                 break;
             case CommonConstants.CHANGE_TYPE_SB_STATUS:
+            case CommonConstants.CHANGE_TYPE_SB_ZZH:
                 break;
         }
         sbChangeRecordMapper.insert(record);