Commit Graph

1309 Commits

Author SHA1 Message Date
ljw
fd96b0f480 fix:
订舱通知单打开计算台数
2025-01-21 19:12:58 +08:00
ljw
78e33eb73b fix:
订舱通知单打开计算台数
2025-01-21 19:12:56 +08:00
ljw
5bcd784a04 Merge remote-tracking branch 'orinin/main' 2025-01-21 16:17:57 +08:00
ljw
36da20a3f4 fix:
出口报关单报关对比逻辑优化
2025-01-21 16:17:43 +08:00
zzs
d229a00ac4 ci:去掉寄单放单部分提交校验 2025-01-21 15:51:04 +08:00
zzs
edbf2bf8d4 fix:订舱下推寄单放单超时问题 2025-01-21 15:32:21 +08:00
ljw
4ea8b15ca7 fix:
贷记单提交计算扣减后金额
2025-01-21 11:46:18 +08:00
ljw
32db098136 fix:
贷记单提交计算扣减后金额
2025-01-21 11:46:14 +08:00
ljw
5a6cde6e38 fix:
贷记单提交计算扣减后金额
2025-01-21 11:46:01 +08:00
ljw
61ecb7c30e fix:
贷记单提交计算扣减后金额
2025-01-21 11:45:59 +08:00
ljw
3c3db27a60 fix:
贷记单提交计算扣减后金额
2025-01-21 11:45:55 +08:00
ljw
268ef75524 fix:
贷记单提交计算扣减后金额
2025-01-21 11:45:53 +08:00
ljw
1a9d97c3a5 fix:
贷记单提交计算扣减后金额
2025-01-21 11:45:49 +08:00
ljw
decab91882 fix:
销售出库生成贷记单字段赋值
2025-01-21 11:45:34 +08:00
ljw
58a1161cb8 fix:
销售出库生成贷记单字段赋值
2025-01-21 11:45:32 +08:00
ljw
ef9064e874 fix:
合同生成贷记单合同类型赋值
2025-01-21 11:45:28 +08:00
ljw
f8c8972577 fix:
合同生成贷记单合同类型赋值
2025-01-21 11:45:26 +08:00
ljw
2bf8b67517 fix:
整机、配件合同:
1、合同、贷记单添加字段类型:普通出口、贸易出口,默认贸易出口。合同生成贷记单时,字段携带到贷记单。---1
2、手工新增贷记单时,默认普通出口,可选择贸易出口;---1
2025-01-21 11:45:22 +08:00
ljw
a83e68101a fix:
贷记单生成增加字段赋值
2025-01-21 11:45:20 +08:00
ljw
132cfb584c 贷记单反审核时只允许反审核最大流水号的单据:
举例:如贷记单存在001、002、003的单号时,想要反审核002,必须先将003单据反审核,在反审核002,然后按照顺序依次将0002、0003提交审核。
2025-01-21 11:45:16 +08:00
ljw
99d1d1557e 贷记单反审核时只允许反审核最大流水号的单据:
举例:如贷记单存在001、002、003的单号时,想要反审核002,必须先将003单据反审核,在反审核002,然后按照顺序依次将0002、0003提交审核。
2025-01-21 11:45:14 +08:00
ljw
491f53a2a7 贷记单反审核时只允许反审核最大流水号的单据:
举例:如贷记单存在001、002、003的单号时,想要反审核002,必须先将003单据反审核,在反审核002,然后按照顺序依次将0002、0003提交审核。
2025-01-21 11:45:11 +08:00
ljw
0403f72fe4 贷记单反审核时只允许反审核最大流水号的单据:
举例:如贷记单存在001、002、003的单号时,想要反审核002,必须先将003单据反审核,在反审核002,然后按照顺序依次将0002、0003提交审核。
2025-01-21 11:45:09 +08:00
ljw
d36c529e33 贷记单反审核时只允许反审核最大流水号的单据:
举例:如贷记单存在001、002、003的单号时,想要反审核002,必须先将003单据反审核,在反审核002,然后按照顺序依次将0002、0003提交审核。
2025-01-21 11:45:05 +08:00
ljw
ad5308a091 fix:
增加合同金额,配件合同使用贷记单时,将合同金额生成贷记单上;
2025-01-21 11:40:28 +08:00
ljw
3faa038a3d fix:
出口发票保存报错
2025-01-21 11:35:21 +08:00
ljw
624899c8ca fix:
出口发票保存报错
2025-01-21 11:35:17 +08:00
ljw
4c0c04891b fix:
出口发票保存报错
2025-01-21 11:35:16 +08:00
ljw
150f981285 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 11:35:11 +08:00
ljw
126526eb63 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 11:35:09 +08:00
ljw
c4e4842bdb fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 11:35:05 +08:00
ljw
f6bd490ac1 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 11:35:04 +08:00
ljw
d4334e9aaf fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 11:35:01 +08:00
ljw
992ec1036b fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 11:34:40 +08:00
ljw
149f2ed94a fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 11:34:39 +08:00
ljw
5253e26dd3 Revert "fix:"
This reverts commit 7850c0a0e2.
2025-01-21 11:34:21 +08:00
ljw
b666cd188f Revert "fix:"
This reverts commit 27fe54b01d.
2025-01-21 11:34:16 +08:00
ljw
45e149d5bf Revert "fix:"
This reverts commit d376fdd257.
2025-01-21 11:34:13 +08:00
ljw
1aceca2caf Revert "fix:"
This reverts commit 874c1f0047.
2025-01-21 11:34:09 +08:00
ljw
5d49624b2c Revert "fix:"
This reverts commit 4b3b983c77.
2025-01-21 11:34:06 +08:00
ljw
840bd76b25 Revert "fix:"
This reverts commit 04a23723e1.
2025-01-21 11:34:02 +08:00
ljw
0294e676e0 Revert "fix:"
This reverts commit 7d3aa8cbb7.
2025-01-21 11:33:59 +08:00
ljw
923c2c26de Revert "fix:"
This reverts commit 9b65b9fe15.
2025-01-21 11:33:55 +08:00
ljw
9f98f692fc Revert "fix:"
This reverts commit a09d765dae.
2025-01-21 11:33:52 +08:00
ljw
1dda1b61a9 Revert "fix:"
This reverts commit 48eed903e9.
2025-01-21 11:33:47 +08:00
ljw
b72473634d Revert "fix:"
This reverts commit 2fe307d844.
2025-01-21 11:33:44 +08:00
ljw
71e482b3aa Revert "fix:"
This reverts commit 0289611ec0.
2025-01-21 11:33:39 +08:00
ljw
2ccaff8958 Revert "fix:"
This reverts commit fc34c94a49.
2025-01-21 11:33:37 +08:00
ljw
ac0d0122e6 Revert "fix:"
This reverts commit 7fa44151ae.
2025-01-21 11:33:31 +08:00
ljw
5863306307 Revert "fix:"
This reverts commit 74d7ba209b.
2025-01-21 11:33:29 +08:00
ljw
35bba33183 Revert "fix:"
This reverts commit 9d1055ce64.
2025-01-21 11:33:25 +08:00
ljw
10f238949f Revert "fix:"
This reverts commit 8a58b241aa.
2025-01-21 11:33:23 +08:00
ljw
e17ea78cf4 Revert "fix:"
This reverts commit ddb4cdb124.
2025-01-21 11:33:18 +08:00
ljw
12a515af67 Revert "fix:"
This reverts commit dff38048ab.
2025-01-21 11:33:16 +08:00
ljw
1033924e4c Revert "fix:"
This reverts commit 245796ff51.
2025-01-21 11:33:11 +08:00
ljw
f1cf4efac5 Revert "fix:"
This reverts commit 54877d0c88.
2025-01-21 11:33:09 +08:00
ljw
8eebb29693 Revert "fix:"
This reverts commit caf2f17231.
2025-01-21 11:33:04 +08:00
ljw
33a44d9821 Revert "fix:"
This reverts commit 1576c2e54c.
2025-01-21 11:33:02 +08:00
ljw
817541ae4c Revert "fix:"
This reverts commit af1ef95e10.
2025-01-21 11:32:58 +08:00
ljw
8d54382f81 Revert "fix:"
This reverts commit e008af45b1.
2025-01-21 11:32:56 +08:00
ljw
7ccced4263 Revert "fix:"
This reverts commit c295a5ee38.
2025-01-21 11:32:52 +08:00
ljw
b6861f5102 Revert "fix:"
This reverts commit 7add40bc5a.
2025-01-21 11:32:49 +08:00
ljw
4e54317fe5 Revert "fix:"
This reverts commit 18a463e84a.
2025-01-21 11:32:45 +08:00
ljw
5f956640fa Revert "fix:"
This reverts commit 32cb30599b.
2025-01-21 11:32:43 +08:00
ljw
32cb30599b fix:
贷记单提交计算扣减后金额
2025-01-21 11:06:01 +08:00
ljw
18a463e84a fix:
1.外销合同变更单打开签到日期赋值
2025-01-21 11:02:26 +08:00
ljw
7add40bc5a fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新

(cherry picked from commit 261d35ff59)
2025-01-21 11:02:22 +08:00
ljw
c295a5ee38 fix:
1.订舱通知单提交
2025-01-21 11:02:06 +08:00
ljw
e008af45b1 fix:
1.订舱通知单提交

(cherry picked from commit 18824050e9)
2025-01-21 11:01:59 +08:00
ljw
af1ef95e10 fix:
1.整机发货明细表

(cherry picked from commit f35fdecc63)
2025-01-21 11:01:44 +08:00
ljw
1576c2e54c fix:
1.发运明细单金额价格条款赋值
2025-01-21 11:01:27 +08:00
ljw
caf2f17231 fix:
1.寄单放单申请提交拼接
2025-01-21 11:01:01 +08:00
ljw
54877d0c88 fix:
1.外销合同签订日期默认当前时间
2025-01-21 11:00:34 +08:00
ljw
245796ff51 fix:
1.外销合同签订日期默认当前时间
2025-01-21 10:59:21 +08:00
ljw
dff38048ab fix:
1.外销合同签订日期默认当前时间
2025-01-21 10:59:18 +08:00
ljw
ddb4cdb124 fix:
1.外销合同签订日期默认当前时间
2025-01-21 10:59:14 +08:00
ljw
8a58b241aa fix:
1.水单附件必填效验
2025-01-21 10:58:18 +08:00
ljw
9d1055ce64 fix:
1.外销合同签订日期默认当前时间
2025-01-21 10:58:14 +08:00
ljw
74d7ba209b fix:
1.订舱通知单额度确认效验修改
2025-01-21 10:56:50 +08:00
ljw
7fa44151ae fix:
出口发票保存报错
2025-01-21 10:53:32 +08:00
ljw
fc34c94a49 fix:
出口发票保存报错
2025-01-21 10:53:28 +08:00
ljw
0289611ec0 fix:
出口发票保存报错
2025-01-21 10:53:25 +08:00
ljw
2fe307d844 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 10:53:21 +08:00
ljw
48eed903e9 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 10:53:18 +08:00
ljw
a09d765dae fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 10:53:15 +08:00
ljw
9b65b9fe15 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 10:53:13 +08:00
ljw
7d3aa8cbb7 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 10:53:09 +08:00
ljw
04a23723e1 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 10:53:07 +08:00
ljw
4b3b983c77 fix:
出口报关生成出口发票时多选基础资料赋值
2025-01-21 10:53:03 +08:00
ljw
874c1f0047 fix:
海运费:
(1)海运费(本位币)=海运费(原币)*海运费汇率;
(2)海运费(结算币别)=海运费(本位币)/财务信息的汇率;
保费:
(1)保费(本位币)=保费(原币)*保费汇率;
2025-01-21 10:53:01 +08:00
ljw
d376fdd257 fix:
、海运费(原币)、保费(原表)取单一窗口的的运费/率、保费,----1
2025-01-21 10:52:57 +08:00
ljw
27fe54b01d fix:
增加合同金额,配件合同使用贷记单时,将合同金额生成贷记单上;
2025-01-21 10:51:17 +08:00
ljw
7850c0a0e2 fix:
增加合同金额,配件合同使用贷记单时,将合同金额生成贷记单上;
2025-01-21 10:51:14 +08:00
zzs
679c8eb5ff feat:处理云之家回写接口调用失败问题 2025-01-20 18:19:14 +08:00
zzs
7776bd4779 feat:处理云之家回写接口调用失败问题 2025-01-20 18:19:11 +08:00
zzs
ca9e3e6065 feat:信保流程相关 2025-01-18 17:26:55 +08:00
ljw
0a91f4ceb0 fix:
寄单放单申请,拼接优化
2025-01-17 18:40:28 +08:00
zzs
0d9cb4c4e3 fix:销售提成-整机中有重复数据 2025-01-16 18:12:20 +08:00
zzs
13cac49c4f fix:销售提成-整机中有重复数据 2025-01-16 18:11:39 +08:00
ljw
56c5ddedf4 fix:
1.装箱单优化
2.寄单放单申请,现有基础上再拼接上合同号
2025-01-15 18:16:23 +08:00