Commit Graph

89 Commits

Author SHA1 Message Date
ljw
45117092b3 fix:外销合同提交效验 2024-09-14 18:13:34 +08:00
ljw
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
ljw
599aa65181 fix:贷记单客户更改为集团客户 2024-09-14 14:29:28 +08:00
ljw
d607e346c1 fix:外销合同数量汇总 2024-09-13 16:12:50 +08:00
ljw
9e041625db fix:外销合同报错处理 2024-09-13 13:16:18 +08:00
ljw
09b784dec7 fix:外销合同报错处理 2024-09-13 13:16:17 +08:00
ljw
323bb9997e fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 12:57:42 +08:00
ljw
254308bdc5 fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 12:57:41 +08:00
ljw
1ae18e6a7d fix:外销合同保存效验 2024-09-12 20:23:12 +08:00
ljw
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
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
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
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
ljw
75850fd0e1 外销合同:提交效验附件面板是否有值 2024-09-10 14:29:02 +08:00
ljw
e524223637 销售出库审核效验 2024-09-10 14:29:02 +08:00
ljw
d553b4b1c6 外销合同:提交效验附件面板是否有值 2024-09-09 18:14:43 +08:00
zzs01@yunemao.com
51e0d68059 wip:整机价格 2024-09-09 18:14:04 +08:00
zzs01@yunemao.com
a27d050b49 wip:获取标准价:销售FCA标配青岛单价、金额 2024-09-09 17:30:04 +08:00
ljw
c11b14cf95 销售出库审核效验 2024-09-09 15:48:44 +08:00
cea38280d9 feat:发货联系书款项信息 2024-09-06 20:51:16 +08:00
1e25a581d2 feat:发货联系书款项信息 2024-09-06 19:25:18 +08:00
ljw
a26db3adf6 feat:发货联系书款项信息 2024-09-06 19:06:42 +08:00
zzs01@yunemao.com
ddb6ffd8b7 feat:发货联系书款项信息 2024-09-06 19:01:56 +08:00
ljw
a19eb6c208 订舱通知单,反审核后是否付款变为否 2024-09-03 21:56:33 +08:00
ljw
40cd3bd4e5 订舱通知单,审核后是否付款变为是 2024-09-03 21:56:13 +08:00
ljw
f70e051b7c 订舱通知单,反审核后是否付款变为否 2024-09-03 11:23:46 +08:00
ljw
5c02fd60c5 订舱通知单,审核后是否付款变为是 2024-09-03 11:23:45 +08:00
025a400ad2 feat:外销合同作废 2024-09-02 21:18:20 +08:00
63f7458267 feat:外销合同是否礼品赠送=是 2024-09-02 21:18:20 +08:00
c891ae2c75 feat:外销合同作废 2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
7678ec974e feat:货代公司,修改字段类型 2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
f170c82c6b feat:整机合同带出防水布 2024-09-02 21:18:20 +08:00
7181e6194c feat:外销合同作废 2024-09-02 20:21:51 +08:00
e4bbc145d8 feat:外销合同是否礼品赠送=是 2024-09-02 20:18:28 +08:00
8dc728d79f Merge branch 'refs/heads/dev-zzs' into test 2024-09-02 19:46:29 +08:00
ed3913face Merge remote-tracking branch 'origin/dev-zzs' into dev-zzs 2024-09-02 19:46:10 +08:00
5bbcce8539 feat:外销合同作废 2024-09-02 19:45:57 +08:00
zzs01@yunemao.com
2aef6d4619 Merge branch 'dev-zzs' into test 2024-09-02 17:54:45 +08:00
zzs01@yunemao.com
0b9bb471d2 feat:货代公司,修改字段类型 2024-09-02 11:54:12 +08:00
zzs01@yunemao.com
936313989b feat:订舱委托取消部分字段必填 2024-09-02 10:19:39 +08:00
zzs01@yunemao.com
cdd324831f feat:整机合同带出防水布 2024-09-02 10:18:50 +08:00
zzs01@yunemao.com
f0b12b4959 feat:整机合同带出防水布 2024-09-02 10:18:32 +08:00
zzs01@yunemao.com
f90e7f8d58 Merge branch 'dev-zzs' into test 2024-09-02 09:57:11 +08:00