Commit Graph

672 Commits

Author SHA1 Message Date
潘荣晟
696accd8d2 修复Feign接口。订单明细信息缺失 2025-11-25 15:50:19 +08:00
qianshijiang
75d08e32b1 优化 2025-11-25 15:25:24 +08:00
潘荣晟
b237f3ea7b 添加DTO注释 2025-11-25 15:14:25 +08:00
潘荣晟
2febb69147 添加DTO注释 2025-11-25 15:11:10 +08:00
潘荣晟
1690dfe87c Merge remote-tracking branch 'origin/dev' into dev 2025-11-25 14:47:38 +08:00
潘荣晟
e19056f021 更新计量单为 2025-11-25 14:45:52 +08:00
chenbowen
1b5f5f3874 Merge branch 'dev' into test 2025-11-25 10:41:39 +08:00
chenbowen
bbc1970215 1. 修复 base 编译错误 2025-11-25 10:41:27 +08:00
chenbowen
306d969bc1 Merge branch 'dev' into test 2025-11-25 09:40:18 +08:00
chenbowen
f4bb887f09 1. 升级私有包版本 2025-11-25 09:37:43 +08:00
chenbowen
6adda4ac72 1. 调整业务 pod 资源检查的延时 2025-11-25 08:48:31 +08:00
chenbowen
2e65960bf1 1. 新增物料相关接口
2. 修复部分服务因为包名设置错误导致无法采集日志的错误
2025-11-25 08:48:31 +08:00
chenbowen
4f50e517b8 调整业务服务的时区 2025-11-25 08:48:31 +08:00
guojunyun
116f2ba386 合同数据结构修改、合同审核接口部分代码 2025-11-25 08:48:12 +08:00
潘荣晟
1b9e28be5a 新增业务逻辑 2025-11-25 08:47:37 +08:00
qianshijiang
26be89f0c7 日志打印 2025-11-24 14:42:55 +08:00
潘荣晟
d6eaa44020 删除dto表 2025-11-24 14:31:05 +08:00
潘荣晟
68af18ffa3 采购订单非空校验 2025-11-24 11:32:37 +08:00
孙承赐
a3e3e1c2bc Merge branch 'dev' into 'test'
开票检验erp相关接口

See merge request jygk/dsc-base!23
2025-11-21 10:32:58 +00:00
潘荣晟
a0a9d741dd 开票检验erp相关接口 2025-11-21 17:59:15 +08:00
qianshijiang
b4905ba143 Merge remote-tracking branch 'origin/dev' into test 2025-11-20 15:26:57 +08:00
guojunyun
584998b129 SZHGYL-289修改 2025-11-20 15:23:37 +08:00
guojunyun
b2c7ca399a 收发货单提交erp接口 2025-11-20 11:07:16 +08:00
潘荣晟
5a4d79449e 权限标识 2025-11-20 09:44:43 +08:00
潘荣晟
216ecf75c5 权限标识 2025-11-20 09:40:06 +08:00
qianshijiang
b337a9412c Merge remote-tracking branch 'origin/dev' into test 2025-11-19 17:58:18 +08:00
guojunyun
cff5a9d31d supplierNumber赋值修改 2025-11-19 17:56:59 +08:00
guojunyun
feb7b490c9 SZHGYL-289修改 2025-11-19 17:26:09 +08:00
liss
8b187a6ff8 客商erp更新优化 2025-11-19 16:45:36 +08:00
guojunyun
d325ceb06a erp提交默认返回成功修改 2025-11-19 16:30:20 +08:00
qianshijiang
7e282e80e4 Merge remote-tracking branch 'origin/dev' into test 2025-11-19 16:22:06 +08:00
潘荣晟
7ca81a74b5 Merge remote-tracking branch 'origin/dev' into dev 2025-11-19 16:21:00 +08:00
潘荣晟
58612efd77 销售订单明细修复订单单位不显示的问题 2025-11-19 16:20:17 +08:00
chenbowen
adcafa3784 Merge branch 'dev' into test 2025-11-19 15:44:24 +08:00
guojunyun
05069e2846 SZHGYL-289修改 2025-11-19 15:15:37 +08:00
chenbowen
f596500151 1. 升级私有包版本 2025-11-19 14:48:07 +08:00
付鹏飞
c39ffa54ee Merge branch 'dev' into 'test'
销售订单明细修复订单不显示的问题

See merge request jygk/dsc-base!22
2025-11-19 03:35:46 +00:00
潘荣晟
d5572c200b 销售订单明细修复订单不显示的问题 2025-11-19 11:32:52 +08:00
qianshijiang
fb3dfaec48 Merge remote-tracking branch 'origin/dev' into test 2025-11-19 11:10:09 +08:00
潘荣晟
dc37a2f587 Merge remote-tracking branch 'origin/dev' into dev 2025-11-19 11:05:43 +08:00
潘荣晟
b7cfe7485e 【销售订单-订单检索】查询条件字段需要支持模糊查询修复 2025-11-19 11:02:03 +08:00
qianshijiang
ed94355886 Merge remote-tracking branch 'origin/dev' into test 2025-11-18 17:41:04 +08:00
guojunyun
685ba9473b 查询结算公式列表:增加明细列表数据返回 2025-11-18 14:44:31 +08:00
guojunyun
09f8db69c4 SZHGYL-251修改 2025-11-18 10:19:16 +08:00
liss
925f4ab650 Merge branch 'refs/heads/dev' into test 2025-11-17 18:34:09 +08:00
liss
cfdeb40a23 金属元素新增BUG 2025-11-17 18:33:33 +08:00
潘荣晟
10bfece481 Merge remote-tracking branch 'origin/dev' into dev 2025-11-17 18:15:05 +08:00
潘荣晟
79a760a379 开票检验 2025-11-17 18:14:50 +08:00
liss
a65938b6af Merge branch 'refs/heads/dev' into test 2025-11-17 18:08:26 +08:00
liss
dd9142a670 金属元素缩新增分页查询,生产订单erp分页查询 2025-11-17 18:07:54 +08:00