Commit Graph

1451 Commits

Author SHA1 Message Date
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
ljw
bdbfbeff59 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-11 20:27:34 +08:00
ljw
080c7c5e1f fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-11 20:00:49 +08:00
ljw
04d306d27a fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-11 19:26:36 +08:00
ljw
1da0571d3b fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-11 18:21:26 +08:00
ljw
d95dad025b fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-11 18:02:02 +08:00
ljw
731610662a fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-11 17:55:43 +08:00
ljw
a4672d9a5e fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-11 17:25:51 +08:00
ljw
b894c83640 fix:
海运费:
(1)海运费(本位币)=海运费(原币)*海运费汇率;
(2)海运费(结算币别)=海运费(本位币)/财务信息的汇率;
保费:
(1)保费(本位币)=保费(原币)*保费汇率;
2025-01-11 16:55:27 +08:00
ljw
0abe36e537 fix:
、海运费(原币)、保费(原表)取单一窗口的的运费/率、保费,----1
2025-01-11 16:13:56 +08:00
ljw
dc725dcce6 fix:
增加合同金额,配件合同使用贷记单时,将合同金额生成贷记单上;
2025-01-11 14:52:13 +08:00
ljw
e1f4bae824 fix:
增加合同金额,配件合同使用贷记单时,将合同金额生成贷记单上;
2025-01-10 16:37:58 +08:00
ljw
82eb77ffb4 fix:
合同获取标准价优化
2025-01-09 20:34:10 +08:00
zzs
1dae840b0d feat:总成图册明细新增行默认不禁用 2025-01-09 17:55:27 +08:00
zzs
f1c315c534 fix:后替代前、通用、不通用,必须停用启用都匹配到才更新完成状态,启用或停用的,停用的匹配到一个就更新完成状态 2025-01-09 17:55:22 +08:00
zzs
5f4ebab6a3 fix:PLM每次匹配只能匹配一种状态 2025-01-09 17:55:17 +08:00
zzs
08a3be95d3 feat:总成图册明细新增行默认不禁用 2025-01-09 17:42:54 +08:00
zzs
179ea33b01 fix:后替代前、通用、不通用,必须停用启用都匹配到才更新完成状态,启用或停用的,停用的匹配到一个就更新完成状态 2025-01-09 16:25:36 +08:00
zzs
b03ae381d5 fix:PLM每次匹配只能匹配一种状态 2025-01-09 15:14:28 +08:00