Commit Graph

687 Commits

Author SHA1 Message Date
潘荣晟
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
潘荣晟
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