采购基础模块

code/pom.xml

@@ -24,6 +24,21 @@
             <version>1.0.hx</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.7</version>
+        </dependency>
     </dependencies>
 
 </project>

hx-purchase/pom.xml

@@ -0,0 +1,34 @@
+<?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>com.fjhx</groupId>
+        <artifactId>bytesailing</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>hx-purchase</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-item</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

hx-supply/src/main/java/com/fjhx/supply/controller/supplier/SupplierInfoController.java → hx-supply/src/main/java/com/fjhx/purchase/controller/supplier/SupplierInfoController.java

@@ -1,12 +1,12 @@
-package com.fjhx.supply.controller.supplier;
+package com.fjhx.purchase.controller.supplier;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.supply.entity.supplier.dto.SupplierInfoDto;
-import com.fjhx.supply.entity.supplier.dto.SupplierInfoSelectDto;
-import com.fjhx.supply.entity.supplier.vo.SupplierInfoVo;
-import com.fjhx.supply.service.supplier.SupplierInfoService;
+import com.fjhx.purchase.entity.supplier.dto.SupplierInfoDto;
+import com.fjhx.purchase.entity.supplier.dto.SupplierInfoSelectDto;
+import com.fjhx.purchase.entity.supplier.vo.SupplierInfoVo;
+import com.fjhx.purchase.service.supplier.SupplierInfoService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-supply/src/main/java/com/fjhx/supply/controller/supplier/SupplierPriceController.java → hx-supply/src/main/java/com/fjhx/purchase/controller/supplier/SupplierPriceController.java

@@ -1,13 +1,13 @@
-package com.fjhx.supply.controller.supplier;
+package com.fjhx.purchase.controller.supplier;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.supply.entity.supplier.dto.SupplierPriceDto;
-import com.fjhx.supply.entity.supplier.dto.SupplierPriceSelectDto;
-import com.fjhx.supply.entity.supplier.vo.SupplierPriceAddVo;
-import com.fjhx.supply.entity.supplier.vo.SupplierPriceVo;
-import com.fjhx.supply.service.supplier.SupplierPriceService;
+import com.fjhx.purchase.entity.supplier.dto.SupplierPriceDto;
+import com.fjhx.purchase.entity.supplier.dto.SupplierPriceSelectDto;
+import com.fjhx.purchase.entity.supplier.vo.SupplierPriceAddVo;
+import com.fjhx.purchase.entity.supplier.vo.SupplierPriceVo;
+import com.fjhx.purchase.service.supplier.SupplierPriceService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierInfoDto.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/dto/SupplierInfoDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.supply.entity.supplier.dto;
+package com.fjhx.purchase.entity.supplier.dto;
 
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
+import com.fjhx.purchase.entity.supplier.po.SupplierInfo;
 import lombok.Getter;
 import lombok.Setter;
 

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierInfoSelectDto.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/dto/SupplierInfoSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.supply.entity.supplier.dto;
+package com.fjhx.purchase.entity.supplier.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierPriceDto.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/dto/SupplierPriceDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.supply.entity.supplier.dto;
+package com.fjhx.purchase.entity.supplier.dto;
 
-import com.fjhx.supply.entity.supplier.po.SupplierPrice;
+import com.fjhx.purchase.entity.supplier.po.SupplierPrice;
 import lombok.Getter;
 import lombok.Setter;
 

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierPriceSelectDto.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/dto/SupplierPriceSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.supply.entity.supplier.dto;
+package com.fjhx.purchase.entity.supplier.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/po/SupplierInfo.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/po/SupplierInfo.java

@@ -1,4 +1,4 @@
-package com.fjhx.supply.entity.supplier.po;
+package com.fjhx.purchase.entity.supplier.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/po/SupplierPrice.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/po/SupplierPrice.java

@@ -1,4 +1,4 @@
-package com.fjhx.supply.entity.supplier.po;
+package com.fjhx.purchase.entity.supplier.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/vo/SupplierInfoVo.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/vo/SupplierInfoVo.java

@@ -1,7 +1,7 @@
-package com.fjhx.supply.entity.supplier.vo;
+package com.fjhx.purchase.entity.supplier.vo;
 
 import com.fjhx.area.service.ISetAreaName;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
+import com.fjhx.purchase.entity.supplier.po.SupplierInfo;
 import lombok.Getter;
 import lombok.Setter;
 

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/vo/SupplierPriceAddVo.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/vo/SupplierPriceAddVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.supply.entity.supplier.vo;
+package com.fjhx.purchase.entity.supplier.vo;
 
-import com.fjhx.supply.entity.supplier.po.SupplierPrice;
+import com.fjhx.purchase.entity.supplier.po.SupplierPrice;
 import lombok.Getter;
 import lombok.Setter;
 

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/vo/SupplierPriceVo.java → hx-supply/src/main/java/com/fjhx/purchase/entity/supplier/vo/SupplierPriceVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.supply.entity.supplier.vo;
+package com.fjhx.purchase.entity.supplier.vo;
 
-import com.fjhx.supply.entity.supplier.po.SupplierPrice;
+import com.fjhx.purchase.entity.supplier.po.SupplierPrice;
 import lombok.Getter;
 import lombok.Setter;
 

hx-supply/src/main/java/com/fjhx/supply/mapper/supplier/SupplierInfoMapper.java → hx-supply/src/main/java/com/fjhx/purchase/mapper/supplier/SupplierInfoMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.supply.mapper.supplier;
+package com.fjhx.purchase.mapper.supplier;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
-import com.fjhx.supply.entity.supplier.vo.SupplierInfoVo;
+import com.fjhx.purchase.entity.supplier.po.SupplierInfo;
+import com.fjhx.purchase.entity.supplier.vo.SupplierInfoVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-supply/src/main/java/com/fjhx/supply/mapper/supplier/SupplierPriceMapper.java → hx-supply/src/main/java/com/fjhx/purchase/mapper/supplier/SupplierPriceMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.supply.mapper.supplier;
+package com.fjhx.purchase.mapper.supplier;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.supply.entity.supplier.po.SupplierPrice;
-import com.fjhx.supply.entity.supplier.vo.SupplierPriceVo;
+import com.fjhx.purchase.entity.supplier.po.SupplierPrice;
+import com.fjhx.purchase.entity.supplier.vo.SupplierPriceVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-supply/src/main/java/com/fjhx/supply/service/supplier/SupplierInfoService.java → hx-supply/src/main/java/com/fjhx/purchase/service/supplier/SupplierInfoService.java

@@ -1,10 +1,10 @@
-package com.fjhx.supply.service.supplier;
+package com.fjhx.purchase.service.supplier;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.supply.entity.supplier.dto.SupplierInfoDto;
-import com.fjhx.supply.entity.supplier.dto.SupplierInfoSelectDto;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
-import com.fjhx.supply.entity.supplier.vo.SupplierInfoVo;
+import com.fjhx.purchase.entity.supplier.dto.SupplierInfoDto;
+import com.fjhx.purchase.entity.supplier.dto.SupplierInfoSelectDto;
+import com.fjhx.purchase.entity.supplier.po.SupplierInfo;
+import com.fjhx.purchase.entity.supplier.vo.SupplierInfoVo;
 import com.ruoyi.common.core.service.BaseService;
 
 

hx-supply/src/main/java/com/fjhx/supply/service/supplier/SupplierPriceService.java → hx-supply/src/main/java/com/fjhx/purchase/service/supplier/SupplierPriceService.java

@@ -1,11 +1,11 @@
-package com.fjhx.supply.service.supplier;
+package com.fjhx.purchase.service.supplier;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.supply.entity.supplier.dto.SupplierPriceDto;
-import com.fjhx.supply.entity.supplier.dto.SupplierPriceSelectDto;
-import com.fjhx.supply.entity.supplier.po.SupplierPrice;
-import com.fjhx.supply.entity.supplier.vo.SupplierPriceAddVo;
-import com.fjhx.supply.entity.supplier.vo.SupplierPriceVo;
+import com.fjhx.purchase.entity.supplier.dto.SupplierPriceDto;
+import com.fjhx.purchase.entity.supplier.dto.SupplierPriceSelectDto;
+import com.fjhx.purchase.entity.supplier.po.SupplierPrice;
+import com.fjhx.purchase.entity.supplier.vo.SupplierPriceAddVo;
+import com.fjhx.purchase.entity.supplier.vo.SupplierPriceVo;
 import com.ruoyi.common.core.service.BaseService;
 
 

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java → hx-supply/src/main/java/com/fjhx/purchase/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -1,16 +1,16 @@
-package com.fjhx.supply.service.supplier.impl;
+package com.fjhx.purchase.service.supplier.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.utils.AreaUtil;
-import com.fjhx.supply.entity.supplier.dto.SupplierInfoDto;
-import com.fjhx.supply.entity.supplier.dto.SupplierInfoSelectDto;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
-import com.fjhx.supply.entity.supplier.vo.SupplierInfoVo;
-import com.fjhx.supply.mapper.supplier.SupplierInfoMapper;
-import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.fjhx.supply.utils.CodeEnum;
+import com.fjhx.purchase.entity.supplier.dto.SupplierInfoDto;
+import com.fjhx.purchase.entity.supplier.dto.SupplierInfoSelectDto;
+import com.fjhx.purchase.entity.supplier.po.SupplierInfo;
+import com.fjhx.purchase.entity.supplier.vo.SupplierInfoVo;
+import com.fjhx.purchase.mapper.supplier.SupplierInfoMapper;
+import com.fjhx.purchase.service.supplier.SupplierInfoService;
+import com.fjhx.purchase.utils.CodeEnum;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierPriceServiceImpl.java → hx-supply/src/main/java/com/fjhx/purchase/service/supplier/impl/SupplierPriceServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.supply.service.supplier.impl;
+package com.fjhx.purchase.service.supplier.impl;
 
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.supply.entity.supplier.dto.SupplierPriceDto;
-import com.fjhx.supply.entity.supplier.dto.SupplierPriceSelectDto;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
-import com.fjhx.supply.entity.supplier.po.SupplierPrice;
-import com.fjhx.supply.entity.supplier.vo.SupplierPriceAddVo;
-import com.fjhx.supply.entity.supplier.vo.SupplierPriceVo;
-import com.fjhx.supply.mapper.supplier.SupplierPriceMapper;
-import com.fjhx.supply.service.supplier.SupplierPriceService;
+import com.fjhx.purchase.entity.supplier.dto.SupplierPriceDto;
+import com.fjhx.purchase.entity.supplier.dto.SupplierPriceSelectDto;
+import com.fjhx.purchase.entity.supplier.po.SupplierInfo;
+import com.fjhx.purchase.entity.supplier.po.SupplierPrice;
+import com.fjhx.purchase.entity.supplier.vo.SupplierPriceAddVo;
+import com.fjhx.purchase.entity.supplier.vo.SupplierPriceVo;
+import com.fjhx.purchase.mapper.supplier.SupplierPriceMapper;
+import com.fjhx.purchase.service.supplier.SupplierPriceService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;

hx-supply/src/main/java/com/fjhx/supply/utils/CodeEnum.java → hx-supply/src/main/java/com/fjhx/purchase/utils/CodeEnum.java

@@ -1,4 +1,4 @@
-package com.fjhx.supply.utils;
+package com.fjhx.purchase.utils;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -6,7 +6,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.supply.service.supplier.SupplierInfoService;
+import com.fjhx.purchase.service.supplier.SupplierInfoService;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.Getter;
 

hx-supply/src/main/resources/mapper/supplier/SupplierInfoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.supply.mapper.supplier.SupplierInfoMapper">
-    <select id="getPage" resultType="com.fjhx.supply.entity.supplier.vo.SupplierInfoVo">
+    <select id="getPage" resultType="com.fjhx.purchase.entity.supplier.vo.SupplierInfoVo">
         select
             si.id,
             si.code,

hx-supply/src/main/resources/mapper/supplier/SupplierPriceMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.supply.mapper.supplier.SupplierPriceMapper">
-    <select id="getPage" resultType="com.fjhx.supply.entity.supplier.vo.SupplierPriceVo">
+    <select id="getPage" resultType="com.fjhx.purchase.entity.supplier.vo.SupplierPriceVo">
         select sp.id,
                sp.supplier_info_id,
                sp.product_info_id,