From 173bc22a06fe1557cc50dad94696f48e1b75dc4c Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Sun, 24 Sep 2023 15:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mes=E5=92=8Cscp=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   6 +-
 win-module-mes/pom.xml                        |  23 ++++
 win-module-mes/win-module-mes-api/pom.xml     |  34 +++++
 .../java/com/win/mes}/api/package-info.java   |   2 +-
 win-module-mes/win-module-mes-biz/pom.xml     | 123 ++++++++++++++++++
 win-module-scp/pom.xml                        |  23 ++++
 win-module-scp/win-module-scp-api/pom.xml     |  34 +++++
 .../java/com/win/scp/api/package-info.java    |   4 +
 win-module-scp/win-module-scp-biz/pom.xml     | 123 ++++++++++++++++++
 win-module-wms/pom.xml                        |   3 +-
 .../java/com/win/scp/api/package-info.java    |   4 +
 win-server/pom.xml                            |  12 ++
 12 files changed, 387 insertions(+), 4 deletions(-)
 create mode 100644 win-module-mes/pom.xml
 create mode 100644 win-module-mes/win-module-mes-api/pom.xml
 rename {win-module-wms/win-module-wms-api/src/main/java/com/win/wms => win-module-mes/win-module-mes-api/src/main/java/com/win/mes}/api/package-info.java (71%)
 create mode 100644 win-module-mes/win-module-mes-biz/pom.xml
 create mode 100644 win-module-scp/pom.xml
 create mode 100644 win-module-scp/win-module-scp-api/pom.xml
 create mode 100644 win-module-scp/win-module-scp-api/src/main/java/com/win/scp/api/package-info.java
 create mode 100644 win-module-scp/win-module-scp-biz/pom.xml
 create mode 100644 win-module-wms/win-module-wms-api/src/main/java/com/win/scp/api/package-info.java

diff --git a/pom.xml b/pom.xml
index e038d42d..e691dc1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,10 @@
         <module>win-module-report</module>
         <!-- wms -->
         <module>win-module-wms</module>
+        <!-- mes -->
+        <module>win-module-mes</module>
+        <!-- scp -->
+        <module>win-module-scp</module>
     </modules>
 
     <name>${project.artifactId}</name>
@@ -28,7 +32,7 @@
     <properties>
         <revision>3.0.0</revision>
         <!-- Maven 相关 -->
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
diff --git a/win-module-mes/pom.xml b/win-module-mes/pom.xml
new file mode 100644
index 00000000..52fba47c
--- /dev/null
+++ b/win-module-mes/pom.xml
@@ -0,0 +1,23 @@
+<?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>
+        <groupId>com.win</groupId>
+        <artifactId>win</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <modules>
+        <module>win-module-mes-api</module>
+        <module>win-module-mes-biz</module>
+    </modules>
+    <artifactId>win-module-mes</artifactId>
+    <packaging>pom</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        mes 模块下，我们放通用业务，支撑上层的核心业务。
+    </description>
+
+</project>
diff --git a/win-module-mes/win-module-mes-api/pom.xml b/win-module-mes/win-module-mes-api/pom.xml
new file mode 100644
index 00000000..e3bff9f3
--- /dev/null
+++ b/win-module-mes/win-module-mes-api/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">
+    <parent>
+        <groupId>com.win</groupId>
+        <artifactId>win-module-mes</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>win-module-mes-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        mes 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-common</artifactId>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/wms/api/package-info.java b/win-module-mes/win-module-mes-api/src/main/java/com/win/mes/api/package-info.java
similarity index 71%
rename from win-module-wms/win-module-wms-api/src/main/java/com/win/wms/api/package-info.java
rename to win-module-mes/win-module-mes-api/src/main/java/com/win/mes/api/package-info.java
index 0bd08a00..1793cd76 100644
--- a/win-module-wms/win-module-wms-api/src/main/java/com/win/wms/api/package-info.java
+++ b/win-module-mes/win-module-mes-api/src/main/java/com/win/mes/api/package-info.java
@@ -1,4 +1,4 @@
 /**
  * System API 包，定义暴露给其它模块的 API
  */
-package com.win.wms.api;
+package com.win.scp.api;
diff --git a/win-module-mes/win-module-mes-biz/pom.xml b/win-module-mes/win-module-mes-biz/pom.xml
new file mode 100644
index 00000000..b9fde084
--- /dev/null
+++ b/win-module-mes/win-module-mes-biz/pom.xml
@@ -0,0 +1,123 @@
+<?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>
+        <groupId>com.win</groupId>
+        <artifactId>win-module-mes</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>win-module-mes-biz</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        mes 模块下，我们放通用业务，支撑上层的核心业务。
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-system-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-infra-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-operatelog</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-sms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-dict</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-data-permission</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-social</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-ip</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-weixin</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-redis</artifactId>
+        </dependency>
+
+        <!-- Job 定时任务相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-job</artifactId>
+        </dependency>
+
+        <!-- 消息队列相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-mq</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-captcha</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/win-module-scp/pom.xml b/win-module-scp/pom.xml
new file mode 100644
index 00000000..ed8142e5
--- /dev/null
+++ b/win-module-scp/pom.xml
@@ -0,0 +1,23 @@
+<?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>
+        <groupId>com.win</groupId>
+        <artifactId>win</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <modules>
+        <module>win-module-scp-api</module>
+        <module>win-module-scp-biz</module>
+    </modules>
+    <artifactId>win-module-scp</artifactId>
+    <packaging>pom</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        scp 模块下，我们放通用业务，支撑上层的核心业务。
+    </description>
+
+</project>
diff --git a/win-module-scp/win-module-scp-api/pom.xml b/win-module-scp/win-module-scp-api/pom.xml
new file mode 100644
index 00000000..a456bd9e
--- /dev/null
+++ b/win-module-scp/win-module-scp-api/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">
+    <parent>
+        <groupId>com.win</groupId>
+        <artifactId>win-module-scp</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>win-module-scp-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        scp 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-common</artifactId>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/win-module-scp/win-module-scp-api/src/main/java/com/win/scp/api/package-info.java b/win-module-scp/win-module-scp-api/src/main/java/com/win/scp/api/package-info.java
new file mode 100644
index 00000000..1793cd76
--- /dev/null
+++ b/win-module-scp/win-module-scp-api/src/main/java/com/win/scp/api/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * System API 包，定义暴露给其它模块的 API
+ */
+package com.win.scp.api;
diff --git a/win-module-scp/win-module-scp-biz/pom.xml b/win-module-scp/win-module-scp-biz/pom.xml
new file mode 100644
index 00000000..cc45ae89
--- /dev/null
+++ b/win-module-scp/win-module-scp-biz/pom.xml
@@ -0,0 +1,123 @@
+<?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>
+        <groupId>com.win</groupId>
+        <artifactId>win-module-scp</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>win-module-scp-biz</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        scp 模块下，我们放通用业务，支撑上层的核心业务。
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-system-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-infra-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-operatelog</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-sms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-dict</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-data-permission</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-social</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-ip</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-biz-weixin</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-redis</artifactId>
+        </dependency>
+
+        <!-- Job 定时任务相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-job</artifactId>
+        </dependency>
+
+        <!-- 消息队列相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-mq</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-spring-boot-starter-captcha</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/win-module-wms/pom.xml b/win-module-wms/pom.xml
index 723241c1..0e8a8865 100644
--- a/win-module-wms/pom.xml
+++ b/win-module-wms/pom.xml
@@ -17,8 +17,7 @@
 
     <name>${project.artifactId}</name>
     <description>
-        system 模块下，我们放通用业务，支撑上层的核心业务。
-        例如说：用户、部门、权限、数据字典等等
+        scp 模块下，我们放通用业务，支撑上层的核心业务。
     </description>
 
 </project>
diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/scp/api/package-info.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/scp/api/package-info.java
new file mode 100644
index 00000000..1793cd76
--- /dev/null
+++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/scp/api/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * System API 包，定义暴露给其它模块的 API
+ */
+package com.win.scp.api;
diff --git a/win-server/pom.xml b/win-server/pom.xml
index f81e49eb..ebace6af 100644
--- a/win-server/pom.xml
+++ b/win-server/pom.xml
@@ -28,6 +28,18 @@
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-mes-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-scp-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.win</groupId>
             <artifactId>win-module-system-biz</artifactId>