潘荣晟
|
c32d27ad3f
|
新增合同收发货规则
|
2026-01-07 17:10:10 +08:00 |
|
qianshijiang
|
098dc4c572
|
Merge remote-tracking branch 'origin/dev' into test
|
2026-01-07 16:33:05 +08:00 |
|
潘荣晟
|
4b6bd9cec5
|
新增合同收发货规则
|
2026-01-07 16:31:19 +08:00 |
|
潘荣晟
|
7a0dbadf2e
|
新增合同收发货规则
|
2026-01-07 16:20:01 +08:00 |
|
潘荣晟
|
cb554f35f3
|
新增合同收发货规则
|
2026-01-07 16:10:45 +08:00 |
|
wuzongyong
|
426c410818
|
refactor(material): 优化物料编码查询逻辑
- 移除 Mapper 层的 code 字段查询，统一在 Service 层处理
- 添加中铜编码和中铝编码的属性查询支持
- 实现物料编码查询的性能优化，减少数据库查询次数
- 添加分类筛选与编码查询的联合处理逻辑
- 实现属性ID的本地缓存机制，避免重复查询
- 优化查询结果为空时的提前返回逻辑
|
2026-01-07 14:41:00 +08:00 |
|
wuzongyong
|
960c5b5b25
|
refactor(material): 优化物料编码查询逻辑
- 移除 Mapper 层的 code 字段查询，统一在 Service 层处理
- 添加中铜编码和中铝编码的属性查询支持
- 实现物料编码查询的性能优化，减少数据库查询次数
- 添加分类筛选与编码查询的联合处理逻辑
- 实现属性ID的本地缓存机制，避免重复查询
- 优化查询结果为空时的提前返回逻辑
|
2026-01-07 14:39:37 +08:00 |
|
ranke
|
9eb3198ce1
|
Merge branch 'dev' into test
* dev:
组织架构物料管理增加克隆复制功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=684
1. 统一计量单位菜单权限
|
2026-01-07 09:28:46 +08:00 |
|
ranke
|
73df6ca1a5
|
组织架构物料管理增加克隆复制功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=684
|
2026-01-07 09:13:05 +08:00 |
|
chenbowen
|
73b1a59a66
|
1. 统一计量单位菜单权限
|
2026-01-05 19:45:07 +08:00 |
|
chenbowen
|
cbc1f0f853
|
1. 统一计量单位菜单权限
|
2026-01-05 19:44:45 +08:00 |
|
qianshijiang
|
64fc98a479
|
Merge remote-tracking branch 'origin/dev' into test
|
2026-01-04 17:46:23 +08:00 |
|
潘荣晟
|
7a05d1bd3f
|
新增物料查询接口
|
2026-01-04 17:44:10 +08:00 |
|
qianshijiang
|
3c29066d5c
|
数据库配置修改
|
2025-12-31 16:13:07 +08:00 |
|
qianshijiang
|
92819cee70
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-31 15:43:59 +08:00 |
|
潘荣晟
|
60f73d545a
|
新增物料查询接口
|
2025-12-31 15:31:44 +08:00 |
|
qianshijiang
|
e09f094939
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-31 14:50:14 +08:00 |
|
潘荣晟
|
9be0745c03
|
新增销售订单时默认销售状态为执行中
|
2025-12-31 14:49:26 +08:00 |
|
qianshijiang
|
7bc4577ff5
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-31 11:36:52 +08:00 |
|
潘荣晟
|
90d3db4f6d
|
fix：
1、联系人保存报错，去掉甲乙方必填选项
add：
1、新增工厂自动绑定的功能
2、新增工厂更新只能修改绑定的信息、绑定的编码和操作类型
|
2025-12-31 11:35:15 +08:00 |
|
qianshijiang
|
be7bee1300
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-31 08:52:26 +08:00 |
|
潘荣晟
|
69375988c2
|
物料拓展功能实现
|
2025-12-30 18:08:59 +08:00 |
|
潘荣晟
|
4bc69718d8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-12-30 18:08:46 +08:00 |
|
潘荣晟
|
791fe644bf
|
物料拓展功能实现
|
2025-12-30 17:55:08 +08:00 |
|
qianshijiang
|
b3cbd8cec1
|
打印日志
|
2025-12-30 16:00:21 +08:00 |
|
chenbowen
|
9c02a24642
|
Merge branch 'dev' into test
|
2025-12-30 10:59:17 +08:00 |
|
chenbowen
|
6c9cb29af2
|
1. 新增对应的物料信息 feign 接口
|
2025-12-30 10:58:44 +08:00 |
|
chenbowen
|
52a97db86e
|
Merge branch 'dev' into test
|
2025-12-29 17:58:07 +08:00 |
|
潘荣晟
|
1ece64e911
|
新增物料拓展表
|
2025-12-29 17:18:37 +08:00 |
|
jiangh
|
960a34428e
|
计划定额代码迁移到改包后统一提交
|
2025-12-29 16:52:46 +08:00 |
|
hewencai
|
836b2ba65d
|
fix:添加seata达梦数据库兼容补丁
|
2025-12-29 16:14:09 +08:00 |
|
chenbowen
|
146f59c091
|
Revert "1. 临时切换集群配合测试"
This reverts commit 39034b257e.
|
2025-12-27 13:16:10 +08:00 |
|
chenbowen
|
39034b257e
|
1. 临时切换集群配合测试
|
2025-12-27 12:19:22 +08:00 |
|
chenbowen
|
d3df4bb2c7
|
Merge branch 'dev' into test
|
2025-12-25 17:33:39 +08:00 |
|
chenbowen
|
529728fc0f
|
1. 物料新增统一展平属性的接口
2. 修正物料错误的名称
|
2025-12-25 17:33:15 +08:00 |
|
qianshijiang
|
59067c07a5
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-25 11:12:50 +08:00 |
|
潘荣晟
|
80128e275d
|
订单新增字段，元素实体类修改
|
2025-12-25 10:41:39 +08:00 |
|
chenbowen
|
cc5ba069b6
|
1. 同步主数据物料时，需要控制批次大小
|
2025-12-24 18:00:48 +08:00 |
|
qianshijiang
|
3a682d0b23
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-23 17:14:41 +08:00 |
|
潘荣晟
|
398432ddd1
|
国贸2.0推送接口与不提交erp
|
2025-12-23 16:55:19 +08:00 |
|
chenbowen
|
84b44166ee
|
Merge branch 'dev' into test
|
2025-12-23 10:52:36 +08:00 |
|
chenbowen
|
a2b9e04571
|
1. 升级版本
|
2025-12-23 10:50:22 +08:00 |
|
chenbowen
|
c0958dc342
|
Merge branch 'dev' into test
|
2025-12-15 14:28:36 +08:00 |
|
chenbowen
|
d2471d3d8a
|
1. 修复主数据的物料信息ZT前缀时，存在层级判断错误的问题
|
2025-12-15 14:27:01 +08:00 |
|
chenbowen
|
8d0175a13d
|
1. 修复主数据的物料信息ZT前缀时，存在层级判断错误的问题
|
2025-12-15 14:26:03 +08:00 |
|
chenbowen
|
ac27409776
|
Merge branch 'dev' into test
|
2025-12-14 22:15:41 +08:00 |
|
chenbowen
|
7defbbed90
|
1. 修复主数据的物料信息ZT前缀时，存在层级判断错误的问题
|
2025-12-14 22:15:25 +08:00 |
|
qianshijiang
|
ec06f67098
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-10 17:12:29 +08:00 |
|
潘荣晟
|
44d7945f0d
|
冲销接口路径优化
|
2025-12-10 17:10:07 +08:00 |
|
qianshijiang
|
227c9afc4c
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-09 09:44:04 +08:00 |
|