|
|
736618cefa
|
feat：组盘PC
|
2026-07-21 14:21:34 +08:00 |
|
|
|
11bada2873
|
fix: demo
|
2026-07-20 15:09:58 +08:00 |
|
zhouz
|
503d8c9e82
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
# Conflicts:
# nl-module-wms/nl-module-wms-api/src/main/java/cn/code/nl/module/wms/enums/ErrorCodeConstants.java
# nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/packages/constants/src/dict-enum.ts
|
2026-07-20 15:02:35 +08:00 |
|
zhouz
|
949609246e
|
feat:仓库、库区、仓位基础功能
|
2026-07-20 15:01:50 +08:00 |
|
|
|
1a8474e263
|
fix: wms任务完成取消消费者
|
2026-07-20 14:33:10 +08:00 |
|
|
|
bd4542e9ac
|
fix: 下沉消息体对象
|
2026-07-20 13:53:08 +08:00 |
|
|
|
289086275b
|
fix: 配置
|
2026-07-20 13:52:41 +08:00 |
|
|
|
5bf17863fd
|
fix: 下沉消息体对象
|
2026-07-20 13:49:32 +08:00 |
|
|
|
0bf1099fdb
|
feat：消费者
|
2026-07-20 13:41:52 +08:00 |
|
|
|
a2eb01dd5a
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
|
2026-07-18 17:38:51 +08:00 |
|
|
|
72b2fe9243
|
fix: oauth2文档
|
2026-07-18 17:38:34 +08:00 |
|
|
|
63b3a5e7f3
|
feat：策略责任链
|
2026-07-18 15:34:15 +08:00 |
|
|
|
e827d1cb07
|
feat：策略
|
2026-07-18 13:58:29 +08:00 |
|
zhouz
|
d60f33022c
|
Merge remote-tracking branch 'origin/main' into feature/20260716/wms-module
|
2026-07-18 10:35:40 +08:00 |
|
|
|
90f3aa4261
|
feat：策略
|
2026-07-17 17:42:29 +08:00 |
|
zhouz
|
ad1eef8a54
|
feat:仓库页面优化
|
2026-07-17 11:10:36 +08:00 |
|
|
|
2582c4e474
|
feat：测试配置文件、定义xxljob端口
|
2026-07-17 10:24:11 +08:00 |
|
|
|
9753d88079
|
fix: pom依赖
|
2026-07-17 09:55:04 +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 |
|
|
|
8aa40e84d3
|
fix: 多余的pom依赖
|
2026-07-16 19:42:58 +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 |
|
|
|
d429a09531
|
Refactor document workflow and related UI state
|
2026-07-16 19:07:09 +08:00 |
|
|
|
1d12732646
|
fix: 任务定位
|
2026-07-16 15:44:58 +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
|
207fc48fbc
|
fix:修改nacos账号密码
|
2026-07-16 10:13:34 +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
|
f3ef75f990
|
fix: 放弃Jackson多态，改用普通DTO避免type序列化冲突
- SegmentConfig改为普通POJO，移除@JsonTypeInfo和子类
- CodeGenServiceImpl/SequenceAllocator直接用SegmentConfig
- 彻底消除type字段序列化/反序列化的冲突问题
|
2026-07-15 18:08:50 +08:00 |
|
zhouz
|
98dca0edb1
|
fix: 修复SegmentConfig Jackson多态序列化type冲突
- 移除SegmentConfig中与@JsonTypeInfo冲突的type字段
- buildSegment改用instanceof替代getType()
- 避免序列化时type覆盖为null导致反序列化失败
|
2026-07-15 17:59:10 +08:00 |
|
zhouz
|
9ecf5f6582
|
fix: separator改为code_separator避免MySQL保留关键字冲突
|
2026-07-15 17:51:54 +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
|
c0d00d8b94
|
feat: 补充编码规则按钮权限SQL（query/create/update/delete）
|
2026-07-15 17:35:28 +08:00 |
|
zhouz
|
cc0e417bbf
|
feat: 新增编码规则菜单SQL
|
2026-07-15 17:23:46 +08:00 |
|
zhouz
|
9f1060f71c
|
feat: 新增编码规则管理前端页面
|
2026-07-15 17:20:17 +08:00 |
|
zhouz
|
9a8dce7a76
|
fix: 显式引入lock4j-redisson依赖，修复编译错误
|
2026-07-15 17:14:48 +08:00 |
|
zhouz
|
92f4ad96a0
|
feat: 新增编码生成RPC API Controller
|
2026-07-15 17:10:36 +08:00 |
|
zhouz
|
2ace4ea21c
|
feat: 新增编码规则管理Controller
|
2026-07-15 17:09:36 +08:00 |
|
zhouz
|
ca8dfde35a
|
feat: 新增编码生成核心引擎
|
2026-07-15 17:08:40 +08:00 |
|
zhouz
|
24e407585f
|
feat: 新增 SequenceAllocator 号段预分配器
- 创建 SequenceAllocator 组件，支持号段预分配和分布式锁实时两种策略
- 使用 @Lock4j 注解实现分布式锁，通过自注入模式解决 Spring AOP 内部调用问题
- 本地 ConcurrentHashMap 缓存号段，AtomicLong 做内存 CAS 递增
- 补位格式化支持自定义补位字符和长度
- 重置维度支持 DAY/MONTH/YEAR/GLOBAL
- 添加 nl-spring-boot-starter-protection 依赖
|
2026-07-15 17:07:03 +08:00 |
|
zhouz
|
c77bfd5eaf
|
feat: 新增编码规则管理Service
|
2026-07-15 17:02:59 +08:00 |
|
