|
685402c9c0
|
fix:外销合同软提示
|
2024-09-18 19:35:10 +08:00 |
|
|
8d19014968
|
fix:调拨订单申请单提交效验
|
2024-09-18 19:35:10 +08:00 |
|
|
45117092b3
|
fix:外销合同提交效验
|
2024-09-14 18:13:34 +08:00 |
|
|
56ca1a1883
|
fix:外销合同提交效验
|
2024-09-14 17:52:00 +08:00 |
|
zzs01@yunemao.com
|
4f2b123a08
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 16:14:58 +08:00 |
|
zzs01@yunemao.com
|
1f2e6ec504
|
fix:发货联系书款项到位情况
|
2024-09-14 16:14:51 +08:00 |
|
|
599aa65181
|
fix:贷记单客户更改为集团客户
|
2024-09-14 14:29:28 +08:00 |
|
|
6d7975611d
|
fix:贷记单客户更改为集团客户
|
2024-09-13 17:51:45 +08:00 |
|
|
d607e346c1
|
fix:外销合同数量汇总
|
2024-09-13 16:12:50 +08:00 |
|
|
9e041625db
|
fix:外销合同报错处理
|
2024-09-13 13:16:18 +08:00 |
|
|
09b784dec7
|
fix:外销合同报错处理
|
2024-09-13 13:16:17 +08:00 |
|
|
323bb9997e
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 12:57:42 +08:00 |
|
|
254308bdc5
|
fix:业务分类为整机并且是否赠品为是的必填
|
2024-09-13 12:57:41 +08:00 |
|
|
1ae18e6a7d
|
fix:外销合同保存效验
|
2024-09-12 20:23:12 +08:00 |
|
|
39afb0d07a
|
fix:外销合同保存效验
|
2024-09-12 20:11:39 +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 |
|
|
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 |
|
|
05daa5fef8
|
配件已发货明细表逻辑修改
|
2024-09-11 20:06:26 +08:00 |
|
|
5fe4ed062c
|
配件未发货明细表逻辑修改
|
2024-09-11 20:06:25 +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 |
|
|
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
|
70fefff998
|
fix:折扣率计算
(cherry picked from commit 9b0ddf97e2 )
|
2024-09-11 09:36:40 +08:00 |
|
zzs01@yunemao.com
|
0cffc88208
|
Merge branch 'fix-discount-rate' into test
|
2024-09-10 19:02:00 +08:00 |
|
zzs01@yunemao.com
|
bf656fa44e
|
fix:库区同步定时任务
(cherry picked from commit 618fc6c004 )
|
2024-09-10 19:01:30 +08:00 |
|
zzs01@yunemao.com
|
ad42a15754
|
change:折扣率计算
|
2024-09-10 19:00:19 +08:00 |
|
zzs01@yunemao.com
|
e04dd91174
|
wip:整机价格
|
2024-09-10 17:18:11 +08:00 |
|
zzs01@yunemao.com
|
a807b931db
|
Merge branch 'refs/heads/fix-warehouse' into test
|
2024-09-10 16:46:13 +08:00 |
|
zzs01@yunemao.com
|
f6f7a2185f
|
change:订单产品需求单下推库区库位携带取消
|
2024-09-10 16:27:39 +08:00 |
|
zzs01@yunemao.com
|
138a2b9a16
|
Merge branch 'dev-plm' into test
|
2024-09-10 15:38:59 +08:00 |
|
zzs01@yunemao.com
|
3eb9de8d7b
|
fix:生成替换关系
|
2024-09-10 15:38:40 +08:00 |
|
zzs01@yunemao.com
|
e8d228de8e
|
fix:贷记单提交报错
(cherry picked from commit 6db339b94f )
|
2024-09-10 14:37:27 +08:00 |
|
zzs01@yunemao.com
|
6db339b94f
|
fix:贷记单提交报错
|
2024-09-10 14:36:51 +08:00 |
|
|
75850fd0e1
|
外销合同:提交效验附件面板是否有值
|
2024-09-10 14:29:02 +08:00 |
|
|
e524223637
|
销售出库审核效验
|
2024-09-10 14:29:02 +08:00 |
|
zzs01@yunemao.com
|
7bbd8ddc54
|
fix:生成替换关系
|
2024-09-10 14:27:50 +08:00 |
|