Commit Graph

102 Commits

Author SHA1 Message Date
zzs
fdee718201 fix:合同复制报错 2024-10-14 22:18:09 +08:00
zzs
5a537f4a1b fix:合同复制报错 2024-10-14 22:11:17 +08:00
zzs
ea60566c97 fix:物料长宽高检查
(cherry picked from commit d666656ff4)
2024-10-14 22:06:28 +08:00
zzs
cfee129bf2 wip(fix):获取价格 2024-10-14 21:55:37 +08:00
zzs
850db5c8f1 wip(fix):获取价格 2024-10-14 20:43:48 +08:00
zzs
ba08ad9172 feat:物料长宽高赠品不判断 2024-10-14 18:52:41 +08:00
zzs
6fc1cafbba Merge branch 'dev-comp-price' into test 2024-10-14 18:06:57 +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
890964f91a fix(version1011):整机价格 2024-10-14 16:01:19 +08:00
zzs
d228be2fb9 Merge remote-tracking branch 'origin/test' into test 2024-10-14 15:51:23 +08:00
zzs
de74b712aa fix(version1011):整机价格 2024-10-14 15:51:15 +08:00
ljw
bcb90bd469 Merge remote-tracking branch 'orinin/test' into test 2024-10-14 10:59:14 +08:00
ljw
ffb583d288 fix:内审预算单撤销附件 2024-10-14 10:58:58 +08:00
zzs
c7c0222cf3 Merge branch 'dev-comp-price' into test 2024-10-14 10:56:34 +08:00
zzs
4ed38d065c feat(version1011):整机价格 2024-10-14 10:55:42 +08:00
ljw
40c873034a fix:内审预算单上传附件 2024-10-14 10:15:12 +08:00
zzs
b3780baa97 feat(version1011):整机价格 2024-10-14 10:12:48 +08:00
ljw
727734e38b fix:销售出库审核编码汇总 2024-10-12 19:34:58 +08:00
ljw
f71760fa6a fix:
1.内审预算单生成附件
2.销售出库审核编码汇总
3.销售出库反审核编码消除
2024-10-12 17:53:58 +08:00
zzs
8137198072 wip(version1011):整机价格 2024-10-12 16:50:26 +08:00
ljw
d24248ab27 fix:内审预算单附件回填 2024-10-12 16:45:30 +08:00
ljw
f4c25d5fce fix:销售出库反审核功能处理 2024-10-12 11:55:12 +08:00
ljw
4d18f36fc6 fix:销售出库审核功能处理 2024-10-11 18:38:25 +08:00
ljw
84c64e6c6d fix:销售出库审核功能处理 2024-10-11 18:27:42 +08:00
ljw
58a697a691 fix:计算闲置期倒计时
(cherry picked from commit 9d395b1f7b)
2024-10-08 15:42:58 +08:00
2731e382f0 1.修改贷记单提交后获取上次贷记单号节点 2024-10-08 14:15:01 +08:00
ljw
ed7dfe051f fix:内审预算单 2024-09-27 22:05:53 +08:00
ljw
b7a40f76d1 fix:禁用状态改为作废状态 2024-09-24 21:44:20 +08:00
ljw
b176d71186 fix:报错处理 2024-09-24 21:10:41 +08:00
ljw
66215cbec3 fix:时间计算 2024-09-24 21:10:41 +08:00
ljw
7d01667867 fix:赠品行净重下单确认时不必填 2024-09-24 20:03:01 +08:00
ljw
a64f4b0f3a fix:配件价格库获取标准价条件增加 2024-09-24 20:03:00 +08:00
ljw
314a0c65c6 fix:赠品行净重下单确认时不必填 2024-09-24 19:37:33 +08:00
ljw
ea4c68c513 fix:发运明细单 2024-09-23 22:33:46 +08:00
ljw
4d4bb2a351 fix:如果询价单中的价格(包括明细信息的价格和多功能配置中的价格)为空,不更新整机价格库 2024-09-23 21:26:21 +08:00
ljw
bf488cc840 fix:审核时根据合同号获取财务信息《价税合计》汇总,将单据编号拼接(包含当前单 2024-09-23 17:29:25 +08:00
ljw
c907de8ea4 fix:询价单审核时,价格库的禁用状态更新为可用 2024-09-21 20:36:46 +08:00
ljw
fe50c336ee fix:询价单替换 2024-09-20 21:28:50 +08:00
ljw
58955639ea fix:保存时,按照 客户所在国 +买方英文名称+类型+信保限额申请 (4个字段,以空格间隔,拼接生成) 2024-09-20 15:56:37 +08:00
ljw
e1290107e1 fix:询价单过滤 2024-09-20 15:05:33 +08:00
ljw
3f0b5a421f fix:工厂价逻辑取消 2024-09-20 10:52:00 +08:00
ljw
1e4efeaa88 fix:跟单任务控制台整机下拉值控制 2024-09-19 16:32:02 +08:00
ljw
3177cc32bf fix:调拨订单申请单提交效验 2024-09-18 11:21:50 +08:00
ljw
6d7975611d fix:贷记单客户更改为集团客户 2024-09-13 17:51:45 +08:00
zzs01@yunemao.com
e61f6fe6f5 Merge branch 'dev-comp-price' into test 2024-09-12 16:17:00 +08:00
zzs01@yunemao.com
85d54a455f feat:整机价格 2024-09-12 16:06:25 +08:00
zzs01@yunemao.com
3d344212fc Merge branch 'dev-comp-price' into test
# Conflicts:
#	src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
2024-09-12 15:51:23 +08:00
zzs01@yunemao.com
788f9a2aa8 feat:整机价格 2024-09-12 15:49:08 +08:00