Commit Graph

649 Commits

Author SHA1 Message Date
潘荣晟
5a4d79449e 权限标识 2025-11-20 09:44:43 +08:00
潘荣晟
216ecf75c5 权限标识 2025-11-20 09:40:06 +08:00
qianshijiang
b337a9412c Merge remote-tracking branch 'origin/dev' into test 2025-11-19 17:58:18 +08:00
guojunyun
cff5a9d31d supplierNumber赋值修改 2025-11-19 17:56:59 +08:00
guojunyun
feb7b490c9 SZHGYL-289修改 2025-11-19 17:26:09 +08:00
liss
8b187a6ff8 客商erp更新优化 2025-11-19 16:45:36 +08:00
guojunyun
d325ceb06a erp提交默认返回成功修改 2025-11-19 16:30:20 +08:00
qianshijiang
7e282e80e4 Merge remote-tracking branch 'origin/dev' into test 2025-11-19 16:22:06 +08:00
潘荣晟
7ca81a74b5 Merge remote-tracking branch 'origin/dev' into dev 2025-11-19 16:21:00 +08:00
潘荣晟
58612efd77 销售订单明细修复订单单位不显示的问题 2025-11-19 16:20:17 +08:00
chenbowen
adcafa3784 Merge branch 'dev' into test 2025-11-19 15:44:24 +08:00
guojunyun
05069e2846 SZHGYL-289修改 2025-11-19 15:15:37 +08:00
chenbowen
f596500151 1. 升级私有包版本 2025-11-19 14:48:07 +08:00
付鹏飞
c39ffa54ee Merge branch 'dev' into 'test'
销售订单明细修复订单不显示的问题

See merge request jygk/dsc-base!22
2025-11-19 03:35:46 +00:00
潘荣晟
d5572c200b 销售订单明细修复订单不显示的问题 2025-11-19 11:32:52 +08:00
qianshijiang
fb3dfaec48 Merge remote-tracking branch 'origin/dev' into test 2025-11-19 11:10:09 +08:00
潘荣晟
dc37a2f587 Merge remote-tracking branch 'origin/dev' into dev 2025-11-19 11:05:43 +08:00
潘荣晟
b7cfe7485e 【销售订单-订单检索】查询条件字段需要支持模糊查询修复 2025-11-19 11:02:03 +08:00
qianshijiang
ed94355886 Merge remote-tracking branch 'origin/dev' into test 2025-11-18 17:41:04 +08:00
guojunyun
685ba9473b 查询结算公式列表:增加明细列表数据返回 2025-11-18 14:44:31 +08:00
guojunyun
09f8db69c4 SZHGYL-251修改 2025-11-18 10:19:16 +08:00
liss
925f4ab650 Merge branch 'refs/heads/dev' into test 2025-11-17 18:34:09 +08:00
liss
cfdeb40a23 金属元素新增BUG 2025-11-17 18:33:33 +08:00
潘荣晟
10bfece481 Merge remote-tracking branch 'origin/dev' into dev 2025-11-17 18:15:05 +08:00
潘荣晟
79a760a379 开票检验 2025-11-17 18:14:50 +08:00
liss
a65938b6af Merge branch 'refs/heads/dev' into test 2025-11-17 18:08:26 +08:00
liss
dd9142a670 金属元素缩新增分页查询,生产订单erp分页查询 2025-11-17 18:07:54 +08:00
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