Commit Graph

614 Commits

Author SHA1 Message Date
ljw
323bb9997e fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 12:57:42 +08:00
ljw
254308bdc5 fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 12:57:41 +08:00
ljw
e0444aa985 fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 11:32:51 +08:00
ljw
beb8ba050e fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 11:32:35 +08:00
ljw
598d498aaa fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 11:27:26 +08:00
ljw
38b30e43ec fix:外销合同保存效验 2024-09-12 20:36:56 +08:00
ljw
546031f7c1 fix:外销合同保存效验 2024-09-12 20:36:55 +08:00
ljw
1ae18e6a7d fix:外销合同保存效验 2024-09-12 20:23:12 +08:00
ljw
8df8c434f2 fix:外销合同保存效验 2024-09-12 20:22:56 +08:00
ljw
39afb0d07a fix:外销合同保存效验 2024-09-12 20:11:39 +08:00
ljw
53fda19d54 fix:外销合同保存效验 2024-09-12 20:03:44 +08:00
ljw
05b7799960 fix:云之家获取按钮 2024-09-12 17:37:41 +08:00
ljw
2b328be8ea fix:云之家获取按钮 2024-09-12 17:37:25 +08:00
ljw
043c719773 fix:云之家获取按钮 2024-09-12 16:58:37 +08:00
ljw
3087a59a1e fix:云之家获取按钮 2024-09-12 16:53:43 +08:00
zzs01@yunemao.com
e61f6fe6f5 Merge branch 'dev-comp-price' into test 2024-09-12 16:17:00 +08:00
zzs01@yunemao.com
91e9efd122 feat:整机价格 2024-09-12 16:11:42 +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
zzs01@yunemao.com
135a1b4b5a fix:贷记单审核校验 2024-09-12 15:15:17 +08:00
ljw
dacfce217a fix:云之家回写日志 2024-09-12 14:33:45 +08:00
ljw
f59cf5c382 fix:礼品领用申请审核 2024-09-12 11:35:29 +08:00
ljw
b9f79c2e8e fix:礼品领用申请审核 2024-09-12 11:35:07 +08:00
zzs01@yunemao.com
d91e0df71d fix:贷记单审核校验 2024-09-12 10:40:44 +08:00
b8cd25b566 Merge branch 'refs/heads/dev-plm' into test 2024-09-11 22:10:38 +08:00
bfd822f79f fix:时间更新 2024-09-11 22:10:04 +08:00
317ac7fd93 fix:时间更新 2024-09-11 21:57:13 +08:00
a1992cf25a fix:子件英文名称 2024-09-11 21:05:17 +08:00
ljw
05daa5fef8 配件已发货明细表逻辑修改 2024-09-11 20:06:26 +08:00
ljw
5fe4ed062c 配件未发货明细表逻辑修改 2024-09-11 20:06:25 +08:00
ljw
6f77354be4 配件已发货明细表逻辑修改 2024-09-11 20:05:08 +08:00
zzs01@yunemao.com
37fafa359a Merge branch 'dev-plm' into test 2024-09-11 19:47:17 +08:00
zzs01@yunemao.com
44c0d2de38 wip:同步图片 2024-09-11 19:38:38 +08:00
zzs01@yunemao.com
b705f917ea wip:同步图片 2024-09-11 17:50:37 +08:00
zzs01@yunemao.com
6af629d16f wip:同步图片 2024-09-11 17:40:41 +08:00
zzs01@yunemao.com
f99635f3ef wip:生成替换关系 2024-09-11 17:15:40 +08:00
ljw
9bfc3e1847 配件已发货明细表逻辑修改 2024-09-11 16:14:18 +08:00
ljw
52391d9725 Merge branch 'test' 2024-09-11 15:34:24 +08:00
ljw
5446b00e36 配件已发货明细表逻辑修改 2024-09-11 15:34:19 +08:00
ljw
b5671aea9f 配件未发货明细表逻辑修改 2024-09-11 15:34:18 +08:00
ljw
72e155b072 配件已发货明细表逻辑修改 2024-09-11 15:33:38 +08:00
ljw
58078affba 配件未发货明细表逻辑修改 2024-09-11 15:08:38 +08:00
ljw
180f8fbcda 本地类 2024-09-11 15:02:03 +08:00
ljw
23ef73e3ac 外销合同:新增单据报错处理 2024-09-11 14:40:22 +08:00
zzs01@yunemao.com
9817b240bf fix:折扣率计算(价格条款)
(cherry picked from commit e039cda4b4)
2024-09-11 14:40:02 +08:00
zzs01@yunemao.com
fecad339e3 fix:折扣率计算
(cherry picked from commit 13c3d63ac2)
2024-09-11 14:40:01 +08:00
zzs01@yunemao.com
e039cda4b4 fix:折扣率计算(价格条款) 2024-09-11 14:39:10 +08:00
ljw
ae66b4b326 Merge branch 'dev-change' into dev-ljw 2024-09-11 10:52:08 +08:00
zzs01@yunemao.com
13c3d63ac2 fix:折扣率计算 2024-09-11 10:30:18 +08:00