zzs
|
40a3632539
|
improve:优化下推变更中逻辑，提交查询效率
|
2024-12-19 16:10:07 +08:00 |
|
zzs
|
8927475eab
|
feat:云之家回写代码优化，增加日志
|
2024-12-19 15:59:54 +08:00 |
|
zzs
|
bdd2761c16
|
feat:云之家回写代码优化，增加日志
|
2024-12-19 15:09:06 +08:00 |
|
zzs
|
bd08eb9de2
|
feat:调用单据操作接口，不启用网控检查
(cherry picked from commit 4efe0c8126)
|
2024-12-19 09:30:54 +08:00 |
|
zzs
|
4efe0c8126
|
feat:调用单据操作接口，不启用网控检查
|
2024-12-19 09:30:25 +08:00 |
|
|
|
1cd6ca3e06
|
fix:
1.出口发票保存备注字段汇总
(cherry picked from commit 6a717fa9f8)
|
2024-12-17 19:52:08 +08:00 |
|
|
|
6a717fa9f8
|
fix:
1.出口发票保存备注字段汇总
|
2024-12-17 19:38:52 +08:00 |
|
|
|
d252add538
|
fix:
1.销售出库审核传EAS备注更改逻辑
(cherry picked from commit ae3724ef64)
|
2024-12-17 18:27:40 +08:00 |
|
|
|
d06e5f90a5
|
Merge remote-tracking branch 'orinin/main'
|
2024-12-17 18:26:55 +08:00 |
|
|
|
ae3724ef64
|
fix:
1.销售出库审核传EAS备注更改逻辑
|
2024-12-17 18:26:44 +08:00 |
|
zzs
|
bda98e774b
|
feat:下单平台增加管理员账号，查询所有数据
|
2024-12-17 15:31:48 +08:00 |
|
zzs
|
6c064ad873
|
feat:云之家回写增加日志输出
|
2024-12-16 17:51:22 +08:00 |
|
zzs
|
f3cf73bd72
|
feat:云之家回写增加日志输出
|
2024-12-16 15:02:18 +08:00 |
|
zzs
|
19c58d6a6d
|
feat:寄单放单申请提交收款校验改为改成应收款日期1小于当前日期
|
2024-12-16 11:21:25 +08:00 |
|
zzs
|
5a9da8ba97
|
feat:寄单放单申请提交收款校验改为改成应收款日期1小于当前日期
|
2024-12-16 10:03:42 +08:00 |
|
|
|
0234a1df02
|
fix:
1.订舱通知单提交同步EAS、逻辑增加
|
2024-12-14 17:52:31 +08:00 |
|
|
|
09830c3536
|
fix:
1.订舱通知单提交同步EAS、逻辑增加
|
2024-12-14 10:52:50 +08:00 |
|
|
|
69671a833f
|
fix:
1.订舱通知单提交同步EAS、逻辑增加
|
2024-12-14 10:27:12 +08:00 |
|
|
|
9a0201a104
|
fix:
1.订舱通知单提交同步EAS、逻辑增加
|
2024-12-13 19:46:45 +08:00 |
|
|
|
7e274a9867
|
fix:
1.订舱通知单提交同步EAS、逻辑增加
|
2024-12-13 19:09:33 +08:00 |
|
|
|
e3a3aae56f
|
fix:
1.订舱通知单提交同步EAS、逻辑增加
|
2024-12-13 17:15:18 +08:00 |
|
|
|
06e8ec3025
|
fix:禁用字段yem_sale_type
|
2024-12-13 12:47:31 +08:00 |
|
zzs
|
975f827dbf
|
fix:变更对照表匹配BOM变更单取消数量字段
|
2024-12-13 12:46:21 +08:00 |
|
|
|
f2bd115a93
|
fix:
1.发运明细过滤处理
(cherry picked from commit e63328acdc)
|
2024-12-12 19:11:07 +08:00 |
|
|
|
a184cb5203
|
fix:
1.发运明细过滤处理
(cherry picked from commit 062a58eb37)
|
2024-12-12 19:11:02 +08:00 |
|
|
|
e63328acdc
|
fix:
1.发运明细过滤处理
|
2024-12-12 19:00:33 +08:00 |
|
|
|
062a58eb37
|
fix:
1.发运明细过滤处理
|
2024-12-12 18:36:45 +08:00 |
|
|
|
570002b229
|
fix:
1.下单审批报错处理
(cherry picked from commit 5b6d440270)
|
2024-12-11 18:04:04 +08:00 |
|
zzs
|
a2ee62d197
|
feat:获取CMMP BOM变更单增加参数，只获取指定类型
|
2024-12-11 15:58:27 +08:00 |
|
zzs
|
9a933f30c9
|
fix:BOM变更单创建组织为空
|
2024-12-11 15:58:16 +08:00 |
|
zzs
|
f957d763c6
|
feat:替换关系提交，数量不用必录
|
2024-12-11 15:58:11 +08:00 |
|
zzs
|
3012b60f7b
|
fix:更新总成图册明细备注取值
|
2024-12-11 15:57:42 +08:00 |
|
zzs
|
a9c87224d3
|
fix:生成替换关系备注取值
|
2024-12-11 15:55:33 +08:00 |
|
zzs
|
6ab7f7e856
|
feat:获取CMMP BOM变更单增加参数，只获取指定类型
|
2024-12-11 15:47:22 +08:00 |
|
|
|
5b6d440270
|
fix:
1.下单审批报错处理
|
2024-12-11 13:59:29 +08:00 |
|
|
|
c4245d2e6e
|
fix:
1.外销合同报错处理
|
2024-12-10 22:18:24 +08:00 |
|
|
|
38a1374d36
|
fix:
1.外销合同报错处理
|
2024-12-10 22:09:26 +08:00 |
|
|
|
e306f81308
|
fix:
1.发运明细单提交效验
|
2024-12-10 21:22:02 +08:00 |
|
|
|
a76a28aded
|
fix:
1.发运明细单提交效验
|
2024-12-10 20:53:32 +08:00 |
|
zzs
|
b605a14bed
|
fix:BOM变更单创建组织为空
|
2024-12-10 18:19:35 +08:00 |
|
zzs
|
27569211d1
|
feat:替换关系提交，数量不用必录
|
2024-12-10 17:49:59 +08:00 |
|
|
|
6385212fab
|
fix:更新总成图册明细备注取值
|
2024-12-09 21:27:56 +08:00 |
|
|
|
0fe98ca955
|
fix:
1.订舱通知单，发运明细单 获取整机信息功能增加
|
2024-12-09 19:57:36 +08:00 |
|
|
|
25ac523502
|
fix:
1.订舱通知单，发运明细单 获取整机信息功能增加
|
2024-12-09 19:57:33 +08:00 |
|
|
|
6b49aeadfb
|
fix:生成替换关系备注取值
|
2024-12-09 18:56:23 +08:00 |
|
|
|
e4d4c3acd9
|
fix:
1.订舱通知单，发运明细单 获取整机信息功能增加
|
2024-12-09 17:56:49 +08:00 |
|
|
|
9c352e3b6c
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-12-09 15:34:15 +08:00 |
|
|
|
d6daffc86f
|
fix:
1.订舱通知单，发运明细单 获取整机信息功能增加
|
2024-12-09 15:33:49 +08:00 |
|
zzs
|
c7db4573bd
|
feat:总成图册明细生成时，备注取替换关系中的备注字段
|
2024-12-09 15:09:42 +08:00 |
|
zzs
|
ac7d1621fc
|
feat:PLM生成替换关系，增加备注字段
|
2024-12-09 11:10:52 +08:00 |
|
zzs
|
a67ba60754
|
fix:变更对照表匹配BOM变更单取消数量字段
|
2024-12-09 11:09:17 +08:00 |
|
zzs
|
8fa83a4d14
|
fix:CMMP BOM变更单改为分录更新
|
2024-12-09 11:08:41 +08:00 |
|
|
|
982a2ed932
|
fix:
1.已存在的数据不在生成
(cherry picked from commit 37857e0346)
|
2024-12-07 17:57:57 +08:00 |
|
|
|
37857e0346
|
fix:
1.已存在的数据不在生成
|
2024-12-07 17:52:21 +08:00 |
|
zzs
|
35d101386a
|
fix:智能审批单据注册，子单据体修改会清空父分录标识
|
2024-12-06 18:25:43 +08:00 |
|
|
|
9ceaea2803
|
fix:
1.配件发货明细表（已发货）逻辑修改
|
2024-12-06 17:57:35 +08:00 |
|
|
|
d26d5dcc7b
|
fix:
1.取消收款单打开视图默认为标准收款单
|
2024-12-06 17:57:32 +08:00 |
|
|
|
3c0c5b7826
|
fix:
1.配件发货明细表（已发货）逻辑修改
|
2024-12-06 17:35:26 +08:00 |
|
|
|
2e8c259d1b
|
fix:
1.取消收款单打开视图默认为标准收款单
|
2024-12-06 16:41:21 +08:00 |
|
zzs
|
4159d174c2
|
fix:智能审批单据注册，子单据体修改会清空父分录标识
|
2024-12-06 14:22:41 +08:00 |
|
zzs
|
4bc02913a5
|
feat:定时任务获取到BOM变更单后自动审核
|
2024-12-05 19:22:08 +08:00 |
|
zzs
|
1194ed3c99
|
fix:出口报关，保存前不能进行报关合并
|
2024-12-05 19:21:47 +08:00 |
|
zzs
|
883fc64c67
|
fix:出口报关明细，合同号不显示
|
2024-12-05 19:21:38 +08:00 |
|
zzs
|
31ed751f18
|
feat:整机发运明细表增加字段销售员
|
2024-12-05 19:21:20 +08:00 |
|
zzs
|
10601acb44
|
fix:报关合并-特殊规则未清空合并对照表
|
2024-12-05 19:21:14 +08:00 |
|
|
|
def41ec6e9
|
fix:
1.发运提交的时候 如果该合同下发运明细单的历史总数量+本次发运总数量等于 关联合同的总数量，那么历史发运金额+当前发运金额的汇总值必须等于合同金额
否则，不需判断
|
2024-12-05 19:12:20 +08:00 |
|
|
|
761d00dacd
|
fix:
1.发运提交的时候 如果该合同下发运明细单的历史总数量+本次发运总数量等于 关联合同的总数量，那么历史发运金额+当前发运金额的汇总值必须等于合同金额
否则，不需判断
|
2024-12-05 19:07:21 +08:00 |
|
|
|
5f718ba1cb
|
fix:
1.发运提交的时候 如果该合同下发运明细单的历史总数量+本次发运总数量等于 关联合同的总数量，那么历史发运金额+当前发运金额的汇总值必须等于合同金额
否则，不需判断
|
2024-12-05 18:44:45 +08:00 |
|
|
|
0d1a1ea2c2
|
fix:
1.外销合同变更单审核反写值出错
|
2024-12-05 18:44:24 +08:00 |
|
|
|
5d7a984fd5
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-12-05 15:46:10 +08:00 |
|
|
|
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 |
|
|
|
c81b40dafc
|
fix:
1.外销合同变更单审核反写值出错
|
2024-12-05 10:23:41 +08:00 |
|
|
|
23aaba1d1b
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:19:15 +08:00 |
|
|
|
b6f7bed50d
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:19:00 +08:00 |
|
|
|
5549ab1bd6
|
fix:
1.发运提交效验
|
2024-12-04 19:18:54 +08:00 |
|
|
|
636b73b8b5
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:12:49 +08:00 |
|
|
|
16ee20ec60
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 18:49:48 +08:00 |
|
|
|
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 |
|
|
|
07306341b3
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
(cherry picked from commit bd8a9ad8ce)
|
2024-12-04 11:36:40 +08:00 |
|
|
|
bd8a9ad8ce
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 11:35:30 +08:00 |
|
zzs
|
e97f8bad74
|
fix:可选中机型过滤问题
|
2024-12-04 10:58:07 +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
|
02d604790b
|
fix:非信保合同不进行投保金额校验
|
2024-12-03 17:15:10 +08:00 |
|
zzs
|
534ed72806
|
fix:保存后刷新清除了创建组织
|
2024-12-03 16:15:41 +08:00 |
|
zzs
|
b58d6c65f0
|
fix:订舱审核校验提示剩余额度不足校验问题
|
2024-12-03 15:54:31 +08:00 |
|
zzs
|
bd36c4ec3b
|
log:订舱提交信保额度校验增加日志输出
|
2024-12-03 15:08:54 +08:00 |
|
zzs
|
c9422d650b
|
fix:国贸订单明细，已发货行不显示
(cherry picked from commit f292ea085a)
|
2024-12-03 11:37:05 +08:00 |
|
zzs
|
f292ea085a
|
fix:国贸订单明细，已发货行不显示
|
2024-12-03 11:35:57 +08:00 |
|
|
|
6027fef0ec
|
fix:
1.云之家获取审核失败调用撤销取消
(cherry picked from commit 06e61efd62)
|
2024-11-30 11:16:09 +08:00 |
|
|
|
f1943582ff
|
fix:
1.出口发票保存生成备注调整一下格式，按照要求换行，金额不要显示尾零
(cherry picked from commit 6edece8faa)
|
2024-11-30 11:16:00 +08:00 |
|
|
|
106f713919
|
fix:
1.收款条件带出收款天数
(cherry picked from commit aa1106ad08)
|
2024-11-30 11:15:56 +08:00 |
|
|
|
06e61efd62
|
fix:
1.云之家获取审核失败调用撤销取消
|
2024-11-30 11:14:59 +08:00 |
|
|
|
6edece8faa
|
fix:
1.出口发票保存生成备注调整一下格式，按照要求换行，金额不要显示尾零
|
2024-11-30 10:15:00 +08:00 |
|
|
|
aa1106ad08
|
fix:
1.收款条件带出收款天数
|
2024-11-30 09:31:05 +08:00 |
|
|
|
30e29f01a5
|
fix:
1.出口发票报错处理
|
2024-11-29 18:06:08 +08:00 |
|
|
|
a21d14d3e9
|
fix:
1.外销合同报错处理
(cherry picked from commit 298a8963af)
|
2024-11-29 17:09:57 +08:00 |
|
|
|
8b4b6b46a8
|
fix:
1.出口发票报错处理
|
2024-11-29 17:09:24 +08:00 |
|
|
|
298a8963af
|
fix:
1.外销合同报错处理
|
2024-11-29 16:55:10 +08:00 |
|
|
|
833f54a242
|
fix:
1.出口发票报错处理
|
2024-11-29 10:06:18 +08:00 |
|
|
|
4d8de42ac2
|
fix:
1.出口发票报错处理
|
2024-11-29 10:05:09 +08:00 |
|
|
|
71048412d0
|
fix:
1.出口发票报错处理
(cherry picked from commit eae662b125)
|
2024-11-29 09:17:27 +08:00 |
|
|
|
eae662b125
|
fix:
1.出口发票报错处理
|
2024-11-29 09:12:31 +08:00 |
|
|
|
7e099839a0
|
fix:
1.装箱单报错处理
(cherry picked from commit 894e3882f3)
|
2024-11-28 18:41:03 +08:00 |
|
|
|
1cefbd0d47
|
fix:
1.出口发票保存生成备注及合同号
(cherry picked from commit cb45727a2e)
|
2024-11-28 18:38:47 +08:00 |
|
|
|
72cba3ae69
|
Merge remote-tracking branch 'orinin/main'
|
2024-11-28 18:37:39 +08:00 |
|
|
|
cb45727a2e
|
fix:
1.出口发票保存生成备注及合同号
|
2024-11-28 18:36:16 +08:00 |
|
zzs
|
45ae3aa7cc
|
fix:替换关系反审核报错
|
2024-11-28 17:54:39 +08:00 |
|
zzs
|
396efe9827
|
fix:替换关系反审核报错
|
2024-11-28 17:41:44 +08:00 |
|
|
|
894e3882f3
|
fix:
1.装箱单报错处理
|
2024-11-28 14:25:26 +08:00 |
|
|
|
4bb1f39f24
|
fix:
1.出口报关数量问题处理
(cherry picked from commit a3a41e576c)
|
2024-11-27 23:23:57 +08:00 |
|
|
|
f5b8c7dd5b
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
(cherry picked from commit 4c6a3545ec)
|
2024-11-27 23:23:47 +08:00 |
|
|
|
6d1e69425d
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
(cherry picked from commit 8717a78715)
|
2024-11-27 23:23:43 +08:00 |
|
|
|
a3a41e576c
|
fix:
1.出口报关数量问题处理
|
2024-11-27 23:15:11 +08:00 |
|
|
|
4c6a3545ec
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 22:00:05 +08:00 |
|
|
|
8717a78715
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 21:39:51 +08:00 |
|
|
|
8b824b084e
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:43 +08:00 |
|
|
|
e2f53da4e9
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:37 +08:00 |
|
|
|
67ce460142
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:28 +08:00 |
|
|
|
e0b58466a1
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:23 +08:00 |
|
|
|
57860631bc
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:33:14 +08:00 |
|
|
|
c4ca8a7de5
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:05 +08:00 |
|
|
|
112632a7dd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:00 +08:00 |
|
|
|
7f17c00e9d
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:32:52 +08:00 |
|
|
|
3edc8cdd70
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:32:47 +08:00 |
|
|
|
fd521f73cc
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:37 +08:00 |
|
|
|
1dfebb679a
|
fix:
1.订单产品需求单保存处理
|
2024-11-27 20:32:32 +08:00 |
|
|
|
0493b20554
|
fix:
1.发运明细单汇总报错处理
2.公共方法
|
2024-11-27 20:32:23 +08:00 |
|
|
|
bdc8a0f805
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:17 +08:00 |
|
|
|
1c75dea603
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:07 +08:00 |
|
|
|
80b78fd463
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:03 +08:00 |
|
|
|
5816468c57
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:31:55 +08:00 |
|
|
|
e02ef10fa1
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:30:16 +08:00 |
|
|
|
bf98c82519
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-27 20:30:05 +08:00 |
|
|
|
97986428d5
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:29:59 +08:00 |
|
|
|
79eb14fb5c
|
fix:
1.销售出库财务组织判断
|
2024-11-27 20:29:49 +08:00 |
|
|
|
615558b712
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:29:43 +08:00 |
|
|
|
c8915a718e
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-27 20:29:31 +08:00 |
|
|
|
53be70e0db
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-27 20:29:27 +08:00 |
|
|
|
23c3692927
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:24:46 +08:00 |
|
|
|
b60b48b63b
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:06:45 +08:00 |
|
|
|
70cfa83e53
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:05:46 +08:00 |
|
|
|
13e95d97b7
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 19:51:27 +08:00 |
|
|
|
ec3bb451c5
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 19:09:31 +08:00 |
|
|
|
316e1100dd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 19:05:48 +08:00 |
|
|
|
62a6418f88
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 18:58:53 +08:00 |
|
|
|
bec7401ad1
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 18:54:05 +08:00 |
|
|
|
eb83105684
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 18:46:22 +08:00 |
|
|
|
fc875a8c69
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 18:37:58 +08:00 |
|
|
|
2de105968a
|
fix:
1.订单产品需求单保存处理
|
2024-11-27 17:22:07 +08:00 |
|
|
|
04fca9f826
|
fix:
1.发运明细单汇总报错处理
2.公共方法
|
2024-11-27 01:30:06 +08:00 |
|
|
|
b2606b74b4
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:38:03 +08:00 |
|
|
|
1af4357d6f
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:34:00 +08:00 |
|
|
|
af59bf2dfd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:33:25 +08:00 |
|
|
|
6feb245b58
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:21:44 +08:00 |
|
|
|
550a4463db
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:13:25 +08:00 |
|
|
|
091b36894e
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:05:43 +08:00 |
|
|
|
58618daa8b
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-26 20:27:25 +08:00 |
|
|
|
cb1d195f0d
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-26 20:25:46 +08:00 |
|
|
|
3823a99628
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-26 20:13:57 +08:00 |
|
|
|
40f1d10aef
|
fix:
1.销售出库财务组织判断
|
2024-11-26 20:01:14 +08:00 |
|
|
|
14347d83e4
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-26 19:48:42 +08:00 |
|
|
|
dfc042d6ec
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-26 19:42:25 +08:00 |
|
|
|
d2f097d658
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-26 19:38:47 +08:00 |
|
|
|
4c04b538aa
|
fix:
1.配件发货明细表数据重复修复
(cherry picked from commit 975ba7f974)
|
2024-11-26 18:45:35 +08:00 |
|
|
|
e0bbeea4fd
|
fix:
1.是否需校验物料属性为是时，走判断校验，其他情况保持原逻辑，不需调整；
(cherry picked from commit 444d8c412e)
|
2024-11-26 18:44:43 +08:00 |
|
|
|
7b18623719
|
fix:
1.接口调整：只有是否需同步EAS为是时，才会同步EAS；（订单产品需求单-整机外购计划，审核时同步EAS，销售出库-整机/配件，提交时同步EAS）；
(cherry picked from commit 861d8279bb)
|
2024-11-26 18:44:36 +08:00 |
|
|
|
2e71eb7779
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
(cherry picked from commit 1d45f34ef8)
|
2024-11-26 18:44:33 +08:00 |
|
|
|
444d8c412e
|
fix:
1.是否需校验物料属性为是时，走判断校验，其他情况保持原逻辑，不需调整；
|
2024-11-26 18:41:38 +08:00 |
|
|
|
861d8279bb
|
fix:
1.接口调整：只有是否需同步EAS为是时，才会同步EAS；（订单产品需求单-整机外购计划，审核时同步EAS，销售出库-整机/配件，提交时同步EAS）；
|
2024-11-26 18:35:04 +08:00 |
|
|
|
1d45f34ef8
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-26 17:10:31 +08:00 |
|
|
|
cd4b0d7f9d
|
Merge remote-tracking branch 'orinin/main'
|
2024-11-26 16:35:56 +08:00 |
|
|
|
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 |
|
|
|
c8188bfb40
|
fix:
1.外销合同贸易术语赋值
|
2024-11-25 18:49:54 +08:00 |
|
|
|
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 |
|
|
|
503cb7788d
|
fix:
1.外销合同赠送配件页签汇总赋值
|
2024-11-25 18:47:22 +08:00 |
|
|
|
8206570fde
|
fix:
1.外销合同赠送配件页签汇总赋值
|
2024-11-25 18:27:01 +08:00 |
|
|
|
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 |
|
|
|
2af9172481
|
fix:
1.调拨订单 同步EAS的接口 业务类型 给他传单据字段 不穿默认值了
|
2024-11-25 17:19:04 +08:00 |
|
|
|
b207d40d76
|
fix:
1.外销合同贸易术语赋值
|
2024-11-25 16:55:40 +08:00 |
|
|
|
b8170416a7
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-11-25 16:38:04 +08:00 |
|
|
|
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 |
|
|
|
63c4a38bd9
|
fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新
(cherry picked from commit 261d35ff59)
|
2024-11-25 10:29:04 +08:00 |
|
|
|
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 |
|
|
|
da686561af
|
fix:
1.订舱通知单提交
|
2024-11-22 20:06:21 +08:00 |
|
|
|
992113f7e4
|
fix:
1.订舱通知单提交
|
2024-11-22 20:02:10 +08:00 |
|
|
|
540a4ec882
|
fix:
1.整机发货明细表
(cherry picked from commit f35fdecc63)
|
2024-11-22 19:56:05 +08:00 |
|
|
|
b36fd5d827
|
fix:
1.订舱通知单提交
(cherry picked from commit 18824050e9)
|
2024-11-22 19:55:21 +08:00 |
|
|
|
a61901d58f
|
fix:
1.整机发货明细表
(cherry picked from commit f35fdecc63)
|
2024-11-22 19:38:43 +08:00 |
|
|
|
c6f5c05e4c
|
fix:
1.发运明细单金额价格条款赋值
|
2024-11-22 19:35:11 +08:00 |
|
|
|
90506a0127
|
fix:
1.寄单放单申请提交拼接
|
2024-11-22 19:35:08 +08:00 |
|
|
|
18824050e9
|
fix:
1.订舱通知单提交
|
2024-11-22 19:30:13 +08:00 |
|
|
|
f35fdecc63
|
fix:
1.整机发货明细表
|
2024-11-22 18:48:03 +08:00 |
|
|
|
1f37e4a0f8
|
fix:
1.发运明细单金额价格条款赋值
|
2024-11-22 15:31:09 +08:00 |
|
|
|
63125333a2
|
fix:
1.寄单放单申请提交拼接
|
2024-11-22 15:14:14 +08:00 |
|
|
|
a00a136221
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-22 10:52:03 +08:00 |
|
|
|
883027d7c6
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:10:48 +08:00 |
|
|
|
7d845450f0
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:10:20 +08:00 |
|
|
|
6c37b4beaf
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:04:11 +08:00 |
|
|
|
9a698ae473
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:02:34 +08:00 |
|
|
|
e31660e995
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:40:32 +08:00 |
|
|
|
8f8a308e13
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:40:06 +08:00 |
|
|
|
f9f6c5fff7
|
fix:
1.水单附件必填效验
|
2024-11-21 19:26:30 +08:00 |
|
|
|
b796e9100e
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:26:25 +08:00 |
|
|
|
df0f6c6e52
|
fix:
1.水单附件必填效验
|
2024-11-21 18:17:08 +08:00 |
|
|
|
f9a6b210fd
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 18:09:22 +08:00 |
|
|
|
5050ae8fb9
|
fix:
1.收款单认领合同过滤非贷记单
(cherry picked from commit 09db507910)
|
2024-11-21 15:30:57 +08:00 |
|
zzs
|
210e61db9a
|
fix:价格库查询到重复数据
|
2024-11-21 14:58:01 +08:00 |
|
zzs
|
00f6d27a37
|
fix:价格库查询到重复数据
|
2024-11-21 14:56:21 +08:00 |
|
|
|
09db507910
|
fix:
1.收款单认领合同过滤非贷记单
|
2024-11-21 14:40:01 +08:00 |
|
zzs
|
0dac6a13eb
|
feat:更新整机档案领料分析时间
(cherry picked from commit 99bdc4da6a)
|
2024-11-21 09:10:30 +08:00 |
|
zzs
|
f76e7f23ca
|
Merge remote-tracking branch 'origin/main'
|
2024-11-20 18:28:55 +08:00 |
|
zzs
|
99bdc4da6a
|
feat:更新整机档案领料分析时间
|
2024-11-20 18:28:47 +08:00 |
|
|
|
e85ae88a64
|
fix:
1.订舱通知单额度确认效验修改
|
2024-11-20 18:14:55 +08:00 |
|
|
|
14e892f1a1
|
fix:
1.订舱通知单额度确认效验修改
|
2024-11-20 17:53:07 +08:00 |
|
zzs
|
7d9aa70b93
|
feat:更新整机档案领料分析时间
|
2024-11-20 17:26:09 +08:00 |
|
zzs
|
42d7cec955
|
feat:更新整机档案领料分析时间
|
2024-11-20 16:14:55 +08:00 |
|
|
|
fad828255f
|
Merge remote-tracking branch 'orinin/main'
# Conflicts:
# .gitignore
# src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java
# src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
# src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java
# src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
# src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
# src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java
# src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
# src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailsAuditOp.java
# src/main/java/com/yem/wm/es/shippingdetails/op/XshippingDetailsSaveOp.java
# src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java
# src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java
# src/main/java/com/yem/wm/syn/eas/api/OperationalUniversal.java
# src/main/java/com/yem/wm/sys/utils/NewVersionHelper.java
# src/main/java/com/yem/wm/utils/ContactSignUtils.java
|
2024-11-19 18:09:21 +08:00 |
|
zzs
|
4ebf483e9e
|
下单平台：配件价格根据名称模糊查询
(cherry picked from commit 04ad4b12d3)
|
2024-11-19 15:57:33 +08:00 |
|
zzs
|
04ad4b12d3
|
下单平台：配件价格根据名称模糊查询
|
2024-11-19 15:55:12 +08:00 |
|
|
|
07d1a90efe
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-11-19 14:24:54 +08:00 |
|
