Commit Graph

1442 Commits

Author SHA1 Message Date
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
ljw
444d8c412e fix:
1.是否需校验物料属性为是时,走判断校验,其他情况保持原逻辑,不需调整;
2024-11-26 18:41:38 +08:00
ljw
861d8279bb fix:
1.接口调整:只有是否需同步EAS为是时,才会同步EAS;(订单产品需求单-整机外购计划,审核时同步EAS,销售出库-整机/配件,提交时同步EAS);
2024-11-26 18:35:04 +08:00
ljw
1d45f34ef8 fix:
1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成
2024-11-26 17:10:31 +08:00
ljw
cd4b0d7f9d Merge remote-tracking branch 'orinin/main' 2024-11-26 16:35:56 +08:00
ljw
975ba7f974 fix:
1.配件发货明细表数据重复修复
2024-11-26 16:35:32 +08:00
zzs
cb5a3bbaca fix:报表国贸订单明细数据错误
(cherry picked from commit 9a81a8781f)
2024-11-26 15:23:10 +08:00
zzs
9a81a8781f fix:报表国贸订单明细数据错误 2024-11-26 14:14:48 +08:00
zzs
03844240a0 feat:出口报关明细,海运费、保费改为取结算币别 2024-11-25 18:49:58 +08:00
ljw
c8188bfb40 fix:
1.外销合同贸易术语赋值
2024-11-25 18:49:54 +08:00
ljw
1a1e257be8 fix:
1.外销合同变更单打开签到日期赋值
2024-11-25 18:49:46 +08:00
zzs
e99e3380d3 fix:国贸订单明细重复行 2024-11-25 18:49:42 +08:00
zzs
606259d531 fix:生成替换关系取值断点时间错误 2024-11-25 18:49:36 +08:00
zzs
c6e602a675 fix:图册查询报错,断点时间为空 2024-11-25 18:49:33 +08:00
zzs
41802e5a72 feat:提交云之家日志 2024-11-25 18:48:46 +08:00
ljw
503cb7788d fix:
1.外销合同赠送配件页签汇总赋值
2024-11-25 18:47:22 +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
2af9172481 fix:
1.调拨订单 同步EAS的接口  业务类型  给他传单据字段  不穿默认值了
2024-11-25 17:19: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
ljw
261d35ff59 fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新
2024-11-25 10:27:57 +08:00
zzs
2e5a292d3e fix:查询购买过的整机编码 2024-11-23 17:53:26 +08:00
zzs
52e9912eb1 fix:PLM生成替换关系 2024-11-23 17:53:25 +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
zzs
b7214cf204 doc:修改未查询到图册提示语 2024-11-23 09:21:57 +08:00
ljw
da686561af fix:
1.订舱通知单提交
2024-11-22 20:06:21 +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
c6f5c05e4c fix:
1.发运明细单金额价格条款赋值
2024-11-22 19:35:11 +08:00
ljw
90506a0127 fix:
1.寄单放单申请提交拼接
2024-11-22 19:35:08 +08:00
ljw
18824050e9 fix:
1.订舱通知单提交
2024-11-22 19:30:13 +08:00
ljw
f35fdecc63 fix:
1.整机发货明细表
2024-11-22 18:48:03 +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