|
|
6e8255715c
|
fix:
1.框架合同反审核删除国贸经理签批附件
|
2024-10-29 15:20:25 +08:00 |
|
|
|
7c1f573ad6
|
fix:
1.外销合同赠送配件分录赋值
|
2024-10-29 11:46:41 +08:00 |
|
|
|
0ce59ea7cd
|
fix:
1.外销合同销售FOB单价金额计算
|
2024-10-28 20:17:32 +08:00 |
|
|
|
314d9b51bc
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 19:31:53 +08:00 |
|
|
|
3c27d895e3
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-28 17:44:14 +08:00 |
|
|
|
60981f994d
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-28 17:43:33 +08:00 |
|
|
|
5e53a39e68
|
fix:
1.内审预算单上传合同附件
|
2024-10-28 16:25:00 +08:00 |
|
|
|
d62d767f6e
|
fix:
1.内审预算单上传合同附件
|
2024-10-28 15:15:12 +08:00 |
|
|
|
49acc4eee8
|
fix:
1.外销合同销售FOB单价金额计算
|
2024-10-28 14:52:19 +08:00 |
|
|
|
96a8138473
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:26:53 +08:00 |
|
|
|
89c6723d26
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:25:44 +08:00 |
|
|
|
f888460175
|
1.修改分录价格条款不更新任何数据
|
2024-10-26 23:26:42 +08:00 |
|
|
|
b5edfd40e4
|
1.修改分录价格条款不更新任何数据
|
2024-10-26 23:03:36 +08:00 |
|
|
|
46a4c39cdd
|
1.修改方数不计算港杂费
|
2024-10-26 19:59:10 +08:00 |
|
|
|
c6f7d5dd48
|
1.内审预算单附件
|
2024-10-26 19:40:58 +08:00 |
|
|
|
f7377c1479
|
fix:内审预算单附件回填
|
2024-10-26 19:36:06 +08:00 |
|
|
|
f71b5c2161
|
1.修改合同计算港杂费、内陆运输费
2.携带方数、吨数
|
2024-10-26 19:30:20 +08:00 |
|
|
|
bd1b8d819d
|
fix:补充折扣率计算
|
2024-10-26 17:20:28 +08:00 |
|
|
|
c40404a5e5
|
Merge remote-tracking branch 'origin/dev-comp-price'
# Conflicts:
# src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
# src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
|
2024-10-26 17:16:56 +08:00 |
|
|
|
8dc4b0db77
|
fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
(cherry picked from commit 8101851d4c)
|
2024-10-25 20:42:34 +08:00 |
|
|
|
613e7ebe78
|
fix:外销合同赠送配件生成
(cherry picked from commit 0f861016cd)
|
2024-10-25 20:42:27 +08:00 |
|
|
|
cd515f67d3
|
fix:外购
(cherry picked from commit c51617528e)
|
2024-10-25 20:42:24 +08:00 |
|
|
|
8101851d4c
|
fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
|
2024-10-25 20:26:00 +08:00 |
|
|
|
626648ecb3
|
fix:正式去除二开功能
|
2024-10-25 19:26:48 +08:00 |
|
|
|
b3565bf466
|
fix:测试
|
2024-10-25 19:17:45 +08:00 |
|
|
|
23c20be0ff
|
fix:外销合同折扣后金额计算
|
2024-10-25 18:37:13 +08:00 |
|
|
|
f6cd6e5a71
|
Revert "wip:获取标准价：FOB与FCA费用差额标配FOB（青岛）价"
This reverts commit 5a2d7eda
|
2024-10-25 18:32:50 +08:00 |
|
|
|
c29d56d03e
|
Revert "wip(version1011):整机价格"
This reverts commit 6a25bf15fa.
|
2024-10-25 18:22:31 +08:00 |
|
zzs
|
6a25bf15fa
|
wip(version1011):整机价格
|
2024-10-25 18:21:09 +08:00 |
|
|
|
0f861016cd
|
fix:外销合同赠送配件生成
|
2024-10-25 15:53:12 +08:00 |
|
|
|
c51617528e
|
fix:外购
|
2024-10-25 15:21:37 +08:00 |
|
|
|
de76f20e4d
|
1.修改变更单生效清空回签人
|
2024-10-24 19:45:14 +08:00 |
|
|
|
43f8bf6ab2
|
1.修改变更单生效 不清空回签人相关信息
|
2024-10-24 19:45:08 +08:00 |
|
|
|
da0d9ffe64
|
1.修改合同权杖附件数 生效不携带源单
|
2024-10-24 19:44:25 +08:00 |
|
|
|
26a0a5a9b2
|
1.修改合同权杖附件数 生效不携带源单
|
2024-10-24 19:14:16 +08:00 |
|
|
|
09e1a145b2
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:49:14 +08:00 |
|
|
|
daf729a12c
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:44:10 +08:00 |
|
|
|
0b029535ea
|
1.修改变更单生效清空回签人
|
2024-10-24 16:11:20 +08:00 |
|
|
|
93910c070e
|
Merge remote-tracking branch 'origin/main'
|
2024-10-23 22:01:39 +08:00 |
|
|
|
2497ae8bba
|
修改查询配置表条件
|
2024-10-23 22:00:33 +08:00 |
|
|
|
b04e72e1e1
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 21:34:04 +08:00 |
|
|
|
5bae043614
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 20:28:09 +08:00 |
|
|
|
8bc9e649f3
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 20:07:59 +08:00 |
|
|
|
d7856ccef9
|
1.修改变更单生效 不清空回签人相关信息
|
2024-10-23 20:07:47 +08:00 |
|
|
|
0444812e3a
|
fix:外销合同是否赠品为否的赠品分录
(cherry picked from commit dc7eafc2c4)
|
2024-10-23 19:56:05 +08:00 |
|
|
|
dc7eafc2c4
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 19:55:09 +08:00 |
|
|
|
538cc3b339
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 19:53:47 +08:00 |
|
|
|
ccb1638193
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 11:19:45 +08:00 |
|
|
|
d9ef332698
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 11:14:56 +08:00 |
|
|
|
c6ea61153a
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 10:57:32 +08:00 |
|
