Commit Graph

653 Commits

Author SHA1 Message Date
qianshijiang
240ad85a60 Merge remote-tracking branch 'origin/dev' into test 2025-11-28 09:52:12 +08:00
潘荣晟
49fcf1086d Merge remote-tracking branch 'origin/dev' into dev 2025-11-28 09:41:54 +08:00
潘荣晟
64e93cc009 订单采购接口物料处理 2025-11-28 09:41:43 +08:00
qianshijiang
bd873339ee 添加备注 2025-11-27 17:12:21 +08:00
qianshijiang
b82e7f127f Merge remote-tracking branch 'origin/dev' into test 2025-11-27 17:07:31 +08:00
潘荣晟
d356f0af46 设置订单初始量默认为0 2025-11-27 16:51:56 +08:00
潘荣晟
843dc28373 设置订单初始量默认为0 2025-11-27 16:51:06 +08:00
潘荣晟
c4095ebe01 设置订单初始量默认为0 2025-11-27 16:38:35 +08:00
潘荣晟
c936f5a5d3 设置订单初始量默认为0 2025-11-27 15:52:05 +08:00
潘荣晟
66bb1f6334 设置订单初始量默认为0 2025-11-27 15:51:29 +08:00
潘荣晟
084cecd7a5 销售订单明细删除校验 2025-11-27 15:25:49 +08:00
qianshijiang
4a08a2bebd Merge remote-tracking branch 'origin/dev' into test 2025-11-27 15:11:23 +08:00
潘荣晟
1273f2433a 订单明细删除校验 2025-11-27 15:05:14 +08:00
qianshijiang
4652df3572 Merge remote-tracking branch 'origin/dev' into test 2025-11-27 14:41:19 +08:00
潘荣晟
322a454afa 订单明细删除校验 2025-11-27 14:40:30 +08:00
潘荣晟
7a403d226c 订单明细删除校验 2025-11-27 14:38:34 +08:00
liss
8a77acfa8b Merge branch 'refs/heads/dev' into test 2025-11-26 17:21:59 +08:00
liss
0b695b0ed9 库位api,合同删除公司ID 2025-11-26 17:07:18 +08:00
liss
bad4a03b39 Merge branch 'refs/heads/dev' into test 2025-11-26 16:51:21 +08:00
liss
a3fe2403a7 库位api,合同删除公司ID 2025-11-26 16:50:37 +08:00
qianshijiang
6bb603ea94 错误信息未记录到日志文件 2025-11-26 15:45:56 +08:00
qianshijiang
770036aecd 日志配置修改 2025-11-26 10:38:00 +08:00
guojunyun
a9a12c3044 合同作废,状态校验错误提示修改 2025-11-26 10:00:40 +08:00
qianshijiang
2a3c10a84d nacos配置 2025-11-26 08:57:35 +08:00
chenbowen
d212a14840 Merge branch 'dev' into test 2025-11-25 18:56:51 +08:00
chenbowen
75341ca6a9 1. 同步 nacos 配置到业务系统 2025-11-25 18:54:38 +08:00
潘荣晟
f8522ef6ae Merge remote-tracking branch 'origin/dev' into dev 2025-11-25 16:43:22 +08:00
潘荣晟
a533b1eb49 添加销售订单明细中的备注字段 2025-11-25 16:40:58 +08:00
liss
0a178dc3f5 Merge branch 'refs/heads/dev' into test 2025-11-25 15:58:17 +08:00
liss
176933b606 内部订单新增公司编码 2025-11-25 15:57:37 +08:00
潘荣晟
7b6fd3b390 Merge remote-tracking branch 'origin/dev' into dev 2025-11-25 15:50:32 +08:00
潘荣晟
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