Commit Graph

104 Commits

Author SHA1 Message Date
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
c51617528e fix:外购 2024-10-25 15:21:37 +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
ljw
a5217da705 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:53:04 +08:00
ljw
839e6308b7 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:29:12 +08:00
ljw
1f86c71340 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 23:06:45 +08:00
ljw
0def669bb1 fix:价格库配件问题调整 2024-10-18 20:15:36 +08:00
ljw
f43eb8d02f fix:销售出库审核编码 2024-10-18 19:52:54 +08:00
ljw
11795de0e6 fix:销售出库审核编码 2024-10-18 19:52:10 +08:00
ljw
0324f74f0b fix:销售出库审核编码汇总 2024-10-18 19:50:22 +08:00
ljw
7e67415e2e fix:销售出库反审核功能处理 2024-10-18 19:49:29 +08:00
ljw
9ae923a3bf fix:销售出库审核功能处理 2024-10-18 19:49:15 +08:00
ljw
bc0f65d84f fix:销售出库审核功能处理 2024-10-18 19:49:11 +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
e84cafc61d fix:审核时根据合同号获取财务信息《价税合计》汇总,将单据编号拼接(包含当前单 2024-10-18 18:15:53 +08:00
ljw
ccde1671b9 fix:配件价格库获取标准价条件增加 2024-10-18 14:41:59 +08:00
zzs
d666656ff4 fix:物料长宽高检查 2024-10-14 22:06:06 +08:00
zzs
a09e00a0a2 feat:物料长宽高赠品不判断 2024-10-14 21:58:35 +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
676b128aa6 1.修改贷记单提交后获取上次贷记单号节点 2024-10-08 15:42:44 +08:00
ljw
9d395b1f7b fix:计算闲置期倒计时 2024-10-08 15:41:49 +08:00
ljw
be7e31fae5 fix:内审预算单 2024-09-27 22:33:02 +08:00
ljw
5d6265f122 fix:产品经理下单确认报错 2024-09-26 14:22:48 +08:00
ljw
1d4466e3e5 fix:时间计算 2024-09-24 21:47:59 +08:00
ljw
060992387b fix:赠品行净重下单确认时不必填 2024-09-24 21:47:22 +08:00
ljw
d180dc7f14 fix:询价单审核时,价格库的禁用状态更新为可用 2024-09-21 20:41:49 +08:00
ljw
449f6a8a8b fix:询价单替换 2024-09-20 21:43:19 +08:00
ljw
e86bf0bb29 fix:保存时,按照 客户所在国 +买方英文名称+类型+信保限额申请 (4个字段,以空格间隔,拼接生成) 2024-09-20 20:18:57 +08:00
ljw
0091e8c9f7 fix:询价单过滤 2024-09-20 20:18:56 +08:00
ljw
ed0b238480 fix:工厂价逻辑取消 2024-09-20 20:18:56 +08:00
ljw
88510b0c60 fix:跟单任务控制台整机下拉值控制 2024-09-19 17:08:36 +08:00
ljw
ff033202d9 fix:调拨订单申请单提交效验 2024-09-18 22:38:56 +08:00
ljw
15361766d5 fix:贷记单客户更改为集团客户 2024-09-13 17:55:45 +08:00