Commit Graph

33 Commits

Author SHA1 Message Date
lyd
154878d3f0 更新 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/.env.production 2026-07-21 17:51:48 +08:00
zhouz
77db52a2b3 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	pom.xml
2026-07-17 09:30:06 +08:00
zhouz
5b643a44b4 feat:新增WMS模块。新增仓储CRUD 2026-07-17 09:26:34 +08:00
d857413355 Merge remote-tracking branch 'origin/feature/20260713/task-module'
# Conflicts:
#	nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml
#	pom.xml
2026-07-16 19:26:45 +08:00
be46cf49c5 fix: ACS、PC对任务状态的变化 2026-07-16 14:11:30 +08:00
zhouz
012f792b22 fix:新增部分提示 2026-07-16 13:47:42 +08:00
zhouz
c4bbb381e4 Merge remote-tracking branch 'origin/base-module'
# Conflicts:
#	nl-gateway/src/main/resources/application-dev.yaml
#	nl-module-base/nl-module-base-api/src/main/java/cn/code/nl/module/base/enums/ErrorCodeConstants.java
#	nl-module-base/nl-module-base-server/pom.xml
#	nl-module-base/nl-module-base-server/src/main/resources/application-dev.yaml
#	nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-local.yaml
#	nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml
#	nl-server/src/main/resources/application-dev.yaml
#	nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/base/classstandard/data.ts
#	nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/base/materialbase/data.ts
#	nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/base/materialbase/index.vue
2026-07-16 10:25:02 +08:00
zhouz
67812886de feat:搭建基础模块,新增物流信息、基础分类功能
# Conflicts:
#	nl-gateway/src/main/resources/application-dev.yaml
#	nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-local.yaml
#	nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml
#	nl-server/src/main/resources/application-dev.yaml
2026-07-16 09:51:03 +08:00
zhouz
9f89f16771 fix: 预览改为message提示,修复Modal渲染问题和权限key 2026-07-15 19:57:02 +08:00
zhouz
cfe111a698 fix: 目录和菜单路径统一改为codegen
- views/base/codegen
- api/base/codegen
- 菜单SQL path改为codegen
2026-07-15 19:49:20 +08:00
zhouz
14a784f869 fix: 目录重命名为code-rule匹配菜单路径
- views/base/codegen → views/base/code-rule
- api/base/codegen → api/base/code-rule
- 更新所有内部import路径
- Vben5按菜单路径自动映射views目录
2026-07-15 19:40:47 +08:00
zhouz
d2e767a4fa fix: 删除base.ts路由文件,Vben5自动发现views组件无需手动注册 2026-07-15 19:37:32 +08:00
zhouz
2e79c0348a fix: 路由添加hideInMenu,菜单由后端system_menu控制
未加hideInMenu时Vben5会自行生成顶级菜单入口,绕过数据库菜单管理
2026-07-15 19:15:16 +08:00
zhouz
95664293b2 fix: 预览接口改为admin路径 /base/code-rule/preview 2026-07-15 18:59:56 +08:00
zhouz
fbc5554c6a feat: 新增编码预览功能
- 后端新增 /rpc-api/base/code-gen/preview 接口
- SequenceAllocator.preview 查询序号但不消耗
- 前端操作列新增预览按钮,弹窗展示下一个编码
2026-07-15 18:14:40 +08:00
zhouz
2d65cce27f fix: 修复SegmentEditor添加分段按钮无响应问题
- 使用独立的 showEditor 状态控制编辑器面板显隐
- 初始状态隐藏编辑器,点击添加分段后显示
- 确认/取消后正确复位状态
2026-07-15 17:46:27 +08:00
zhouz
c1ffed6e2d fix: 修复编码规则表单交互问题,新增分段编辑器组件
- Textarea组件名修正为 Input + type:textarea
- 新增 SegmentEditor 交互式分段配置组件(选择类型、配置参数、拖拽排序)
- 修复搜索表单 query 回调缺失 formValues 参数
- 移除不支持的 help schema 属性
2026-07-15 17:43:47 +08:00
zhouz
9f1060f71c feat: 新增编码规则管理前端页面 2026-07-15 17:20:17 +08:00
f24e01c7dd Merge remote-tracking branch 'origin/main' into feature/20260713/task-module
# Conflicts:
#	nl-gateway/src/main/resources/application-dev.yaml
#	nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-local.yaml
#	nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml
#	nl-server/src/main/resources/application-dev.yaml
2026-07-15 16:40:23 +08:00
zhouz
1078563df2 feat:新增单位模块 2026-07-15 10:30:23 +08:00
zhouz
f6950471bf feat:搭建基础模块,新增物流信息、基础分类功能 2026-07-14 17:40:15 +08:00
88b6e21a8c feat: 批量新增字典数据 2026-07-14 15:58:00 +08:00
9953367281 feat: task-job主表crud基础 2026-07-14 14:09:48 +08:00
11fe65a437 feat: 关闭租户配置 2026-07-10 13:49:45 +08:00
b4ddb3cc55 fix: 标题 2026-07-09 14:41:57 +08:00
5486f6e79d fix: 删除菜单包括子级 2026-07-09 13:52:53 +08:00
5749b95327 fix: 配置文件 2026-07-09 11:28:43 +08:00
a8c7d66532 rev: 无用代码 2026-07-08 18:34:06 +08:00
484218c1e4 rev: DocAlert 2026-07-08 16:02:43 +08:00
d5b32e3849 fix: 移除其他模板 2026-07-08 15:56:59 +08:00
2a1a049e9d fix: 移除其他模板 2026-07-08 15:44:54 +08:00
zhouz
237aa9a0df init:前后端代码 2026-07-08 15:08:41 +08:00
7a6105f47e init: 后端代码
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2026-07-08 14:36:19 +08:00