Commit Graph

760 Commits

Author SHA1 Message Date
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
ljw
b8170416a7 Merge remote-tracking branch 'orinin/test' into test 2024-11-25 16:38:04 +08:00
ljw
c458340add fix:
1.外销合同变更单打开签到日期赋值
2024-11-25 16:37:41 +08:00
zzs
71cc9e15f2 fix:国贸订单明细重复行 2024-11-25 15:40:29 +08:00
zzs
6809bb47ec fix:生成替换关系取值断点时间错误 2024-11-25 15:30:14 +08:00
zzs
29baa7a74f fix:图册查询报错,断点时间为空 2024-11-25 14:58:10 +08:00
zzs
44ded3a0cb Merge remote-tracking branch 'origin/test' into test 2024-11-25 10:39:29 +08:00
zzs
2da8320ff9 feat:提交云之家日志 2024-11-25 10:39:20 +08:00
ljw
63c4a38bd9 fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新

(cherry picked from commit 261d35ff59)
2024-11-25 10:29:04 +08:00
zzs
d7b1352a04 fix:查询购买过的整机编码 2024-11-23 14:11:16 +08:00
zzs
4ad03482d2 fix:PLM生成替换关系 2024-11-23 11:31:56 +08:00
zzs
2eea9f32cb doc:修改未查询到图册提示语
(cherry picked from commit b7214cf204)
2024-11-23 09:22:40 +08:00
ljw
992113f7e4 fix:
1.订舱通知单提交
2024-11-22 20:02:10 +08:00
ljw
540a4ec882 fix:
1.整机发货明细表

(cherry picked from commit f35fdecc63)
2024-11-22 19:56:05 +08:00
ljw
b36fd5d827 fix:
1.订舱通知单提交

(cherry picked from commit 18824050e9)
2024-11-22 19:55:21 +08:00
ljw
a61901d58f fix:
1.整机发货明细表

(cherry picked from commit f35fdecc63)
2024-11-22 19:38:43 +08:00
ljw
1f37e4a0f8 fix:
1.发运明细单金额价格条款赋值
2024-11-22 15:31:09 +08:00
ljw
63125333a2 fix:
1.寄单放单申请提交拼接
2024-11-22 15:14:14 +08:00