diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java deleted file mode 100644 index 8022cb4..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 当前检定环节类型枚举 - * @Author: wangpeng - * @Date: 2023/02/08 15:51 - */ -public interface CurrentSegmentEnum { - String TO_ALLOCATE = "待分配"; - String TO_INCOME = "待收入"; - String COMPLETE = "完成"; -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java deleted file mode 100644 index 8022cb4..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 当前检定环节类型枚举 - * @Author: wangpeng - * @Date: 2023/02/08 15:51 - */ -public interface CurrentSegmentEnum { - String TO_ALLOCATE = "待分配"; - String TO_INCOME = "待收入"; - String COMPLETE = "完成"; -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 83b9856..dfed507 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"), ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java deleted file mode 100644 index 8022cb4..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 当前检定环节类型枚举 - * @Author: wangpeng - * @Date: 2023/02/08 15:51 - */ -public interface CurrentSegmentEnum { - String TO_ALLOCATE = "待分配"; - String TO_INCOME = "待收入"; - String COMPLETE = "完成"; -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 83b9856..dfed507 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"), ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java deleted file mode 100644 index d10b0e3..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 样品状态类型枚举 - * @Author: wangpeng - * @Date: 2023/02/07 10:51 - */ -public interface SampleStatusEnum { - String TO_RECEIVE = "1"; //待收入 - String TO_HANDOUT = "2"; //待分发 - String IN_MEASURE = "3"; //检测中 - String MEASURE_COMPLETE = "4"; //检测完 - String TO_GIVE_BACK = "5"; //待归还 - String GIVE_BACK_COMPLETE = "6"; //已归还 - String NO_NEED_MEASURE = "7"; //无需检测 - String BE_OVERDUE = "8"; //超期 -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java deleted file mode 100644 index 8022cb4..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 当前检定环节类型枚举 - * @Author: wangpeng - * @Date: 2023/02/08 15:51 - */ -public interface CurrentSegmentEnum { - String TO_ALLOCATE = "待分配"; - String TO_INCOME = "待收入"; - String COMPLETE = "完成"; -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 83b9856..dfed507 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"), ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java deleted file mode 100644 index d10b0e3..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 样品状态类型枚举 - * @Author: wangpeng - * @Date: 2023/02/07 10:51 - */ -public interface SampleStatusEnum { - String TO_RECEIVE = "1"; //待收入 - String TO_HANDOUT = "2"; //待分发 - String IN_MEASURE = "3"; //检测中 - String MEASURE_COMPLETE = "4"; //检测完 - String TO_GIVE_BACK = "5"; //待归还 - String GIVE_BACK_COMPLETE = "6"; //已归还 - String NO_NEED_MEASURE = "7"; //无需检测 - String BE_OVERDUE = "8"; //超期 -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java new file mode 100644 index 0000000..b118a6b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -0,0 +1,12 @@ +package com.casic.missiles.enums.sample; + +/** + * @Description: 当前检定环节类型枚举 + * @Author: wangpeng + * @Date: 2023/02/08 15:51 + */ +public interface CurrentSegmentEnum { + String TO_ALLOCATE = "待分配"; + String TO_INCOME = "待收入"; + String COMPLETE = "完成"; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java deleted file mode 100644 index 8022cb4..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 当前检定环节类型枚举 - * @Author: wangpeng - * @Date: 2023/02/08 15:51 - */ -public interface CurrentSegmentEnum { - String TO_ALLOCATE = "待分配"; - String TO_INCOME = "待收入"; - String COMPLETE = "完成"; -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 83b9856..dfed507 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"), ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java deleted file mode 100644 index d10b0e3..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 样品状态类型枚举 - * @Author: wangpeng - * @Date: 2023/02/07 10:51 - */ -public interface SampleStatusEnum { - String TO_RECEIVE = "1"; //待收入 - String TO_HANDOUT = "2"; //待分发 - String IN_MEASURE = "3"; //检测中 - String MEASURE_COMPLETE = "4"; //检测完 - String TO_GIVE_BACK = "5"; //待归还 - String GIVE_BACK_COMPLETE = "6"; //已归还 - String NO_NEED_MEASURE = "7"; //无需检测 - String BE_OVERDUE = "8"; //超期 -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java new file mode 100644 index 0000000..b118a6b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -0,0 +1,12 @@ +package com.casic.missiles.enums.sample; + +/** + * @Description: 当前检定环节类型枚举 + * @Author: wangpeng + * @Date: 2023/02/08 15:51 + */ +public interface CurrentSegmentEnum { + String TO_ALLOCATE = "待分配"; + String TO_INCOME = "待收入"; + String COMPLETE = "完成"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java new file mode 100644 index 0000000..168a4c8 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java @@ -0,0 +1,17 @@ +package com.casic.missiles.enums.sample; + +/** + * @Description: 样品状态类型枚举 + * @Author: wangpeng + * @Date: 2023/02/07 10:51 + */ +public interface SampleStatusEnum { + String TO_RECEIVE = "1"; //待收入 + String TO_HANDOUT = "2"; //待分发 + String IN_MEASURE = "3"; //检测中 + String MEASURE_COMPLETE = "4"; //检测完 + String TO_GIVE_BACK = "5"; //待归还 + String GIVE_BACK_COMPLETE = "6"; //已归还 + String NO_NEED_MEASURE = "7"; //无需检测 + String BE_OVERDUE = "8"; //超期 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java deleted file mode 100644 index 8022cb4..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 当前检定环节类型枚举 - * @Author: wangpeng - * @Date: 2023/02/08 15:51 - */ -public interface CurrentSegmentEnum { - String TO_ALLOCATE = "待分配"; - String TO_INCOME = "待收入"; - String COMPLETE = "完成"; -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 83b9856..dfed507 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"), ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java deleted file mode 100644 index d10b0e3..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 样品状态类型枚举 - * @Author: wangpeng - * @Date: 2023/02/07 10:51 - */ -public interface SampleStatusEnum { - String TO_RECEIVE = "1"; //待收入 - String TO_HANDOUT = "2"; //待分发 - String IN_MEASURE = "3"; //检测中 - String MEASURE_COMPLETE = "4"; //检测完 - String TO_GIVE_BACK = "5"; //待归还 - String GIVE_BACK_COMPLETE = "6"; //已归还 - String NO_NEED_MEASURE = "7"; //无需检测 - String BE_OVERDUE = "8"; //超期 -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java new file mode 100644 index 0000000..b118a6b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -0,0 +1,12 @@ +package com.casic.missiles.enums.sample; + +/** + * @Description: 当前检定环节类型枚举 + * @Author: wangpeng + * @Date: 2023/02/08 15:51 + */ +public interface CurrentSegmentEnum { + String TO_ALLOCATE = "待分配"; + String TO_INCOME = "待收入"; + String COMPLETE = "完成"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java new file mode 100644 index 0000000..168a4c8 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java @@ -0,0 +1,17 @@ +package com.casic.missiles.enums.sample; + +/** + * @Description: 样品状态类型枚举 + * @Author: wangpeng + * @Date: 2023/02/07 10:51 + */ +public interface SampleStatusEnum { + String TO_RECEIVE = "1"; //待收入 + String TO_HANDOUT = "2"; //待分发 + String IN_MEASURE = "3"; //检测中 + String MEASURE_COMPLETE = "4"; //检测完 + String TO_GIVE_BACK = "5"; //待归还 + String GIVE_BACK_COMPLETE = "6"; //已归还 + String NO_NEED_MEASURE = "7"; //无需检测 + String BE_OVERDUE = "8"; //超期 +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 49887d3..d170c33 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -20,6 +20,8 @@ List selectListByInMeasureStatus(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer getMeasureNumberStatus(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + List selectExecutiveList(@Param("request") SampleHandOutDetailRequest request); Page selectListByDeptIdAndStatus(Page page, @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List statusList); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b7f70f6..7b7b57e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -5,12 +5,11 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; -import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO; +import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOrder; @@ -61,47 +60,25 @@ } /** - * 无需检测需要检定人在填入错误的情况下，不必进行检测 + * cancelMeasure：无需检测需要检定人在填入错误的情况下，不必进行检测 + * receive：设备收入(只有待收入的设备具有收入操作) + * back：回填：置为前置状态，已收入、待归还、已归还 */ @ApiOperation("无需检测") - @PostMapping("/cancelMeasure") - public ReturnDTO cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + @PostMapping("/satus/change") + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO)); + return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); } /** - * 手动收入 - */ - @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") - @PostMapping("/receive") - public ReturnDTO receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO)); - } - - /** - * 直接回填状态即可 - */ - @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") - @PostMapping("/back") - public ReturnDTO backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO)); - } - - /** - * 设备终止，同时要进行终止原因的回填 + * 设备终止，，同时要进行终止原因的回填 */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -113,12 +90,11 @@ */ @ApiOperation("催办") @PostMapping("/rushDoProcess") - public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) { + public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO)); } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 1acf525..8f47cbd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -42,4 +42,5 @@ public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 361e063..6ae0867 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -16,7 +16,6 @@ import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyService; import io.swagger.annotations.Api; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 596daef..27b81db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.RepositoryService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index aeb15a2..da80480 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java deleted file mode 100644 index 8022cb4..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 当前检定环节类型枚举 - * @Author: wangpeng - * @Date: 2023/02/08 15:51 - */ -public interface CurrentSegmentEnum { - String TO_ALLOCATE = "待分配"; - String TO_INCOME = "待收入"; - String COMPLETE = "完成"; -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index 83b9856..dfed507 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -33,6 +33,7 @@ ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"), + DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"), ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java deleted file mode 100644 index d10b0e3..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.enums; - -/** - * @Description: 样品状态类型枚举 - * @Author: wangpeng - * @Date: 2023/02/07 10:51 - */ -public interface SampleStatusEnum { - String TO_RECEIVE = "1"; //待收入 - String TO_HANDOUT = "2"; //待分发 - String IN_MEASURE = "3"; //检测中 - String MEASURE_COMPLETE = "4"; //检测完 - String TO_GIVE_BACK = "5"; //待归还 - String GIVE_BACK_COMPLETE = "6"; //已归还 - String NO_NEED_MEASURE = "7"; //无需检测 - String BE_OVERDUE = "8"; //超期 -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java new file mode 100644 index 0000000..b118a6b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -0,0 +1,12 @@ +package com.casic.missiles.enums.sample; + +/** + * @Description: 当前检定环节类型枚举 + * @Author: wangpeng + * @Date: 2023/02/08 15:51 + */ +public interface CurrentSegmentEnum { + String TO_ALLOCATE = "待分配"; + String TO_INCOME = "待收入"; + String COMPLETE = "完成"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java new file mode 100644 index 0000000..168a4c8 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/SampleStatusEnum.java @@ -0,0 +1,17 @@ +package com.casic.missiles.enums.sample; + +/** + * @Description: 样品状态类型枚举 + * @Author: wangpeng + * @Date: 2023/02/07 10:51 + */ +public interface SampleStatusEnum { + String TO_RECEIVE = "1"; //待收入 + String TO_HANDOUT = "2"; //待分发 + String IN_MEASURE = "3"; //检测中 + String MEASURE_COMPLETE = "4"; //检测完 + String TO_GIVE_BACK = "5"; //待归还 + String GIVE_BACK_COMPLETE = "6"; //已归还 + String NO_NEED_MEASURE = "7"; //无需检测 + String BE_OVERDUE = "8"; //超期 +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 49887d3..d170c33 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -20,6 +20,8 @@ List selectListByInMeasureStatus(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer getMeasureNumberStatus(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + List selectExecutiveList(@Param("request") SampleHandOutDetailRequest request); Page selectListByDeptIdAndStatus(Page page, @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List statusList); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7f9dba2..c7590bf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -4,25 +4,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -37,7 +37,8 @@ + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + + - SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, blei.require_certifications + SELECT blei.order_id, blei.sample_id, blei.measure_dept_id, sd.SIMPLE_NAME AS deptName, blei.measure_status, + blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID WHERE blei.is_del = 0 @@ -46,6 +47,18 @@ AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) + +