From 6c82f16f44cf9e51d0fae9593fdefe4c43cb5e55 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 06 五月 2026 15:38:38 +0800
Subject: [PATCH] feat:1.生产追溯（订单-工单-报工-质检） 2.订单工序数据查询 3.领料退料调整
---
src/main/java/com/ruoyi/CodeGenerator.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/CodeGenerator.java b/src/main/java/com/ruoyi/CodeGenerator.java
index ccd51ca..721245b 100644
--- a/src/main/java/com/ruoyi/CodeGenerator.java
+++ b/src/main/java/com/ruoyi/CodeGenerator.java
@@ -5,7 +5,8 @@
import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
-import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+import com.baomidou.mybatisplus.generator.config.OutputFile;
import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
import com.baomidou.mybatisplus.generator.config.po.TableField;
import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
@@ -19,11 +20,11 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://127.0.0.1:3306/product-inventory-management";
+ public static String database_url = "jdbc:mysql://localhost:3300/product-inventory-management-new-pro";
public static String database_username = "root";
- public static String database_password= "123456";
+ public static String database_password= "root";
public static String author = "鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃";
- public static String model = "collaborativeApproval"; // 妯″潡
+ public static String model = "sales"; // 妯″潡
public static String setParent = "com.ruoyi."+ model; // 鍖呰矾寰�
public static String tablePrefix = ""; // 璁剧疆杩囨护琛ㄥ墠缂�
public static void main(String[] args) {
@@ -63,7 +64,7 @@
.packageConfig(builder -> {
builder.entity("pojo");
builder.parent(setParent) // 璁剧疆鐖跺寘鍚�
- .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/src/main/resources/"+model+"/mapper")); // 璁剧疆mapperXml鐢熸垚璺緞
+ .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/src/main/resources/mapper/"+model)); // 璁剧疆mapperXml鐢熸垚璺緞
})
// 绛栫暐閰嶇疆
.strategyConfig(builder -> {
@@ -81,7 +82,7 @@
new Column("update_time", FieldFill.INSERT_UPDATE),
new Column("create_user", FieldFill.INSERT),
new Column("update_user", FieldFill.INSERT_UPDATE),
- new Column("tenant_id", FieldFill.INSERT)
+ new Column("dept_id", FieldFill.INSERT)
)
.idType(IdType.AUTO) // 鑷涓婚敭
@@ -89,6 +90,8 @@
.mapperBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴怣apper鏂囦欢
.enableBaseResultMap() // 鑷姩鐢熸垚resultMap
+ .mapperAnnotation(org.apache.ibatis.annotations.Mapper.class)
+
// Service 绛栫暐閰嶇疆
.serviceBuilder()
.formatServiceFileName("%sService") //鏍煎紡鍖� service 鎺ュ彛鏂囦欢鍚嶇О锛�%s杩涜鍖归厤琛ㄥ悕锛屽 UserService
@@ -116,9 +119,8 @@
StringBuilder help = new StringBuilder();
help.append("璇疯緭鍏�" + tip + "锛�");
System.out.println(help.toString());
- if (scanner.hasNext()) {
- String ipt = scanner.next();
-
+ if (scanner.hasNextLine()) {
+ String ipt = scanner.nextLine();
if (StringUtils.isNotBlank(ipt)) {
return ipt;
}
--
Gitblit v1.9.3