Commit Graph

1519 Commits

Author SHA1 Message Date
25655
c898fe796d fix:
外销合同报错处理

(cherry picked from commit 35a8f683a4)
2025-01-23 16:16:17 +08:00
zzs
90a62947c1 Merge remote-tracking branch 'origin/test' into test 2025-01-22 14:14:21 +08:00
zzs
74e86b0da7 feat:信保回填,合同回款金额校验修改 2025-01-22 14:14:12 +08:00
ljw
d563f69534 fix:
业务分类为整机且是否赠品为是的,随机资料机型台数不要加上
2025-01-21 19:03:19 +08:00
ljw
aa5bf8af2c fix:
订舱通知单打开计算台数
2025-01-21 17:57:38 +08:00
ljw
6ad4a162f4 Merge remote-tracking branch 'orinin/test' into test 2025-01-21 17:48:53 +08:00
ljw
dfc012e76f fix:
152本地
2025-01-21 17:44:39 +08:00
zzs
b2f2e6eadf feat:非信保合同订舱提交时不校验信保额度申请 2025-01-21 17:30:33 +08:00
zzs
6eaf9f69ee Merge remote-tracking branch 'origin/test' into test 2025-01-21 17:29:33 +08:00
ljw
dd848764a3 fix:
订舱通知单打开计算台数
2025-01-21 17:22:12 +08:00
zzs
3aa734fe55 feat:服务维修同步整机档案增加字段 2025-01-21 16:08:28 +08:00
zzs
4db445822b feat:销售出库审核生成的整机档案增加字段,合同客户 2025-01-21 11:55:15 +08:00
zzs
a5f3ea7377 feat:客户同步同步下单平台接口增加业务主体 2025-01-21 11:46:32 +08:00
zzs
62e8ff6dfa feat:处理云之家回写接口调用失败问题 2025-01-20 16:15:14 +08:00
zzs
5a17f0d41c feat:处理云之家回写接口调用失败问题 2025-01-20 16:09:22 +08:00
zzs
0d02fc16bc feat:客户同步同步下单平台接口增加业务主体 2025-01-20 15:37:57 +08:00
zzs
ac883361c4 feat:客户同步同步下单平台接口增加业务主体 2025-01-20 10:48:49 +08:00
zzs
2ac0f0d263 feat:下单平台,整机档案列表增加字段 2025-01-18 15:36:47 +08:00
zzs
84314ea5f4 feat:信保回填,合同回款金额必录 2025-01-17 18:19:09 +08:00
zzs
c99aa0488a feat:合同提交显示重复的信保额申请 2025-01-17 18:04:31 +08:00
zzs
1d11a702a5 fix:信保回填未携带原值 2025-01-17 17:32:13 +08:00
zzs
7640177141 fix:信保回填时,合同回款金额未回填 2025-01-17 15:47:01 +08:00
ljw
ad6cf9364b fix:
寄单放单申请,拼接优化
2025-01-17 11:30:34 +08:00
zzs
142b067731 feat:订舱反审核如果未找到额度申请提示 2025-01-17 10:54:29 +08:00
zzs
f3804798ba fix:销售提成-整机中有重复数据
(cherry picked from commit 0d9cb4c4e3)
2025-01-16 18:12:34 +08:00
zzs
df415ecf61 feat:信保确认时,找不到额度申请报错问题 2025-01-16 18:07:53 +08:00
zzs
351c07330c feat:信保确认时,找不到额度申请报错问题 2025-01-16 18:07:29 +08:00
zzs
43acd4af56 feat:下推订舱投保金额(原币)取值修改 2025-01-16 17:08:18 +08:00
zzs
b7eb8989cb fix:合同提交信保额度校验查询 2025-01-16 16:26:24 +08:00
zzs
26c5131e40 Merge remote-tracking branch 'origin/test' into test 2025-01-16 10:09:57 +08:00
zzs
e2137982f6 fix:销售提成-整机中有重复数据 2025-01-16 10:09:50 +08:00
ljw
0a9af834d5 fix:
1.装箱单优化
2.寄单放单申请,现有基础上再拼接上合同号
2025-01-15 18:10:38 +08:00
ljw
529cfff4fb fix:
1.装箱单优化
2.寄单放单申请,现有基础上再拼接上合同号
2025-01-15 18:03:42 +08:00
ljw
0182062c40 fix:
1.装箱单优化
2.寄单放单申请,现有基础上再拼接上合同号
2025-01-15 16:23:24 +08:00
ljw
8bcde6b23a fix:
装箱单优化
2025-01-15 11:14:36 +08:00
ljw
87c9e9fe03 fix:
装箱单优化
2025-01-15 10:46:49 +08:00
ljw
ebf416542c Merge remote-tracking branch 'orinin/test' into test 2025-01-15 09:14:37 +08:00
zzs
eb9af66aa2 feat:信保额度申请重复判断修改信用证判断 2025-01-14 18:22:41 +08:00
zzs
64b0dcc2b3 feat:信保额度申请重复判断去掉日期条件 2025-01-14 15:01:48 +08:00
zzs
9753f4a456 fix:合同签章位置不正确问题
(cherry picked from commit 09cac84450)
2025-01-13 17:38:03 +08:00
zzs
4762b77818 Revert "fix:信保限额申请,本年第一天计算"
This reverts commit 968750256f.
2025-01-13 17:37:37 +08:00
zzs
968750256f fix:信保限额申请,本年第一天计算 2025-01-13 15:24:53 +08:00
zzs
52823a23ae feat:PLM匹配时,去掉空格再比较
(cherry picked from commit 7504c5d218)
2025-01-13 11:55:59 +08:00
ljw
fa1ea82c83 Merge remote-tracking branch 'orinin/main' into test
# Conflicts:
#	src/main/java/com/yem/or/api/AssepcDynamic.java
#	src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java
#	src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSaveOP.java
#	src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewUnAuditValidator.java
2025-01-13 11:21:01 +08:00
zzs
0c26fa6016 fix:信保查询条件,额度申请提交对信用证判断 2025-01-13 10:24:14 +08:00
zzs
9fe26f5974 fix:生成替换关系误删数据 2025-01-13 09:23:07 +08:00
ljw
c4f70968e6 fix:
最大单号
2025-01-11 21:11:26 +08:00
ljw
6a88a1e131 fix:
出口发票保存报错
2025-01-11 21:01:08 +08:00
ljw
c264477e47 fix:
出口发票保存报错
2025-01-11 20:50:57 +08:00
ljw
98bb951c9b fix:
出口发票保存报错
2025-01-11 20:42:28 +08:00