Commit Graph

830 Commits

Author SHA1 Message Date
ljw
d6daffc86f fix:
1.订舱通知单,发运明细单 获取整机信息功能增加
2024-12-09 15:33:49 +08:00
ljw
982a2ed932 fix:
1.已存在的数据不在生成

(cherry picked from commit 37857e0346)
2024-12-07 17:57:57 +08:00
ljw
3c0c5b7826 fix:
1.配件发货明细表(已发货)逻辑修改
2024-12-06 17:35:26 +08:00
ljw
2e8c259d1b fix:
1.取消收款单打开视图默认为标准收款单
2024-12-06 16:41:21 +08:00
zzs
4159d174c2 fix:智能审批单据注册,子单据体修改会清空父分录标识 2024-12-06 14:22:41 +08:00
ljw
761d00dacd fix:
1.发运提交的时候  如果该合同下发运明细单的历史总数量+本次发运总数量等于  关联合同的总数量,那么历史发运金额+当前发运金额的汇总值必须等于合同金额
  否则,不需判断
2024-12-05 19:07:21 +08:00
ljw
5d7a984fd5 Merge remote-tracking branch 'orinin/test' into test 2024-12-05 15:46:10 +08:00
ljw
0d04e01345 fix:
1.发运提交的时候  如果该合同下发运明细单的历史总数量+本次发运总数量等于  关联合同的总数量,那么历史发运金额+当前发运金额的汇总值必须等于合同金额
  否则,不需判断
2024-12-05 15:45:26 +08:00
zzs
79132a6658 feat:定时任务获取到BOM变更单后自动审核 2024-12-05 15:39:05 +08:00
zzs
f54e3c92ab fix:出口报关,保存前不能进行报关合并 2024-12-05 15:14:35 +08:00
zzs
3b218758d9 fix:出口报关明细,合同号不显示 2024-12-05 14:48:33 +08:00
zzs
f26aeadc35 feat:整机发运明细表增加字段销售员 2024-12-05 14:32:52 +08:00
zzs
3e9816f5ba Merge remote-tracking branch 'origin/test' into test 2024-12-05 11:14:22 +08:00
zzs
b513e92010 fix:报关合并-特殊规则未清空合并对照表 2024-12-05 11:14:14 +08:00
ljw
c81b40dafc fix:
1.外销合同变更单审核反写值出错
2024-12-05 10:23:41 +08:00
ljw
636b73b8b5 fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
2024-12-04 19:12:49 +08:00
ljw
16ee20ec60 fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
2024-12-04 18:49:48 +08:00
ljw
865064995f fix:
1.发运提交效验
2024-12-04 17:40:03 +08:00
zzs
a184683b25 fix:可选中机型过滤问题
(cherry picked from commit e97f8bad74)
2024-12-04 15:43:15 +08:00
ljw
07306341b3 fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请

(cherry picked from commit bd8a9ad8ce)
2024-12-04 11:36:40 +08:00
zzs
fc3faf2ae1 fix:非信保合同不进行投保金额校验
(cherry picked from commit 02d604790b)
2024-12-03 18:51:08 +08:00
zzs
01748e340d fix:保存后刷新清除了创建组织
(cherry picked from commit 534ed72806)
2024-12-03 18:51:05 +08:00
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