Browse Source

feat:新增车间管理功能

kgy 6 months ago
parent
commit
36c8ddcdb8

+ 5 - 1
pom.xml

@@ -379,7 +379,11 @@
                 <artifactId>ruoyi-productionManagementOfBulkOrders</artifactId>
                 <version>${revision}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-dataManagement</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!--  工作流模块  -->
             <dependency>

+ 5 - 0
ruoyi-admin/pom.xml

@@ -114,6 +114,11 @@
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-dataManagement</artifactId>
+        </dependency>
+
         <!--  工作流模块  -->
         <dependency>
             <groupId>org.dromara</groupId>

+ 1 - 0
ruoyi-modules/pom.xml

@@ -20,6 +20,7 @@
         <module>ruoyi-commodityManagement</module>
         <module>ruoyi-customerManagement</module>
         <module>ruoyi-productionManagementOfBulkOrders</module>
+        <module>ruoyi-dataManagement</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

+ 52 - 0
ruoyi-modules/ruoyi-dataManagement/pom.xml

@@ -0,0 +1,52 @@
+<?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>
+
+    <groupId>org.dromara</groupId>
+    <artifactId>ruoyi-dataManagement</artifactId>
+    <version>5.3.0</version>
+
+    <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>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.36</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.5.10</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+            <version>${version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+            <version>5.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+            <version>5.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+
+    </dependencies>
+
+</project>

+ 15 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/WorkShopController.java

@@ -0,0 +1,15 @@
+package org.dromara.dataManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.dataManagement.service.WorkShopService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/dataManagement/workshop")
+public class WorkShopController extends BaseController {
+    private final WorkShopService workShopService;
+
+}

+ 39 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/WorkShop.java

@@ -0,0 +1,39 @@
+package org.dromara.dataManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_workshop")
+public class WorkShop extends TenantEntity {
+    /**
+     * 车间id
+     */
+    @NotBlank(message = "编号不能为空")
+    private long id;
+    /**
+     * 车间编号
+     */
+    private String code;
+    /**
+     * 车间名称
+     */
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    /**
+     * 状态:0=关闭,1=正常
+     */
+    private int status;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+}

+ 40 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/bo/WorkShopBo.java

@@ -0,0 +1,40 @@
+package org.dromara.dataManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dataManagement.domain.WorkShop;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WorkShop.class, reverseConvertGenerate = false)
+public class WorkShopBo extends BaseEntity {
+    /**
+     * 车间id
+     */
+    @NotBlank(message = "编号不能为空")
+    private long id;
+    /**
+     * 车间编号
+     */
+    private String code;
+    /**
+     * 车间名称
+     */
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    /**
+     * 状态:0=关闭,1=正常
+     */
+    private int status;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+}

+ 40 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/WorkShopVo.java

@@ -0,0 +1,40 @@
+package org.dromara.dataManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dataManagement.domain.WorkShop;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WorkShop.class)
+public class WorkShopVo extends BaseEntity {
+    /**
+     * 车间id
+     */
+    @NotBlank(message = "编号不能为空")
+    private long id;
+    /**
+     * 车间编号
+     */
+    private String code;
+    /**
+     * 车间名称
+     */
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    /**
+     * 状态:0=关闭,1=正常
+     */
+    private int status;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+}

+ 10 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/WorkShopMapper.java

@@ -0,0 +1,10 @@
+package org.dromara.dataManagement.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.dataManagement.domain.WorkShop;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
+import org.mapstruct.Mapper;
+
+@Mapper
+public interface WorkShopMapper extends BaseMapperPlus<WorkShop, WorkShopVo> {
+}

+ 4 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/WorkShopService.java

@@ -0,0 +1,4 @@
+package org.dromara.dataManagement.service;
+
+public interface WorkShopService {
+}

+ 4 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/WorkShopServiceImpl.java

@@ -0,0 +1,4 @@
+package org.dromara.dataManagement.service.impl;
+
+public class WorkShopServiceImpl {
+}

+ 7 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/resources/mapper/WorkShopMapper.xml

@@ -0,0 +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="org.dromara.dataManagement.mapper.WorkShopMapper">
+
+</mapper>