履历优化

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

@@ -153,13 +153,13 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SbMeasureLog saveModelByDTO(SbMeasureLogDTO model) {
-        // 在库走在库流程
-        if(model.getSbStatus()){
-            return this.saveModelForIn(model);
-        }
         // 更新设备下次检定日期
         SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(model.getSbId());
         // 判断设备状态，如果是在库，修改设备状态即可
+        /*if(model.getSbStatus()){
+            sbInfo.setStatus(SbInfoStatusEnum.IN_STORE.getValue());
+            return this.saveModelForIn(model);
+        }*/
         model.setCheckUserId(SecurityUtils.getUserInfo().getUserId()); // 谁操作即是检定记录人
         if (SbUseType.BGCL.getValue().equals(sbInfo.getUseType())) {
             model.setType(1);
@@ -238,7 +238,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
             remark2.append("【" + after + "】");
             outRemark.append("子设备【"+sbInfo.getName()+"】挂靠。");
         }
-        if (!oldSbPositionNo.equals(positionNo)) {
+        /*if (!oldSbPositionNo.equals(positionNo)) {
             if (StringUtils.isNotBlank(sbInfo.getParentId())) {
                 // 子设备判断，传输过来的位号，是否存在于sb_location
                 SbLocation location = new SbLocation();
@@ -258,7 +258,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
                 sbInfo.setParentId(locations.get(0).getSbId());
             }
             sbInfo.setPositionNo(model.getSbPositionNo()); // 设备位号
-        }
+        }*/
         /*StringBuilder remark4 = new StringBuilder();
         if (!oldZzh.equals(zzh)) {
             insertZzh = Boolean.TRUE;
@@ -283,9 +283,9 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
             }
             handleSbChangeRecord(inRemark.toString(), model, sbInfo, CommonConstants.CHANGE_TYPE_SB_IN);
         }
-        if (insertNo) {
+        /*if (insertNo) {
             handleSbChangeRecord(remark3.toString(), model, sbInfo, CommonConstants.CHANGE_TYPE_SB_NO);
-        }
+        }*/
       /*  if (insertZzh) {
             handleSbChangeRecord(remark4.toString(), model, tempInfo, CommonConstants.CHANGE_TYPE_SB_ZZH);
         }*/