Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev

Fork: 0

wangpeng / casic-metering

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev dev release
commit f6eb9c5f237e4e0097f4b5d2b27c9789f17adf3c 2 parents 5026d59 + 787c6dd casic_zt authored on 15 Feb 2023

Patch

Unified Split

Showing 43 changed files

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java

Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java 100644 → 0

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java 0 → 100644

Ignore Space Show notes View casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java

Ignore Space Show notes View casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java 0 → 100644

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java

Show line notes below