|
|
e1290107e1
|
fix:询价单过滤
|
2024-09-20 15:05:33 +08:00 |
|
|
|
3f0b5a421f
|
fix:工厂价逻辑取消
|
2024-09-20 10:52:00 +08:00 |
|
|
|
1e4efeaa88
|
fix:跟单任务控制台整机下拉值控制
|
2024-09-19 16:32:02 +08:00 |
|
|
|
3177cc32bf
|
fix:调拨订单申请单提交效验
|
2024-09-18 11:21:50 +08:00 |
|
|
|
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 |
|
zzs01@yunemao.com
|
d91e0df71d
|
fix:贷记单审核校验
|
2024-09-12 10:40:44 +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
|
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
|
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 |
|
|
|
e524223637
|
销售出库审核效验
|
2024-09-10 14:29:02 +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 |
|
|
|
c11b14cf95
|
销售出库审核效验
|
2024-09-09 15:48:44 +08:00 |
|
|
|
532173b6dc
|
Merge branch 'dev-change' into test
|
2024-09-09 11:29:51 +08:00 |
|
zzs01@yunemao.com
|
0c6187c580
|
Merge branch 'fix-report-zzs' into test
|
2024-09-06 14:05:47 +08:00 |
|
|
|
13f5145fc2
|
明细报表开发
|
2024-09-06 14:02:23 +08:00 |
|
|
|
12a633c0d4
|
询价单二开
# Conflicts:
# src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
|
2024-09-04 20:35:27 +08:00 |
|
|
|
8d4dfbe487
|
Merge remote-tracking branch 'origin/dev-price' into test
# Conflicts:
# src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java
|
2024-09-03 20:32:01 +08:00 |
|
|
|
0278d6e8e4
|
运输方式+费用项目+港口唯一
|
2024-09-02 21:18:20 +08:00 |
|
|
|
281f5c5207
|
至不允许小于等于从
从不能小于前一行的至
|
2024-09-02 21:18:20 +08:00 |
|
|
|
30bff50325
|
询价单二开
|
2024-09-02 19:46:54 +08:00 |
|
zzs01@yunemao.com
|
6039d8867f
|
Revert "feat:服务维修单无权限修改"
This reverts commit eb8fcb0a2d.
|
2024-09-02 10:40:31 +08:00 |
|
zzs01@yunemao.com
|
eb8fcb0a2d
|
feat:服务维修单无权限修改
|
2024-09-02 10:21:23 +08:00 |
|
zzs01@yunemao.com
|
26dd984ff8
|
Merge branch 'dev-ljw' into test
|
2024-09-02 09:57:27 +08:00 |
|
zzs01@yunemao.com
|
f90e7f8d58
|
Merge branch 'dev-zzs' into test
|
2024-09-02 09:57:11 +08:00 |
|
zzs01@yunemao.com
|
7ea350de04
|
feat:服务维修单无权限修改
|
2024-09-02 09:34:33 +08:00 |
|
|
|
f9511ecb94
|
运输方式+费用项目+港口唯一
|
2024-08-31 16:37:44 +08:00 |
|
|
|
56b8060d6a
|
至不允许小于等于从
从不能小于前一行的至
|
2024-08-31 16:37:28 +08:00 |
|
|
|
88299446ed
|
feat:作废
(cherry picked from commit b34dff0fdb)
|
2024-08-31 14:03:14 +08:00 |
|
|
|
b34dff0fdb
|
feat:作废
|
2024-08-31 14:02:20 +08:00 |
|
|
|
5155e7aab2
|
feat:生成贷记单逻辑
|
2024-08-30 21:50:11 +08:00 |
|
|
|
0862be9930
|
Merge branch 'refs/heads/dev-zzs' into test
|
2024-08-30 21:23:45 +08:00 |
|
|
|
edf4d0d0d6
|
feat:延付申请拼接标题
|
2024-08-30 21:23:15 +08:00 |
|
|
|
7693dc71dd
|
feat:折扣后销售单价计算
|
2024-08-30 21:22:29 +08:00 |
|
|
|
97312c2c87
|
feat:作废
|
2024-08-30 20:42:51 +08:00 |
|
|
|
8457b51317
|
feat:标题拼接
|
2024-08-30 20:40:36 +08:00 |
|
zzs01@yunemao.com
|
4405731da0
|
feat:外销合同4个公式计算
|
2024-08-30 18:07:49 +08:00 |
|
zzs01@yunemao.com
|
43c219e4b9
|
feat:应回款倒计时调整，加负号
|
2024-08-29 21:15:14 +08:00 |
|
zzs01@yunemao.com
|
1d129a25ed
|
Merge branch 'feat-void-reason'
|
2024-08-29 21:14:09 +08:00 |
|
zzs01@yunemao.com
|
7756bbcf57
|
Merge branch 'dev-zzs' into test
|
2024-08-29 18:08:28 +08:00 |
|
zzs01@yunemao.com
|
e4b60d8433
|
feat:应回款倒计时调整，加负号
|
2024-08-29 18:06:14 +08:00 |
|
zzs01@yunemao.com
|
8fc5708bed
|
Merge branch 'feat-void-reason' into test
|
2024-08-29 14:34:51 +08:00 |
|
zzs01@yunemao.com
|
7c59762995
|
feat: 作废原因
|
2024-08-29 14:32:51 +08:00 |
|
zzs01@yunemao.com
|
1f1535a6a9
|
fix: 销售出库提交差值
|
2024-08-29 14:07:01 +08:00 |
|
|
|
47f627e91c
|
订舱产品需求单 作废功能完善 （作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ）
|
2024-08-29 11:33:11 +08:00 |
|
|
|
0205f3f397
|
订舱产品需求单 作废功能完善 （作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ）
|
2024-08-29 11:30:12 +08:00 |
|
|
|
6c55309096
|
l
|
2024-08-27 14:23:51 +08:00 |
|
violet
|
672713b3c2
|
first commit
|
2024-08-26 09:19:12 +08:00 |
|
