Commit Graph

777 Commits

Author SHA1 Message Date
zzs
3908b74286 fix:订舱审核校验提示剩余额度不足校验问题
(cherry picked from commit b58d6c65f0)
2024-12-03 18:51:02 +08:00
zzs
d0d1c12966 log:订舱提交信保额度校验增加日志输出
(cherry picked from commit bd36c4ec3b)
2024-12-03 18:50:58 +08:00
zzs
c9422d650b fix:国贸订单明细,已发货行不显示
(cherry picked from commit f292ea085a)
2024-12-03 11:37:05 +08:00
ljw
6027fef0ec fix:
1.云之家获取审核失败调用撤销取消

(cherry picked from commit 06e61efd62)
2024-11-30 11:16:09 +08:00
ljw
f1943582ff fix:
1.出口发票保存生成备注调整一下格式,按照要求换行,金额不要显示尾零

(cherry picked from commit 6edece8faa)
2024-11-30 11:16:00 +08:00
ljw
106f713919 fix:
1.收款条件带出收款天数

(cherry picked from commit aa1106ad08)
2024-11-30 11:15:56 +08:00
ljw
a21d14d3e9 fix:
1.外销合同报错处理

(cherry picked from commit 298a8963af)
2024-11-29 17:09:57 +08:00
ljw
8b4b6b46a8 fix:
1.出口发票报错处理
2024-11-29 17:09:24 +08:00
ljw
4d8de42ac2 fix:
1.出口发票报错处理
2024-11-29 10:05:09 +08:00
ljw
71048412d0 fix:
1.出口发票报错处理

(cherry picked from commit eae662b125)
2024-11-29 09:17:27 +08:00
ljw
7e099839a0 fix:
1.装箱单报错处理

(cherry picked from commit 894e3882f3)
2024-11-28 18:41:03 +08:00
ljw
1cefbd0d47 fix:
1.出口发票保存生成备注及合同号

(cherry picked from commit cb45727a2e)
2024-11-28 18:38:47 +08:00
zzs
396efe9827 fix:替换关系反审核报错 2024-11-28 17:41:44 +08:00
ljw
4bb1f39f24 fix:
1.出口报关数量问题处理

(cherry picked from commit a3a41e576c)
2024-11-27 23:23:57 +08:00
ljw
f5b8c7dd5b fix:
1.随机资料及配件工具包,机型台数根据发运更新

(cherry picked from commit 4c6a3545ec)
2024-11-27 23:23:47 +08:00
ljw
6d1e69425d fix:
1.随机资料及配件工具包,机型台数根据发运更新

(cherry picked from commit 8717a78715)
2024-11-27 23:23:43 +08:00
ljw
23c3692927 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:24:46 +08:00
ljw
b60b48b63b fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:06:45 +08:00
ljw
70cfa83e53 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:05:46 +08:00
ljw
13e95d97b7 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 19:51:27 +08:00
ljw
ec3bb451c5 fix:
①收汇比例(小数,不显示尾零,放到预收比例前面),取值逻辑,取合同收款计划行的收汇百分比;
②订舱投保金额(原币种)-关联结算币别,锁定,计算逻辑:订舱合同金额*收汇比例;
2024-11-27 19:09:31 +08:00
ljw
316e1100dd fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 19:05:48 +08:00
ljw
62a6418f88 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 18:58:53 +08:00
ljw
bec7401ad1 fix:
①收汇比例(小数,不显示尾零,放到预收比例前面),取值逻辑,取合同收款计划行的收汇百分比;
②订舱投保金额(原币种)-关联结算币别,锁定,计算逻辑:订舱合同金额*收汇比例;
2024-11-27 18:54:05 +08:00
ljw
eb83105684 fix:
①收汇比例(小数,不显示尾零,放到预收比例前面),取值逻辑,取合同收款计划行的收汇百分比;
②订舱投保金额(原币种)-关联结算币别,锁定,计算逻辑:订舱合同金额*收汇比例;
2024-11-27 18:46:22 +08:00
ljw
fc875a8c69 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 18:37:58 +08:00
ljw
2de105968a fix:
1.订单产品需求单保存处理
2024-11-27 17:22:07 +08:00
ljw
04fca9f826 fix:
1.发运明细单汇总报错处理
2.公共方法
2024-11-27 01:30:06 +08:00
ljw
b2606b74b4 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-26 21:38:03 +08:00
ljw
1af4357d6f fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-26 21:34:00 +08:00
ljw
6feb245b58 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-26 21:21:44 +08:00
ljw
550a4463db fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-26 21:13:25 +08:00
ljw
091b36894e fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-26 21:05:43 +08:00
ljw
58618daa8b fix:
1.单台赠送配件金额  为空的行的数量不需要汇总
2024-11-26 20:27:25 +08:00
ljw
cb1d195f0d fix:
1.只有是否需同步EAS为是时,才会同步EAS;
2024-11-26 20:25:46 +08:00
ljw
3823a99628 fix:
1.单台赠送配件金额  为空的行的数量不需要汇总
2024-11-26 20:13:57 +08:00
ljw
40f1d10aef fix:
1.销售出库财务组织判断
2024-11-26 20:01:14 +08:00
ljw
14347d83e4 fix:
1.单台赠送配件金额  为空的行的数量不需要汇总
2024-11-26 19:48:42 +08:00
ljw
dfc042d6ec fix:
1.只有是否需同步EAS为是时,才会同步EAS;
2024-11-26 19:42:25 +08:00
ljw
d2f097d658 fix:
1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成
2024-11-26 19:38:47 +08:00
ljw
4c04b538aa fix:
1.配件发货明细表数据重复修复

(cherry picked from commit 975ba7f974)
2024-11-26 18:45:35 +08:00
ljw
e0bbeea4fd fix:
1.是否需校验物料属性为是时,走判断校验,其他情况保持原逻辑,不需调整;

(cherry picked from commit 444d8c412e)
2024-11-26 18:44:43 +08:00
ljw
7b18623719 fix:
1.接口调整:只有是否需同步EAS为是时,才会同步EAS;(订单产品需求单-整机外购计划,审核时同步EAS,销售出库-整机/配件,提交时同步EAS);

(cherry picked from commit 861d8279bb)
2024-11-26 18:44:36 +08:00
ljw
2e71eb7779 fix:
1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成

(cherry picked from commit 1d45f34ef8)
2024-11-26 18:44:33 +08:00
zzs
cb5a3bbaca fix:报表国贸订单明细数据错误
(cherry picked from commit 9a81a8781f)
2024-11-26 15:23:10 +08:00
ljw
8206570fde fix:
1.外销合同赠送配件页签汇总赋值
2024-11-25 18:27:01 +08:00
ljw
5834e7e53f fix:
1.调拨订单 同步EAS的接口  业务类型  给他传单据字段  不穿默认值了

(cherry picked from commit 2af9172481)
2024-11-25 17:47:49 +08:00
zzs
7c89041f82 Merge remote-tracking branch 'origin/test' into test 2024-11-25 17:26:13 +08:00
zzs
9d10166b7f feat:出口报关明细,海运费、保费改为取结算币别 2024-11-25 17:26:04 +08:00
ljw
b207d40d76 fix:
1.外销合同贸易术语赋值
2024-11-25 16:55:40 +08:00