huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化精简项目结构

This commit is contained in:
启航 2026-01-16 01:43:29 +08:00
parent 9c499da6fb
commit e39f587389
22 changed files with 32 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/erp-api/pom.xml
View File

@ -81,11 +81,7 @@
<artifactId>security</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>cn.qihangerp.service</groupId>
<artifactId>erp</artifactId>
<version>2.0.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>cn.qihangerp.module</groupId>-->
<!-- <artifactId>goods</artifactId>-->

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java
View File

@ -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;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java
View File

@ -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;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java
View File

@ -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;

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java → mapper/src/main/java/cn/qihangerp/mapper/ErpLogisticsMapper.java
View File

@ -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;

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.java → mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderItemMapper.java
View File

@ -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;

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.java → mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderMapper.java
View File

@ -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;

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.java → mapper/src/main/java/cn/qihangerp/mapper/ErpPurchaseOrderShipMapper.java
View File

@ -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;

2
serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml → mapper/src/main/resources/mapper/ErpLogisticsMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.erp.mapper.ErpLogisticsMapper">
<mapper namespace="cn.qihangerp.mapper.ErpLogisticsMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpLogistics">
<id property="id" column="id" />

2
serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderItemMapper.xml → mapper/src/main/resources/mapper/ErpPurchaseOrderItemMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.erp.mapper.ErpPurchaseOrderItemMapper">
<mapper namespace="cn.qihangerp.mapper.ErpPurchaseOrderItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpPurchaseOrderItem">
<id property="id" column="id" />

2
serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderMapper.xml → mapper/src/main/resources/mapper/ErpPurchaseOrderMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.erp.mapper.ErpPurchaseOrderMapper">
<mapper namespace="cn.qihangerp.mapper.ErpPurchaseOrderMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpPurchaseOrder">
<id property="id" column="id" />

2
serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpPurchaseOrderShipMapper.xml → mapper/src/main/resources/mapper/ErpPurchaseOrderShipMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.erp.mapper.ErpPurchaseOrderShipMapper">
<mapper namespace="cn.qihangerp.mapper.ErpPurchaseOrderShipMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpPurchaseOrderShip">
<id property="id" column="id" />

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java → service/src/main/java/cn/qihangerp/module/service/ErpLogisticsService.java
View File

@ -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;

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderItemService.java → service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderItemService.java
View File

@ -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;

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderService.java → service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderService.java
View File

@ -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;

2
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java → service/src/main/java/cn/qihangerp/module/service/ErpPurchaseOrderShipService.java
View File

@ -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;

6
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/ErpLogisticsServiceImpl.java
View File

@ -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;
/**

6
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderItemServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderItemServiceImpl.java
View File

@ -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;
/**

12
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderServiceImpl.java
View File

@ -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;

8
serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/ErpPurchaseOrderShipServiceImpl.java
View File

@ -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;

32
serviceImpl/erp/pom.xml
View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.qihangerp.service</groupId>
<artifactId>serviceImpl</artifactId>
<version>2.0.0</version>
</parent>
<artifactId>erp</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>cn.qihangerp.core</groupId>
<artifactId>common</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.qihangerp.model</groupId>
<artifactId>model</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
</project>

2
serviceImpl/pom.xml
View File

@ -25,7 +25,7 @@
<module>dou</module>
<module>tao</module>
<module>pdd</module>
<module>erp</module>
<!-- <module>erp</module>-->
</modules>
<properties>