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 |
|
潘荣晟
|
ec1d99d06b
|
自定义sql添加删除过滤条件
|
2025-12-08 18:17:58 +08:00 |
|
潘荣晟
|
51ab71dc4c
|
自定义sql添加删除过滤条件
|
2025-12-08 18:17:47 +08:00 |
|
qianshijiang
|
fe27a36e7c
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-08 17:30:36 +08:00 |
|
潘荣晟
|
f088f78338
|
自定义sql添加删除过滤条件
|
2025-12-08 17:07:55 +08:00 |
|
qianshijiang
|
2f82bf5d10
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-08 14:42:57 +08:00 |
|
潘荣晟
|
bb4043d8ce
|
订单旧接口新增字段meteringType
|
2025-12-08 14:40:33 +08:00 |
|
潘荣晟
|
6ff755a3da
|
合同批量更新字段
|
2025-12-08 12:03:56 +08:00 |
|
qianshijiang
|
823e66198c
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-05 09:12:35 +08:00 |
|
潘荣晟
|
a71c6756a4
|
合同批量更新字段
|
2025-12-05 09:11:09 +08:00 |
|
qianshijiang
|
9ac3405048
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-05 08:56:19 +08:00 |
|
潘荣晟
|
f4d4a2afe2
|
合同批量更新字段
|
2025-12-04 17:49:31 +08:00 |
|
qianshijiang
|
2cec8e01db
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-04 17:22:32 +08:00 |
|
潘荣晟
|
088a7c3f2d
|
订单详情Feign老街接口优化订单没有单位
|
2025-12-04 17:20:43 +08:00 |
|
潘荣晟
|
93104c7cbb
|
把暂估数量改成数字类型
|
2025-12-04 10:35:45 +08:00 |
|
qianshijiang
|
37a9d622ee
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-04 08:58:50 +08:00 |
|
chenbowen
|
335ea4d9ec
|
1. 提出私服 skywalking 的依赖，使用 ZStack 自带链路追踪
|
2025-12-03 20:33:04 +08:00 |
|
潘荣晟
|
3a5ec948fd
|
合同模版优化
|
2025-12-03 17:58:05 +08:00 |
|
潘荣晟
|
b510dfa731
|
合同模版优化
|
2025-12-03 17:37:13 +08:00 |
|
qianshijiang
|
ac06ad62d0
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-02 17:16:34 +08:00 |
|
潘荣晟
|
0a803c367d
|
累积量
|
2025-12-02 17:14:58 +08:00 |
|
潘荣晟
|
8a4c49059d
|
累积量
|
2025-12-02 17:14:01 +08:00 |
|
潘荣晟
|
2aed717aa1
|
累积量
|
2025-12-02 17:12:44 +08:00 |
|
潘荣晟
|
d821b9616e
|
修复删除订单明细提示错误
|
2025-12-02 16:47:09 +08:00 |
|
qianshijiang
|
969882b618
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-02 14:06:45 +08:00 |
|
潘荣晟
|
04e94b752f
|
修复工厂名称赋值
|
2025-12-02 12:03:32 +08:00 |
|
潘荣晟
|
0c49865166
|
修改删除订单明细时的错误提示
|
2025-12-02 09:54:25 +08:00 |
|
qianshijiang
|
7b8787d096
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-12-01 16:55:20 +08:00 |
|