liss
|
6ce81171c3
|
Merge branch 'refs/heads/dev' into test
|
2025-10-23 11:20:24 +08:00 |
|
liss
|
a04df5982f
|
金属元素添加字段
|
2025-10-23 11:17:08 +08:00 |
|
guojunyun
|
678ee43ebc
|
提交erp移除异常处理
|
2025-10-23 11:12:12 +08:00 |
|
guojunyun
|
75e4ffcad1
|
新增合同移除原币金额-变更后、本币金额-变更后默认赋值
|
2025-10-23 11:06:50 +08:00 |
|
guojunyun
|
5dc2358a8b
|
合同映射表值修改
|
2025-10-23 10:31:43 +08:00 |
|
liss
|
901a748920
|
Merge branch 'refs/heads/dev' into test
|
2025-10-23 10:28:34 +08:00 |
|
liss
|
d98aec5a4c
|
税码信息DO注解
|
2025-10-23 10:25:49 +08:00 |
|
guojunyun
|
f9f8da270f
|
提交erp合同状态判断逻辑修改：作废、已完结
|
2025-10-23 09:42:29 +08:00 |
|
hewencai
|
daefd6c316
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-23 08:44:47 +08:00 |
|
liss
|
8725bb44f7
|
税码信息
|
2025-10-22 18:14:06 +08:00 |
|
潘荣晟
|
c802d47043
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-22 17:30:44 +08:00 |
|
潘荣晟
|
4d85ea4ebd
|
订单管理相关
|
2025-10-22 17:29:29 +08:00 |
|
hewencai
|
fc289752df
|
feat:新增计量单位管理模块，包括实体、请求和响应对象，服务接口及实现，控制器，依赖配置等
|
2025-10-22 16:56:13 +08:00 |
|
guojunyun
|
7c283993a5
|
提交erp判断逻辑修改：请求参数和返回数据修改
|
2025-10-22 16:47:31 +08:00 |
|
chenbowen
|
0a5f8c67f9
|
Merge branch 'dev' into test
|
2025-10-22 16:07:47 +08:00 |
|
chenbowen
|
a2794fecfb
|
模块独立命名
|
2025-10-22 16:06:26 +08:00 |
|
guojunyun
|
3d396dbb52
|
合同新增逻辑修改：原币金额-变更后、本币金额-变更后默认0
提交erp判断逻辑修改：修改错误返回值解析方式
|
2025-10-22 16:02:36 +08:00 |
|
guojunyun
|
7b7658bab1
|
调整价配置上限、下线字段类型修改BigDecimal
|
2025-10-22 11:39:46 +08:00 |
|
liss
|
a63d90faf2
|
Merge branch 'refs/heads/dev' into test
|
2025-10-22 10:47:46 +08:00 |
|
liss
|
ecff39b2e5
|
erp根据工厂、物料查询生产版本外部调用测试
|
2025-10-22 10:47:00 +08:00 |
|
liss
|
3ced883117
|
erp根据工厂、物料查询生产版本
|
2025-10-22 10:30:46 +08:00 |
|
qianshijiang
|
9ed4562cf3
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-10-22 10:26:42 +08:00 |
|
qianshijiang
|
8e85e47a1d
|
添加日志配置
|
2025-10-22 10:25:43 +08:00 |
|
qianshijiang
|
302ef4c97d
|
添加日志配置
|
2025-10-22 10:24:18 +08:00 |
|
qianshijiang
|
dc8117e330
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-10-22 10:23:30 +08:00 |
|
guojunyun
|
c96f9cfd21
|
根据合同ID获得关联合同
|
2025-10-22 10:03:20 +08:00 |
|
guojunyun
|
0b159891df
|
根据合同ID获得关联合同
|
2025-10-22 10:01:50 +08:00 |
|
guojunyun
|
289cb1a382
|
合同检索添加合同分类查询条件
|
2025-10-22 09:32:16 +08:00 |
|
潘荣晟
|
c5467b2c71
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-21 18:05:13 +08:00 |
|
潘荣晟
|
a0a27c4d01
|
订单管理相关
|
2025-10-21 18:04:57 +08:00 |
|
潘荣晟
|
688f4f17a0
|
订单管理相关
|
2025-10-21 18:04:21 +08:00 |
|
guojunyun
|
a4b997ec49
|
提交erp逻辑修改、修改合同校验修改
|
2025-10-21 16:23:24 +08:00 |
|
liss
|
6fc5682374
|
erp生产版本，工艺路线，组计数器，反了
|
2025-10-21 15:23:47 +08:00 |
|
liss
|
5679aade47
|
erp测试修改
|
2025-10-21 15:10:15 +08:00 |
|
liss
|
06e1a77873
|
erp生产版本工厂，物料字段反了
|
2025-10-21 14:43:09 +08:00 |
|
liss
|
a2e2c47951
|
erp提交接口字段说明
|
2025-10-21 09:52:15 +08:00 |
|
guojunyun
|
2732a45220
|
字典修改
|
2025-10-21 09:19:57 +08:00 |
|
潘荣晟
|
b6ad2a71e4
|
订单管理相关
|
2025-10-20 18:00:53 +08:00 |
|
潘荣晟
|
bcdab44cda
|
订单管理相关
|
2025-10-20 16:19:53 +08:00 |
|
liss
|
cb6842bae8
|
Merge branch 'refs/heads/dev' into test
|
2025-10-20 16:09:17 +08:00 |
|
liss
|
d365732a0e
|
查询物料erp关联拓展关系
|
2025-10-20 16:08:50 +08:00 |
|
liss
|
5b5ceca41b
|
erpjob获取erp定时任务
|
2025-10-20 15:52:10 +08:00 |
|
liss
|
9b00faeddb
|
erpjob重命名提交测试
|
2025-10-20 15:49:03 +08:00 |
|
liss
|
26e3fba2a6
|
erp客商主、物料查询没数据直接返回
|
2025-10-20 15:46:10 +08:00 |
|
guojunyun
|
6bed3e7102
|
合同主信息添加ERP甲方公司编号、ERP甲方公司名称、ERP乙方公司编码、ERP乙方公司名称
|
2025-10-20 14:34:53 +08:00 |
|
guojunyun
|
627e9871bc
|
合同主信息添加合同分类
|
2025-10-20 10:08:00 +08:00 |
|
liss
|
fe6720a473
|
Merge branch 'refs/heads/dev' into test
|
2025-10-17 18:01:18 +08:00 |
|
liss
|
5604fd596a
|
erp定时任务去除try/catch
|
2025-10-17 18:00:42 +08:00 |
|
liss
|
7e4f7998a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-17 17:58:11 +08:00 |
|
guojunyun
|
37c3a10b00
|
删除合同时更新合同状态
合同审核时状态校验
提交erp接口调整
|
2025-10-17 17:17:11 +08:00 |
|