diff --git a/api/erp-api/pom.xml b/api/erp-api/pom.xml index 0aa5de14..b312c96b 100644 --- a/api/erp-api/pom.xml +++ b/api/erp-api/pom.xml @@ -81,11 +81,7 @@ security 1.0 - - cn.qihangerp.service - erp - 2.0.0 - + diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java index d85a02f2..0a07c921 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java @@ -3,7 +3,7 @@ package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.entity.ErpLogistics; -import cn.qihangerp.module.erp.service.ErpLogisticsService; +import cn.qihangerp.module.service.ErpLogisticsService; import cn.qihangerp.security.common.BaseController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java index ee720568..366a5ebc 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java @@ -8,7 +8,7 @@ import cn.qihangerp.model.bo.PurchaseOrderAddBo; import cn.qihangerp.model.bo.PurchaseOrderOptionBo; import cn.qihangerp.model.entity.ErpPurchaseOrder; import cn.qihangerp.model.query.PurchaseOrderSearchBo; -import cn.qihangerp.module.erp.service.ErpPurchaseOrderService; +import cn.qihangerp.module.service.ErpPurchaseOrderService; import cn.qihangerp.security.common.BaseController; import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java index 2fdc520a..a935d7bc 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.entity.ErpPurchaseOrderShip; import cn.qihangerp.model.query.PurchaseOrderSearchBo; -import cn.qihangerp.module.erp.service.ErpPurchaseOrderShipService; +import cn.qihangerp.module.service.ErpPurchaseOrderShipService; import cn.qihangerp.security.common.BaseController; import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpLogisticsMapper.java similarity index 90% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpLogisticsMapper.java index 7ba05c75..08a99844 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/ErpLogisticsMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.ErpLogistics; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderItemMapper.java similarity index 91% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderItemMapper.java index 3324f900..0f222a3b 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderItemMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.ErpPurchaseOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderMapper.java similarity index 90% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderMapper.java index a3f32221..5d02ce3a 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.ErpPurchaseOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderShipMapper.java similarity index 91% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderShipMapper.java index 85ba5f8d..a6e46779 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderShipMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.ErpPurchaseOrderShip; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml b/mapper/src/main/resources/mapper/ErpLogisticsMapper.xml similarity index 89% rename from serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml rename to mapper/src/main/resources/mapper/ErpLogisticsMapper.xml index d6af9893..beacbbab 100644 --- a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml +++ b/mapper/src/main/resources/mapper/ErpLogisticsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.xml b/mapper/src/main/resources/mapper/ErpPurchaseOrderItemMapper.xml similarity index 96% rename from serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.xml rename to mapper/src/main/resources/mapper/ErpPurchaseOrderItemMapper.xml index b33c673b..a970c082 100644 --- a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.xml +++ b/mapper/src/main/resources/mapper/ErpPurchaseOrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.xml b/mapper/src/main/resources/mapper/ErpPurchaseOrderMapper.xml similarity index 96% rename from serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.xml rename to mapper/src/main/resources/mapper/ErpPurchaseOrderMapper.xml index 761e1550..078899ba 100644 --- a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.xml +++ b/mapper/src/main/resources/mapper/ErpPurchaseOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.xml b/mapper/src/main/resources/mapper/ErpPurchaseOrderShipMapper.xml similarity index 96% rename from serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.xml rename to mapper/src/main/resources/mapper/ErpPurchaseOrderShipMapper.xml index db3f63a2..263c1fad 100644 --- a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.xml +++ b/mapper/src/main/resources/mapper/ErpPurchaseOrderShipMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java b/service/src/main/java/cn/qihangerp/module/service/ErpLogisticsService.java similarity index 90% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpLogisticsService.java index f38d1b14..3fdeb3db 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java +++ b/service/src/main/java/cn/qihangerp/module/service/ErpLogisticsService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.ErpLogistics; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderItemService.java similarity index 89% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderItemService.java index 9e905901..037dc533 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.ErpPurchaseOrderItem; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderService.java b/service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderService.java similarity index 95% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderService.java index df5a70fa..02522d7d 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderService.java +++ b/service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java b/service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderShipService.java similarity index 94% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderShipService.java index afd222fd..64aeabb0 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java +++ b/service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderShipService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpLogisticsServiceImpl.java similarity index 80% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpLogisticsServiceImpl.java index 6e4c757d..ab4989e6 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpLogisticsServiceImpl.java @@ -1,9 +1,9 @@ -package cn.qihangerp.module.erp.service.impl; +package cn.qihangerp.module.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.model.entity.ErpLogistics; -import cn.qihangerp.module.erp.service.ErpLogisticsService; -import cn.qihangerp.module.erp.mapper.ErpLogisticsMapper; +import cn.qihangerp.module.service.ErpLogisticsService; +import cn.qihangerp.mapper.ErpLogisticsMapper; import org.springframework.stereotype.Service; /** diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderItemServiceImpl.java similarity index 73% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderItemServiceImpl.java index 75c77412..cc3a2713 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderItemServiceImpl.java @@ -1,9 +1,9 @@ -package cn.qihangerp.module.erp.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.ErpPurchaseOrderItem; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.erp.service.ErpPurchaseOrderItemService; -import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderItemMapper; +import cn.qihangerp.module.service.ErpPurchaseOrderItemService; +import cn.qihangerp.mapper.ErpPurchaseOrderItemMapper; import org.springframework.stereotype.Service; /** diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderServiceImpl.java similarity index 97% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderServiceImpl.java index dd8f894a..575724bd 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderServiceImpl.java @@ -1,9 +1,8 @@ -package cn.qihangerp.module.erp.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.utils.DateUtils; - import cn.qihangerp.model.bo.PurchaseOrderAddBo; import cn.qihangerp.model.bo.PurchaseOrderAddItemBo; import cn.qihangerp.model.bo.PurchaseOrderOptionBo; @@ -11,14 +10,13 @@ import cn.qihangerp.model.entity.ErpPurchaseOrder; import cn.qihangerp.model.entity.ErpPurchaseOrderItem; import cn.qihangerp.model.entity.ErpPurchaseOrderShip; import cn.qihangerp.model.query.PurchaseOrderSearchBo; -import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderItemMapper; -import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderShipMapper; +import cn.qihangerp.mapper.ErpPurchaseOrderItemMapper; +import cn.qihangerp.mapper.ErpPurchaseOrderShipMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import cn.qihangerp.module.erp.service.ErpPurchaseOrderService; -import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderMapper; +import cn.qihangerp.module.service.ErpPurchaseOrderService; +import cn.qihangerp.mapper.ErpPurchaseOrderMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderShipServiceImpl.java similarity index 94% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderShipServiceImpl.java index a66e0da0..8fe1ffab 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderShipServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.erp.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -6,12 +6,12 @@ import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.model.entity.ErpPurchaseOrder; import cn.qihangerp.model.entity.ErpPurchaseOrderShip; import cn.qihangerp.model.query.PurchaseOrderSearchBo; -import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderMapper; +import cn.qihangerp.mapper.ErpPurchaseOrderMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.erp.service.ErpPurchaseOrderShipService; -import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderShipMapper; +import cn.qihangerp.module.service.ErpPurchaseOrderShipService; +import cn.qihangerp.mapper.ErpPurchaseOrderShipMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/serviceImpl/erp/pom.xml b/serviceImpl/erp/pom.xml deleted file mode 100644 index afb26145..00000000 --- a/serviceImpl/erp/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - cn.qihangerp.service - serviceImpl - 2.0.0 - - - erp - - - 17 - 17 - UTF-8 - - - - cn.qihangerp.core - common - 1.0 - compile - - - cn.qihangerp.model - model - 2.0.0 - - - \ No newline at end of file diff --git a/serviceImpl/pom.xml b/serviceImpl/pom.xml index 9616b4bc..b8921e4b 100644 --- a/serviceImpl/pom.xml +++ b/serviceImpl/pom.xml @@ -25,7 +25,7 @@ dou tao pdd - erp +