zhouz
|
5e8f72e211
|
fix:页面优化
|
2026-07-23 14:47:55 +08:00 |
|
zhouz
|
05c3d92abf
|
feat:新增出库单新增功能
|
2026-07-23 13:28:17 +08:00 |
|
zhouz
|
25cbaf9078
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
# Conflicts:
# nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/framework/rpc/config/RpcConfiguration.java
|
2026-07-22 16:40:10 +08:00 |
|
|
|
586ce7ed40
|
feat：载具信息批量新增
|
2026-07-22 16:36:46 +08:00 |
|
zhouz
|
4e276c5b05
|
fix: 保存前重校验出库库存
|
2026-07-22 16:02:43 +08:00 |
|
zhouz
|
a841118805
|
fix: 防止出库编辑请求串扰
|
2026-07-22 15:48:08 +08:00 |
|
zhouz
|
88b70e6729
|
fix: 修正出库单字典加载与详情标识
|
2026-07-22 15:43:26 +08:00 |
|
zhouz
|
e5f56057c3
|
feat: 按参考布局实现出库单新增页
|
2026-07-22 15:37:44 +08:00 |
|
zhouz
|
733ef97a3b
|
fix: 取消过期库存分页请求
|
2026-07-22 15:26:58 +08:00 |
|
zhouz
|
6210286518
|
fix: 完善库存跨页选择稳定性
|
2026-07-22 15:23:13 +08:00 |
|
zhouz
|
d4a28480f1
|
feat: 增加出库库存选择和手工汇总弹窗
|
2026-07-22 15:15:47 +08:00 |
|
zhouz
|
36d0be1500
|
fix: 收紧出库请求与汇总类型
|
2026-07-22 15:08:16 +08:00 |
|
zhouz
|
0eeca46945
|
feat: 增加出库单前端聚合接口与汇总逻辑
|
2026-07-22 15:03:46 +08:00 |
|
|
|
d9e76de039
|
feat：载具信息新增
|
2026-07-22 14:27:30 +08:00 |
|
zhouz
|
80fe1e4dcb
|
Revert "feat: 前端 API 层新增出库单带明细创建和可用库存查询"
This reverts commit c03e1a97cc.
|
2026-07-22 13:38:17 +08:00 |
|
zhouz
|
ffa2c7ee03
|
Revert "feat: 新增手动新增汇总弹窗组件 manual-detail.vue"
This reverts commit e5e12fb799.
|
2026-07-22 13:38:16 +08:00 |
|
zhouz
|
6f65ec0fe2
|
Revert "feat: 重构出库单新增页面（form.vue + 库存选择 + 手动汇总组件）"
This reverts commit ea9ae91089.
|
2026-07-22 13:38:15 +08:00 |
|
zhouz
|
97e7f13e28
|
Revert "fix: 修复表单布局、日期默认值、子弹窗打开/关闭问题"
This reverts commit 31a3906e24.
|
2026-07-22 13:38:15 +08:00 |
|
zhouz
|
350ff7c107
|
Revert "fix: 修复前端报错 — VxeTable组件、MaterialSelectModal路径、dayjs类型"
This reverts commit ec05ee98d0.
|
2026-07-22 13:38:14 +08:00 |
|
zhouz
|
865a128100
|
Revert "fix: storId 选择追踪 — 用 onChange + selectedStorId ref + fallback"
This reverts commit 890edbc948.
|
2026-07-22 13:38:14 +08:00 |
|
zhouz
|
21204495a8
|
Revert "fix: 仓库/业务类型下拉改用 api 模式加载，selectedStorId 追踪修复"
This reverts commit e018ad54cc.
|
2026-07-22 13:38:14 +08:00 |
|
|
|
73c401477c
|
feat：载具信息表1
|
2026-07-22 13:24:30 +08:00 |
|
zhouz
|
e018ad54cc
|
fix: 仓库/业务类型下拉改用 api 模式加载，selectedStorId 追踪修复
- storId/billType Select 用 api + labelField + valueField 标准模式
- loadWarehouseOptions 同时填充 warehouseMap 供提交时查 storCode/storName
- selectedStorId 通过 Select onChange 同步 + formApi.getValues fallback
- 移除无效的 formApi.setProps/getSchema hack
|
2026-07-22 13:23:24 +08:00 |
|
zhouz
|
890edbc948
|
fix: storId 选择追踪 — 用 onChange + selectedStorId ref + fallback
- Select onChange 同步选中的仓库 ID 到 selectedStorId ref
- handleSelectFromInventory fallback 兜底 formApi.getValues().storId
- 仓库切换 watch selectedStorId 清空明细
|
2026-07-22 13:21:16 +08:00 |
|
zhouz
|
ec05ee98d0
|
fix: 修复前端报错 — VxeTable组件、MaterialSelectModal路径、dayjs类型
- 明细表改用 VxeTable + VxeColumn（项目标准模式）
- MaterialSelectModal 导入路径从 ../../ 改为 ../../../
- ref 类型简化为 any，去掉 InstanceType<typeof>
- dayjs 导入用于业务日期默认当天
|
2026-07-22 11:27:25 +08:00 |
|
zhouz
|
31a3906e24
|
fix: 修复表单布局、日期默认值、子弹窗打开/关闭问题
- 业务日期默认当天（dayjs）
- 表单 col-span-1 多列布局
- 子弹窗改为 ref + defineExpose 调用，解决 connectedComponent 冲突
- 物料选择弹窗路径修正
|
2026-07-22 10:35:46 +08:00 |
|
zhouz
|
ea9ae91089
|
feat: 重构出库单新增页面（form.vue + 库存选择 + 手动汇总组件）
|
2026-07-22 09:57:44 +08:00 |
|
zhouz
|
e5e12fb799
|
feat: 新增手动新增汇总弹窗组件 manual-detail.vue
- 使用 useVbenModal + useVbenForm 组合
- 集成 MaterialSelectModal 进行物料选择
- 支持物料、出库重量、单位、批次、备注字段
- 单位自动从物料信息带出
- 弹窗打开时重置表单
|
2026-07-22 09:56:04 +08:00 |
|
zhouz
|
c03e1a97cc
|
feat: 前端 API 层新增出库单带明细创建和可用库存查询
|
2026-07-22 09:53:50 +08:00 |
|
|
|
bae3a33088
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
|
2026-07-22 09:31:53 +08:00 |
|
|
|
2bac7d1648
|
feat：载具信息表
|
2026-07-22 09:31:40 +08:00 |
|
zhouz
|
44dac0a552
|
feat:新增出入库单查询页面及配置文件修改
|
2026-07-22 08:54:03 +08:00 |
|
|
|
6380b93774
|
feat：组盘PC
|
2026-07-21 14:57:03 +08:00 |
|
|
|
736618cefa
|
feat：组盘PC
|
2026-07-21 14:21:34 +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 |
|
|
|
63b3a5e7f3
|
feat：策略责任链
|
2026-07-18 15:34:15 +08:00 |
|
|
|
e827d1cb07
|
feat：策略
|
2026-07-18 13:58:29 +08:00 |
|
|
|
90f3aa4261
|
feat：策略
|
2026-07-17 17:42:29 +08:00 |
|
zhouz
|
ad1eef8a54
|
feat:仓库页面优化
|
2026-07-17 11:10:36 +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 |
|
