Commit Graph

1342 Commits

Author SHA1 Message Date
25655
a02ae13270 fix:
1.新增外销合同提交晓燕
2.外销合同点击是否赠品值更新错误修改
2025-02-13 10:07:46 +08:00
zzs
e0b2828d54 feat:合同下单反写增加日志 2025-02-12 18:24:21 +08:00
zzs
08fec93bc0 feat:撤销出口报关单,金额数量修改 2025-02-11 16:44:27 +08:00
zzs
859bd67e1b feat:合同生成的贷记单审核失败,不回滚合同 2025-02-11 14:36:24 +08:00
zzs
21389ef181 feat:合同审核生成贷记单,增加财务确认状态字段默认值 2025-02-11 10:51:50 +08:00
zzs
28467d5cfe Merge remote-tracking branch 'origin/main' 2025-02-11 10:21:31 +08:00
zzs
cfc7e54140 feat:下单平台接口增加业务主体字段 2025-02-11 10:21:24 +08:00
25655
f2bc40b8ee fix:
1.外销合同提交效验
2025-02-11 10:02:48 +08:00
zzs
cf24796b34 fix:生成整机档案时,默认携带业务主体 2025-02-11 09:16:00 +08:00
zzs
c080eba304 fix:出口报关明细报表,金额数量字段取值修改 2025-02-10 17:44:13 +08:00
zzs
968a45b715 Merge remote-tracking branch 'origin/main' 2025-02-10 16:55:10 +08:00
zzs
0840e0d0de feat:出口报关明细表增加过滤条件,只显示已结关 2025-02-10 16:55:04 +08:00
25655
c758398394 fix:
2.单一窗口报关单对比
2025-02-10 16:38:46 +08:00
25655
6ec3ec7d3c fix:
1.  订舱通知单审核 报错
2.单一窗口报关单对比
2025-02-10 10:42:07 +08:00
25655
b933551b42 fix:
1.配件发货明细表(已发货)
2.单一窗口报关单对比
2025-02-10 09:41:02 +08:00
zzs
1f852a0931 fix:整机合同分离下推内审预算单 2025-02-08 11:19:17 +08:00
zzs
a9e6e8cab0 fix:图册查询零件查询逻辑调整 2025-02-05 18:26:42 +08:00
zzs
f686dcbe06 fix:图册查询零件查询逻辑调整 2025-02-05 11:48:18 +08:00
25655
396c9fdb2a fix:
1.单一窗口报关单问题处理
2.报表取值报错问题处理
2025-01-26 15:54:25 +08:00
zzs
e0e0835f4c fix:发运下推订舱,收款天数为携带 2025-01-24 19:37:49 +08:00
zzs
cdbf81cd58 revert 2025-01-24 17:06:05 +08:00
zzs
02539fc493 feat:客户同步同步下单平台接口增加业务主体 2025-01-24 17:05:05 +08:00
zzs
b8f95ad456 feat:客户同步同步下单平台接口增加业务主体 2025-01-24 17:03:47 +08:00
zzs
c6fce96a94 feat:销售出库审核生成的整机档案增加字段,合同客户 2025-01-24 17:03:13 +08:00
zzs
24d231b9f6 feat:服务维修同步整机档案增加字段 2025-01-24 17:03:06 +08:00
zzs
2916ccfe22 feat:非信保合同订舱提交时不校验信保额度申请 2025-01-24 17:02:53 +08:00
zzs
9ab9b08496 feat:合同回款预警 2025-01-24 17:01:29 +08:00
zzs
87eb614aaa feat:寄单放单申请提交校验 2025-01-24 17:01:06 +08:00
zzs
0488315433 feat:寄单放单申请提交校验 2025-01-24 17:00:56 +08:00
25655
1fd8b042e5 fix:
134
2025-01-23 16:15:49 +08:00
25655
35a8f683a4 fix:
外销合同报错处理
2025-01-23 16:14:47 +08:00
zzs
c409cec729 feat:信保回填,合同回款金额校验修改 2025-01-22 17:48:09 +08:00
ljw
1b2f3a89ce fix:
业务分类为整机且是否赠品为是的,随机资料机型台数不要加上
2025-01-21 19:13:03 +08:00
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