From 4bc6459d779256b233084fc9142296e79667a951 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 03 六月 2025 17:25:01 +0800
Subject: [PATCH] 1.主营业务模块添加 2.采购登记
---
main-business/src/main/java/com/ruoyi/business/service/PurchaseRegistrationService.java | 16 ++
main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java | 95 +++++++++++++++
ruoyi-admin/pom.xml | 5
main-business/pom.xml | 50 ++++++++
main-business/src/main/java/com/ruoyi/business/mapper/PurchaseRegistrationMapper.java | 18 +++
main-business/src/main/resources/mapper/PurchaseRegistrationMapper.xml | 38 ++++++
main-business/src/main/resources/db/migration/postgresql/V20250603160101__create_table_purchase_registration.sql | 46 +++++++
pom.xml | 8 +
main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java | 22 +++
main-business/src/main/java/com/ruoyi/business/controller/PurchaseRegistrationController.java | 21 +++
10 files changed, 319 insertions(+), 0 deletions(-)
diff --git a/main-business/pom.xml b/main-business/pom.xml
new file mode 100644
index 0000000..b2cc32b
--- /dev/null
+++ b/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>
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/PurchaseRegistrationController.java b/main-business/src/main/java/com/ruoyi/business/controller/PurchaseRegistrationController.java
new file mode 100644
index 0000000..3962ea2
--- /dev/null
+++ b/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 {
+
+}
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java b/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
new file mode 100644
index 0000000..2bd1370
--- /dev/null
+++ b/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;
+ /**
+ * 鐧昏浜篿d
+ */
+ @TableField(value = "registrant_id")
+ private String registrantId;
+ /**
+ * 鐧昏鏃ユ湡
+ */
+ @TableField(value = "registration_date")
+ private Date registrationDate;
+}
\ No newline at end of file
diff --git a/main-business/src/main/java/com/ruoyi/business/mapper/PurchaseRegistrationMapper.java b/main-business/src/main/java/com/ruoyi/business/mapper/PurchaseRegistrationMapper.java
new file mode 100644
index 0000000..228f026
--- /dev/null
+++ b/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> {
+
+}
diff --git a/main-business/src/main/java/com/ruoyi/business/service/PurchaseRegistrationService.java b/main-business/src/main/java/com/ruoyi/business/service/PurchaseRegistrationService.java
new file mode 100644
index 0000000..24aef40
--- /dev/null
+++ b/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> {
+
+}
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java
new file mode 100644
index 0000000..d8b297a
--- /dev/null
+++ b/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 {
+
+}
diff --git a/main-business/src/main/resources/db/migration/postgresql/V20250603160101__create_table_purchase_registration.sql b/main-business/src/main/resources/db/migration/postgresql/V20250603160101__create_table_purchase_registration.sql
new file mode 100644
index 0000000..4016199
--- /dev/null
+++ b/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, -- 渚涘簲鍟嗗悕绉癐D锛屼笉鍏佽涓虹┖
+ 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, -- 鐧昏浜篿d锛屼笉鍏佽涓虹┖
+ 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 '鐧昏浜篿d';
+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 '璁板綍鏈�鍚庢洿鏂版椂闂�';
\ No newline at end of file
diff --git a/main-business/src/main/resources/mapper/PurchaseRegistrationMapper.xml b/main-business/src/main/resources/mapper/PurchaseRegistrationMapper.xml
new file mode 100644
index 0000000..f14ea9e
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 777db37..8fabd26 100644
--- a/pom.xml
+++ b/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>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 5187df6..622c28a 100644
--- a/ruoyi-admin/pom.xml
+++ b/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>
--
Gitblit v1.9.3