Commit Graph

40 Commits

Author SHA1 Message Date
ljw
0ce59ea7cd fix:
1.外销合同销售FOB单价金额计算
2024-10-28 20:17:32 +08:00
b5edfd40e4 1.修改分录价格条款不更新任何数据 2024-10-26 23:03:36 +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
ljw
626648ecb3 fix:正式去除二开功能 2024-10-25 19:26:48 +08:00
ljw
b3565bf466 fix:测试 2024-10-25 19:17:45 +08:00
ljw
23c20be0ff fix:外销合同折扣后金额计算 2024-10-25 18:37:13 +08:00
ljw
f6cd6e5a71 Revert "wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价"
This reverts commit 5a2d7eda
2024-10-25 18:32:50 +08:00
ljw
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
ljw
a5217da705 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:53:04 +08:00
ljw
839e6308b7 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:29:12 +08:00
ljw
0def669bb1 fix:价格库配件问题调整 2024-10-18 20:15:36 +08:00
ljw
a7972c9d0a fix:价格库配件问题调整 2024-10-18 19:47:44 +08:00
ljw
a5445de5c4 fix:配件价格库获取标准价条件增加 2024-10-18 19:12:57 +08:00
ljw
c6c15c007b fix:二开公共类 2024-10-18 18:28:17 +08:00
zzs01@yunemao.com
d6e971c34f wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价 2024-10-18 18:20:34 +08:00
ljw
ccde1671b9 fix:配件价格库获取标准价条件增加 2024-10-18 14:41:59 +08:00
zzs
e40d039af2 fix(version1011):整机价格 2024-10-14 18:06:21 +08:00
zzs
69fce54a49 fix(version1011):整机价格 2024-10-14 16:02:07 +08:00
zzs
8b7ccb4e09 fix(version1011):整机价格 2024-10-14 16:02:04 +08:00
zzs
4ed38d065c feat(version1011):整机价格 2024-10-14 10:55:42 +08:00
zzs
b3780baa97 feat(version1011):整机价格 2024-10-14 10:12:48 +08:00
zzs
8137198072 wip(version1011):整机价格 2024-10-12 16:50:26 +08:00
zzs01@yunemao.com
85d54a455f feat:整机价格 2024-09-12 16:06:25 +08:00
zzs01@yunemao.com
788f9a2aa8 feat:整机价格 2024-09-12 15:49:08 +08:00
zzs01@yunemao.com
e039cda4b4 fix:折扣率计算(价格条款) 2024-09-11 14:39:10 +08:00
zzs01@yunemao.com
13c3d63ac2 fix:折扣率计算 2024-09-11 10:30:18 +08:00
zzs01@yunemao.com
9b0ddf97e2 fix:折扣率计算 2024-09-11 09:33:35 +08:00
zzs01@yunemao.com
494f1bc86e change:折扣率计算 2024-09-10 19:31:13 +08:00
zzs01@yunemao.com
e04dd91174 wip:整机价格 2024-09-10 17:18:11 +08:00
zzs01@yunemao.com
51e0d68059 wip:整机价格 2024-09-09 18:14:04 +08:00
zzs01@yunemao.com
1c5a7e853f wip:获取标准价 2024-09-09 17:54:35 +08:00
zzs01@yunemao.com
a27d050b49 wip:获取标准价:销售FCA标配青岛单价、金额 2024-09-09 17:30:04 +08:00
zzs01@yunemao.com
5a2d7edaa0 wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价 2024-09-09 17:15:34 +08:00
0862be9930 Merge branch 'refs/heads/dev-zzs' into test 2024-08-30 21:23:45 +08:00
7693dc71dd feat:折扣后销售单价计算 2024-08-30 21:22:29 +08:00
zzs01@yunemao.com
4405731da0 feat:外销合同4个公式计算 2024-08-30 18:07:49 +08:00
violet
672713b3c2 first commit 2024-08-26 09:19:12 +08:00