diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java index a0b0274..1dec639 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -15,8 +15,8 @@ String OTHERS_UNDERTAKE = "2"; /** - * 外检 + * 外检,已归为自检中,默认就为自检,在内部实验室还是外场检测由计量人员决定,当有外包申请成功时将对应的样品检定方式更新为外包 */ - String OUTSIDE_MEASURE = "3"; +// String OUTSIDE_MEASURE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java index a0b0274..1dec639 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -15,8 +15,8 @@ String OTHERS_UNDERTAKE = "2"; /** - * 外检 + * 外检,已归为自检中,默认就为自检,在内部实验室还是外场检测由计量人员决定,当有外包申请成功时将对应的样品检定方式更新为外包 */ - String OUTSIDE_MEASURE = "3"; +// String OUTSIDE_MEASURE = "3"; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 23289e9..3002842 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -315,7 +315,7 @@ */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType()))) { String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true;