Merge remote-tracking branch 'origin/dev' into dev

base-server/pom.xml

@@ -35,6 +35,11 @@
             <artifactId>yudao-module-contract-order-server</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-module-erp-server</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <!-- Web 相关 -->
         <dependency>

base-server/src/main/resources/application-dev.yml

@@ -105,3 +105,7 @@ justauth:
     prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
+erp:
+   address: hana-dev.yncic.com
+   sapsys: ZTDEV203
+

pom.xml

@@ -10,6 +10,7 @@
     <modules>
         <module>yudao-module-base</module>
         <module>yudao-module-contract-order</module>
+        <module>yudao-module-erp</module>
         <module>base-server</module>
     </modules>
 
@@ -18,7 +19,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.1</revision>
+        <revision>3.0.31</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -146,7 +147,7 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
             <releases>
-                <enabled>false</enabled>
+                <enabled>true</enabled>
             </releases>
         </repository>
     </repositories>
@@ -205,9 +206,9 @@
             </properties>
         </profile>
         <profile>
-            <id>chenbowen</id>
+            <id>liss</id>
             <properties>
-                <config.namespace>chenbowen</config.namespace>
+                <config.namespace>liss</config.namespace>
             </properties>
         </profile>
     </profiles>

yudao-module-erp/pom.xml

@@ -0,0 +1,24 @@
+<?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>dsc-base</artifactId>
+        <groupId>cn.iocoder.cloud</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modules>
+        <module>yudao-module-erp-api</module>
+        <module>yudao-module-erp-server</module>
+    </modules>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yudao-module-erp</artifactId>
+    <packaging>pom</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        ERP 模块。
+    </description>
+
+</project>

yudao-module-erp/yudao-module-erp-api/pom.xml

@@ -0,0 +1,46 @@
+<?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>yudao-module-erp</artifactId>
+        <groupId>cn.iocoder.cloud</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-erp-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>org.springdoc</groupId> <!-- 接口文档：使用最新版本的 Swagger 模型 -->
+            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java

@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.erp.enums;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;// TODO 待办：请将下面的错误码复制到 yudao-module-sply 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
+// ========== ERP客商主数据 TODO 补充编号 ==========
+
+public interface ErrorCodeConstants {
+
+    // ========== 示例模块 1-001-000-000 ==========
+    ErrorCode ERP_CUSTOMER_NOT_EXISTS = new ErrorCode(1_001_000_001, "ERP客商主数据不存在");
+    ErrorCode ERP_MATERIAL_NOT_EXISTS = new ErrorCode(1_001_000_002, "ERP物料数据不存在");
+    ErrorCode ERP_COMPANY_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/ErpServerApplication.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.erp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * ContractOrder 模块的启动类
+ *
+ * @author ZT
+ */
+//@SpringBootApplication
+public class ErpServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ErpServerApplication.class, args);
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/common/enums/OftenEnum.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.erp.common.enums;
+
+import lombok.Data;
+
+/**
+ * @ClassName oftenEnum
+ * @Description TODO
+ * @Author chen
+ * @Date 2023/9/5
+ **/
+@Data
+public class OftenEnum {
+
+    //接口编号枚举
+    public enum FuncnrEnum {
+        公司代码("001"),
+        工厂信息("002"),
+        客商信息("003"),
+        成本中心("004"),
+        内部订单("005"),
+        库位信息("006"),
+        采购组织("007"),
+        销售组织("008"),
+        合同信息("009"),
+        资产卡片("010"),
+        库存信息("011"),
+        辅组编码("012"),
+        生产订单("013"),
+        BOM清单("014"),
+        工艺路线("015"),
+        生产版本("016"),
+        生产投料("017"),
+        生产订单明细("018"),
+        库存明细("019"),
+        发票状态("020"),
+        物料数据("021");
+
+        public String funcnr = null;
+
+        FuncnrEnum(String funcnr) {
+            this.funcnr = funcnr;
+        }
+    }
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/common/task/statisticsTask.java

@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.erp.common.task;
+
+import cn.iocoder.yudao.module.erp.service.erp.ErpCompanyService;
+import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @ClassName energyTask
+ * @Description TODO
+ * @Author chen
+ * @Date 2023/9/25
+ **/
+@Configuration
+@EnableScheduling
+public class statisticsTask {
+
+    @Resource
+    private ErpCompanyService erpCompanyService;
+
+    //能源定时每日获取成本配置机台水电数据
+    @Scheduled(cron = "0 0 12 * * ?")
+    @Transactional
+    public void erpCompany(){
+        erpCompanyService.callErpRfcInterface();
+    }
+
+
+
+}