Commit Graph

622 Commits

Author SHA1 Message Date
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
潘荣晟
4ffa9eeb8f 冲销接口 2025-12-01 16:42:44 +08:00
潘荣晟
e803bee452 修复订单明细删除提示词错误的问题 2025-12-01 16:10:44 +08:00
qianshijiang
c3c004804b Merge remote-tracking branch 'origin/dev' into test 2025-12-01 10:49:07 +08:00
潘荣晟
67d77b1765 服务型订单修复物料信息不返回的问题 2025-12-01 10:26:21 +08:00
qianshijiang
d2f460b62f Merge remote-tracking branch 'origin/dev' into test 2025-11-28 15:41:42 +08:00
潘荣晟
ad0312fc39 Merge remote-tracking branch 'origin/dev' into dev 2025-11-28 15:40:50 +08:00
潘荣晟
c53ef7cd7e 订单删除修改该报错逻辑 2025-11-28 15:40:18 +08:00
guojunyun
250c0d9700 合同提交erp,访问erp接口暂时返回成功 2025-11-28 15:33:24 +08:00
qianshijiang
f30abf806b Merge remote-tracking branch 'origin/dev' into test 2025-11-28 14:08:45 +08:00
潘荣晟
48d6408e92 销售订单明细添加含税单价 2025-11-28 10:12:54 +08:00
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