liss
|
9603c7f1a7
|
Merge branch 'refs/heads/dev' into test
|
2025-11-17 00:47:56 +08:00 |
|
liss
|
8faa14d227
|
金属元素缩写重复校验，生产订单定时任务获取
|
2025-11-17 00:45:26 +08:00 |
|
周迪
|
3230fb9a44
|
Merge branch 'dev' into 'test'
新增根据合同编号获得交易信息接口
See merge request jygk/dsc-base!20
|
2025-11-14 14:06:38 +00:00 |
|
guojunyun
|
82219fd733
|
新增根据合同编号获得交易信息接口
|
2025-11-14 17:15:58 +08:00 |
|
hxt
|
b5c7c9b479
|
Merge branch 'dev' into test
|
2025-11-14 17:11:39 +08:00 |
|
hxt
|
f797283021
|
订单单位
|
2025-11-14 17:10:39 +08:00 |
|
qianshijiang
|
0d98763496
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-14 14:54:23 +08:00 |
|
潘荣晟
|
d382abba10
|
模版修改
|
2025-11-14 14:51:20 +08:00 |
|
guojunyun
|
a6922e57da
|
字符串转换
|
2025-11-14 14:43:15 +08:00 |
|
liss
|
2d93ceda4f
|
Merge branch 'refs/heads/dev' into test
|
2025-11-14 11:51:57 +08:00 |
|
liss
|
1bcaca0d99
|
客商删除启用
|
2025-11-14 11:51:31 +08:00 |
|
wencai he
|
c6b01740ea
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc-base!19
|
2025-11-14 01:49:37 +00:00 |
|
guojunyun
|
d4998009a1
|
合同明细新增字段
|
2025-11-14 09:38:25 +08:00 |
|
hewencai
|
cc112ecec0
|
add:增加计量单位转换feign api
|
2025-11-13 19:23:54 +08:00 |
|
liss
|
e72e1c529c
|
Merge branch 'refs/heads/dev' into test
|
2025-11-13 18:40:18 +08:00 |
|
liss
|
5cf61ee5d2
|
bug修改，物料编辑、客商加税号、公司查询
|
2025-11-13 18:39:42 +08:00 |
|
qianshijiang
|
333cc203c3
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-13 17:53:25 +08:00 |
|
潘荣晟
|
0ef0b5f060
|
模版修改
|
2025-11-13 17:51:02 +08:00 |
|
潘荣晟
|
057336c65a
|
模版修改
|
2025-11-13 17:46:47 +08:00 |
|
qianshijiang
|
1410eea250
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-13 09:17:08 +08:00 |
|
hewencai
|
06cd342522
|
update:完善文档模板导出功能
|
2025-11-12 17:52:56 +08:00 |
|
潘荣晟
|
bd306b7e45
|
模版修改
|
2025-11-12 17:00:21 +08:00 |
|
潘荣晟
|
4ce8386762
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-12 15:33:41 +08:00 |
|
潘荣晟
|
e25df082b5
|
模版修改
|
2025-11-12 15:27:37 +08:00 |
|
chenbowen
|
f5c580cee6
|
Merge branch 'dev' into test
|
2025-11-12 15:23:33 +08:00 |
|
chenbowen
|
75382dfbeb
|
1. 新增工序信息管理、工艺信息管理、组织工艺工序信息管理功能
|
2025-11-12 15:23:12 +08:00 |
|
guojunyun
|
33bea2cad0
|
更新合同接口：获取动态字段、表单报错修改
|
2025-11-12 11:08:12 +08:00 |
|
guojunyun
|
2ee461bef2
|
国贸推送合同接口：接口请求号参数名修改
|
2025-11-12 09:28:58 +08:00 |
|
guojunyun
|
1747b96d2b
|
国贸推送合同接口：接口请求号参数名修改
|
2025-11-12 09:28:20 +08:00 |
|
孙承赐
|
e5e583d2c7
|
Merge branch 'dev' into 'test'
国贸2.0系统推送合同回调：消息固定R_JG_MY_00应答，_interfaceType__固定传R_MY_JG_10
See merge request jygk/dsc-base!18
|
2025-11-11 10:31:06 +00:00 |
|
guojunyun
|
1f949f7013
|
合同动态字段及条款修改
|
2025-11-11 17:26:31 +08:00 |
|
潘荣晟
|
b0f4dbfb52
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-11 17:10:15 +08:00 |
|
潘荣晟
|
5b55175310
|
模版修改
|
2025-11-11 17:10:00 +08:00 |
|
guojunyun
|
edfd72ea68
|
国贸推送合同对接修改
|
2025-11-11 15:53:17 +08:00 |
|
qianshijiang
|
49fbe4c6f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-11 14:44:58 +08:00 |
|
qianshijiang
|
80b81afbe0
|
订单分类
|
2025-11-11 14:44:43 +08:00 |
|
潘荣晟
|
750fdcc43d
|
模版修改
|
2025-11-11 14:44:01 +08:00 |
|
潘荣晟
|
81bde59906
|
模版修改
|
2025-11-11 14:38:34 +08:00 |
|
潘荣晟
|
c30992fa75
|
模版修改
|
2025-11-11 14:07:27 +08:00 |
|
潘荣晟
|
717db0f3ce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-11 14:05:14 +08:00 |
|
潘荣晟
|
ddfc7d8965
|
模版修改
|
2025-11-11 11:52:35 +08:00 |
|
guojunyun
|
83c1f318e1
|
合同主信息do修改
|
2025-11-11 09:41:41 +08:00 |
|
guojunyun
|
10dd7966fa
|
合同主信息添加确实包导入
|
2025-11-11 09:37:29 +08:00 |
|
guojunyun
|
e6aa0042d9
|
国贸2.0系统推送合同回调：消息固定R_JG_MY_00应答，_interfaceType__固定传R_MY_JG_10
合同主信息添加货权转移类型(字典：ASY_MTNG_TP)字段
|
2025-11-11 09:35:41 +08:00 |
|
wencai he
|
08f6177007
|
Merge branch 'dev' into 'test'
docs: 完善单位转换系统使用文档，添加Feign跨模块调用示例
See merge request jygk/dsc-base!17
|
2025-11-11 01:30:56 +00:00 |
|
hewencai
|
37cb17bd7d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-11 09:29:22 +08:00 |
|
hewencai
|
34ca30bb8b
|
update:完善文档模板导出功能
|
2025-11-11 09:27:22 +08:00 |
|
guojunyun
|
c2fdfee149
|
国贸2.0系统推送合同：回调返回参数修改
|
2025-11-10 16:56:31 +08:00 |
|
wencai he
|
1395e89633
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc-base!16
|
2025-11-10 08:08:28 +00:00 |
|
liss
|
bb5375d256
|
金属元素新增排序
|
2025-11-10 15:37:51 +08:00 |
|