Commit Graph

126 Commits

Author SHA1 Message Date
付鹏飞
ccf3cf125f Merge branch 'dev' into 'test'
Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。

See merge request jygk/dsc-base!8
2025-09-28 08:44:05 +00:00
潘荣晟
9cd8a41863 Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。 2025-09-28 16:36:09 +08:00
潘荣晟
ced4c519dc 模版编制相关实现 2025-09-28 16:26:00 +08:00
付鹏飞
a3611ee6f8 Merge branch 'dev' into 'test'
bug优化

See merge request jygk/dsc-base!7
2025-09-28 08:17:43 +00:00
潘荣晟
66ef2a9264 Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 16:07:04 +08:00
潘荣晟
ca2b1c0b63 模版编制相关实现 2025-09-28 16:06:21 +08:00
chenbowen
7965aa6eca 升级 3.0.41 2025-09-28 16:02:54 +08:00
潘荣晟
646d847d46 模版编制相关实现 2025-09-28 15:26:54 +08:00
潘荣晟
6b77c9033e Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 15:11:53 +08:00
潘荣晟
5463bc3d16 模版编制相关实现 2025-09-28 15:11:23 +08:00
chenbowen
2e629b8dc9 统一设置 api 调用时路由的服务 2025-09-28 12:17:55 +08:00
liss
32a5bb7d0a Merge branch 'refs/heads/dev' into test 2025-09-28 11:10:08 +08:00
liss
1fb32bc43f 仓库最大code查询优化 2025-09-28 11:09:32 +08:00
liss
0723c45b96 公司、工厂新增ui对应缺少字段 2025-09-28 10:47:10 +08:00
chenbowen
08c3ffef4f 1.升级版本 3.0.40 2025-09-28 00:39:22 +08:00
付鹏飞
128f97f073 Merge branch 'dev' into 'test'
模版编制相关实现

See merge request jygk/dsc-base!6
2025-09-26 09:43:44 +00:00
潘荣晟
dca1830c1b 模版编制相关实现 2025-09-26 17:41:55 +08:00
付鹏飞
da3065c637 Merge branch 'dev' into 'test'
模版编制相关实现

See merge request jygk/dsc-base!5
2025-09-26 09:17:41 +00:00
潘荣晟
fa7c08a493 模版编制相关实现 2025-09-26 17:13:10 +08:00
付鹏飞
ba69d40776 Merge branch 'dev' into 'test'
模版编制相关实现

See merge request jygk/dsc-base!3
2025-09-26 08:45:10 +00:00
潘荣晟
abf9607c43 模版编制相关实现 2025-09-26 16:43:34 +08:00
潘荣晟
3e70de3977 Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 16:42:33 +08:00
潘荣晟
7507a53c8a 模版编制相关实现 2025-09-26 16:41:11 +08:00
liss
e3b918f0cb Merge branch 'refs/heads/dev' into test 2025-09-26 15:50:21 +08:00
liss
163da2f79d 公司关系表因供应链公司没有,暂时用id代替code,优化import 2025-09-26 15:49:55 +08:00
liss
7683356829 Merge branch 'refs/heads/dev' into test 2025-09-26 15:10:02 +08:00
liss
c347e3beb3 Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 15:09:00 +08:00
liss
72b1097c0f 联系人,账户条款新增字段,公司配置字段优化 2025-09-26 15:08:27 +08:00
潘荣晟
eab5668023 模版编制相关实现 2025-09-26 14:59:38 +08:00
chenbowen
b373f9c308 1.升级版本 3.0.39 2025-09-26 14:03:28 +08:00
liss
94cf112651 Merge branch 'refs/heads/dev' into test 2025-09-26 12:02:17 +08:00
liss
a2ec48fd94 仓库配置编码自动生成,公司配置批量更新 2025-09-26 12:01:03 +08:00
潘荣晟
c81e96a80d Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 11:12:50 +08:00
潘荣晟
73cc6f6ee3 模版编制相关实现 2025-09-26 11:12:36 +08:00
liss
ecd27a3510 工厂配置编码自动生成 2025-09-26 10:06:11 +08:00
liss
8f677c0b4c 工厂配置编码自动生成 2025-09-26 10:04:09 +08:00
chenbowen
4a760c70d5 1.升级版本 3.0.38 2025-09-25 19:36:34 +08:00
付鹏飞
b53dac572f Merge branch 'dev' into 'test'
Devto test

See merge request jygk/dsc-base!2
2025-09-25 10:11:39 +00:00
潘荣晟
0149b66631 Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 18:08:35 +08:00
潘荣晟
7f940ff257 新增管理的发布时间字段 2025-09-25 18:08:09 +08:00
zhangt
9404ce576c Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 18:07:37 +08:00
zhangt
409173e854 调整收货erp接口 2025-09-25 18:07:28 +08:00
liss
17f73bd5c2 基础数据批量更新接口 2025-09-25 17:46:30 +08:00
zhangt
a2699537d9 修改调用erp方法参数错误问题 2025-09-25 16:19:38 +08:00
zhangt
b7c88f8e16 Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 15:43:05 +08:00
zhangt
0f6d7de996 新增发货单ERP接口 2025-09-25 15:42:24 +08:00
guojunyun
ff18060b06 修改合同接口 2025-09-25 15:27:50 +08:00
潘荣晟
327fd9bdcb 新增管理的发布时间字段 2025-09-25 15:12:10 +08:00
潘荣晟
26bdf3cbdf 模版编制的相关实现 2025-09-25 15:09:05 +08:00
潘荣晟
0929c14629 Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 15:07:35 +08:00