1.主营业务模块添加 2.采购登记

liding

4 天以前 4bc6459d779256b233084fc9142296e79667a951

1.主营业务模块添加 2.采购登记

 main-business/pom.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
<?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">
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>3.8.9</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>main-business</artifactId>
    <dependencies>
        <!-- é€šç”¨å·¥å…·-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>

        <!-- æ ¸å¿ƒæ¨¡å—-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-framework</artifactId>
        </dependency>

        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-core</artifactId>
            <version>10.11.0</version> <!-- æˆ–更高版本，如 10.11.0 -->
        </dependency>

        <!--  mysql迁移  -->
        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-mysql</artifactId>
        </dependency>

        <!--  pgsql迁移  -->
        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-database-postgresql</artifactId>
        </dependency>
    </dependencies>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>

</project>

 main-business/src/main/java/com/ruoyi/business/controller/PurchaseRegistrationController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.ruoyi.business.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * é‡‡è´­ç™»è®°è¡¨ å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */

@RestController
@AllArgsConstructor
@RequestMapping("/business/purchaseRegistration")
public class PurchaseRegistrationController {

}

 main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
package com.ruoyi.business.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * é‡‡è´­ç™»è®°è¡¨ å®žä½“ç±»
 *
 * @author ruoyi
 * @date 2025-06-03
 */
@Data
@TableName("purchase_registration")
public class PurchaseRegistration extends MyBaseEntity {

    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®ID
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     *
     */
    @TableField(value = "supplier_id")
    private Long supplierId;
    /**
     * ä¾›åº”商名称
     */
    @TableField(value = "supplier_name")
    private String supplierName;
    /**
     * å•ä½
     */
    @TableField(value = "unit")
    private String unit;
    /**
     *
     */
    @TableField(value = "coal_id")
    private Long coalId;
    /**
     * ç…¤ç§ç±»åž‹
     */
    @TableField(value = "coal")
    private String coal;
    /**
     * é‡‡è´­æ•°é‡
     */
    @TableField(value = "purchase_quantity")
    private BigDecimal purchaseQuantity;
    /**
     * å•ä»·ï¼ˆå«ç¨Žï¼‰
     */
    @TableField(value = "price_including_tax")
    private BigDecimal priceIncludingTax;
    /**
     * æ€»ä»·ï¼ˆå«ç¨Žï¼‰
     */
    @TableField(value = "total_price_including_tax")
    private BigDecimal totalPriceIncludingTax;
    /**
     * ç¨ŽçŽ‡
     */
    @TableField(value = "tax_rate")
    private BigDecimal taxRate;
    /**
     * ä¸å«ç¨Žå•ä»·
     */
    @TableField(value = "price_excluding_tax")
    private BigDecimal priceExcludingTax;
    /**
     * ä¸å«ç¨Žæ€»ä»·
     */
    @TableField(value = "total_price_excluding_tax")
    private BigDecimal totalPriceExcludingTax;
    /**
     * ç™»è®°äººid
     */
    @TableField(value = "registrant_id")
    private String registrantId;
    /**
     * ç™»è®°æ—¥æœŸ
     */
    @TableField(value = "registration_date")
    private Date registrationDate;
}

 main-business/src/main/java/com/ruoyi/business/mapper/PurchaseRegistrationMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.business.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.business.entity.PurchaseRegistration;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * é‡‡è´­ç™»è®°è¡¨ Mapper æŽ¥å£
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */
@Mapper
public interface PurchaseRegistrationMapper extends BaseMapper<PurchaseRegistration> {

}

 main-business/src/main/java/com/ruoyi/business/service/PurchaseRegistrationService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.business.service;

import com.ruoyi.business.entity.PurchaseRegistration;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * é‡‡è´­ç™»è®°è¡¨ æœåŠ¡ç±»
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */
public interface PurchaseRegistrationService extends IService<PurchaseRegistration> {

}

 main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.ruoyi.business.service.impl;

import com.ruoyi.business.entity.PurchaseRegistration;
import com.ruoyi.business.mapper.PurchaseRegistrationMapper;
import com.ruoyi.business.service.PurchaseRegistrationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;

/**
 * <p>
 * é‡‡è´­ç™»è®°è¡¨ æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */
@Service
@RequiredArgsConstructor
public class PurchaseRegistrationServiceImpl extends ServiceImpl<PurchaseRegistrationMapper, PurchaseRegistration> implements PurchaseRegistrationService {

}

 main-business/src/main/resources/db/migration/postgresql/V20250603160101__create_table_purchase_registration.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
-- åˆ›å»º purchase_registration è¡¨
CREATE TABLE purchase_registration
(
    id                        BIGSERIAL PRIMARY KEY,                              -- ä¸»é”®ID，自动递增
    supplier_id               BIGINT         NOT NULL,                            -- ä¾›åº”商名称ID，不允许为空
    supplier_name             VARCHAR(255)   NOT NULL,                            -- ä¾›åº”商名称，不允许为空
    unit                      VARCHAR(50)    NOT NULL,                            -- å•ä½ï¼Œä¸å…è®¸ä¸ºç©º
    coal_id                   BIGINT         NOT NULL,                            -- ç…¤ç§ç±»åž‹id
    coal                      VARCHAR(255),                                       -- ç…¤ç§ç±»åž‹
    purchase_quantity         DECIMAL(10, 2) NOT NULL,                            -- é‡‡è´­æ•°é‡ï¼Œä¸å…è®¸ä¸ºç©º
    price_including_tax       DECIMAL(10, 2) NOT NULL,                            -- å•ä»·ï¼ˆå«ç¨Žï¼‰ï¼Œä¸å…è®¸ä¸ºç©º
    total_price_including_tax DECIMAL(10, 2) NOT NULL,                            -- æ€»ä»·ï¼ˆå«ç¨Žï¼‰ï¼Œä¸å…è®¸ä¸ºç©º
    tax_rate                  DECIMAL(5, 2)  NOT NULL,                            -- ç¨ŽçŽ‡ï¼Œä¸å…è®¸ä¸ºç©º
    price_excluding_tax       DECIMAL(10, 2) NOT NULL,                            -- ä¸å«ç¨Žå•ä»·ï¼Œä¸å…è®¸ä¸ºç©º
    total_price_excluding_tax DECIMAL(10, 2) NOT NULL,                            -- ä¸å«ç¨Žæ€»ä»·ï¼Œä¸å…è®¸ä¸ºç©º
    registrant_id             VARCHAR(255)   NOT NULL,                            -- ç™»è®°äººid，不允许为空
    registration_date         DATE           NOT NULL,                            -- ç™»è®°æ—¥æœŸï¼Œä¸å…è®¸ä¸ºç©º

    deleted                   INT            NOT NULL  DEFAULT 0,                 -- è½¯åˆ é™¤æ ‡å¿—：0=未删除，1=已删除
    create_by                 VARCHAR(255),                                       -- åˆ›å»ºäººç”¨æˆ·å
    create_time               TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, -- åˆ›å»ºæ—¶é—´ï¼Œé»˜è®¤å½“前时间
    update_by                 VARCHAR(255),                                       -- æœ€åŽæ›´æ–°äººç”¨æˆ·å
    update_time               TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP  -- æœ€åŽæ›´æ–°æ—¶é—´ï¼Œé»˜è®¤å½“前时间
);

-- ä¸ºè¡¨æ·»åŠ æ³¨é‡Š
COMMENT ON TABLE purchase_registration IS '采购登记表';

-- ä¸ºå­—段添加注释
COMMENT ON COLUMN purchase_registration.id IS '主键ID';
COMMENT ON COLUMN purchase_registration.supplier_name IS '供应商名称';
COMMENT ON COLUMN purchase_registration.unit IS '单位';
COMMENT ON COLUMN purchase_registration.coal IS '煤种类型';
COMMENT ON COLUMN purchase_registration.purchase_quantity IS '采购数量';
COMMENT ON COLUMN purchase_registration.price_including_tax IS '单价（含税）';
COMMENT ON COLUMN purchase_registration.total_price_including_tax IS '总价（含税）';
COMMENT ON COLUMN purchase_registration.tax_rate IS '税率';
COMMENT ON COLUMN purchase_registration.price_excluding_tax IS '不含税单价';
COMMENT ON COLUMN purchase_registration.total_price_excluding_tax IS '不含税总价';
COMMENT ON COLUMN purchase_registration.registrant_id IS '登记人id';
COMMENT ON COLUMN purchase_registration.registration_date IS '登记日期';
COMMENT ON COLUMN purchase_registration.deleted IS '软删除标志，0=未删除，1=已删除';
COMMENT ON COLUMN purchase_registration.create_by IS '创建该记录的用户';
COMMENT ON COLUMN purchase_registration.create_time IS '记录创建时间';
COMMENT ON COLUMN purchase_registration.update_by IS '最后修改该记录的用户';
COMMENT ON COLUMN purchase_registration.update_time IS '记录最后更新时间';

 main-business/src/main/resources/mapper/PurchaseRegistrationMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
<?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.ruoyi.business.mapper.PurchaseRegistrationMapper">

        <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
        <resultMap id="BaseResultMap" type="com.ruoyi.business.entity.PurchaseRegistration">
                    <id column="id" property="id" />
                <result column="deleted" property="deleted" />
                <result column="create_by" property="createBy" />
                <result column="create_time" property="createTime" />
                <result column="update_by" property="updateBy" />
                <result column="update_time" property="updateTime" />
                    <result column="supplier_id" property="supplierId" />
                    <result column="supplier_name" property="supplierName" />
                    <result column="unit" property="unit" />
                    <result column="coal_id" property="coalId" />
                    <result column="coal" property="coal" />
                    <result column="purchase_quantity" property="purchaseQuantity" />
                    <result column="price_including_tax" property="priceIncludingTax" />
                    <result column="total_price_including_tax" property="totalPriceIncludingTax" />
                    <result column="tax_rate" property="taxRate" />
                    <result column="price_excluding_tax" property="priceExcludingTax" />
                    <result column="total_price_excluding_tax" property="totalPriceExcludingTax" />
                    <result column="registrant_id" property="registrantId" />
                    <result column="registration_date" property="registrationDate" />
        </resultMap>

        <!-- é€šç”¨æŸ¥è¯¢ç»“果列 -->
        <sql id="Base_Column_List">
                deleted,
                create_by,
                create_time,
                update_by,
                update_time,
            id, supplier_id, supplier_name, unit, coal_id, coal, purchase_quantity, price_including_tax, total_price_including_tax, tax_rate, price_excluding_tax, total_price_excluding_tax, registrant_id, registration_date
        </sql>

</mapper>

 pom.xml

@@ -209,6 +209,13 @@
                <artifactId>basic-server</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--主营业务-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>main-business</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>
        </dependencies>
    </dependencyManagement>

@@ -262,6 +269,7 @@
        <module>ruoyi-quartz</module>
        <module>ruoyi-common</module>
        <module>basic-server</module>
        <module>main-business</module>
    </modules>
    <packaging>pom</packaging>


 ruoyi-admin/pom.xml

@@ -75,6 +75,11 @@

        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>main-business</artifactId>
        </dependency>

        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>