Commit Graph

70 Commits

Author SHA1 Message Date
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
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
zzs01@yunemao.com
7dd1363193 feat:订舱委托取消部分字段必填 2024-09-02 09:51:28 +08:00
4cb081c782 fix:发货联系书欠款校验 2024-08-31 17:50:56 +08:00
7d13bfac7e feat:作废 2024-08-31 14:28:38 +08:00
0862be9930 Merge branch 'refs/heads/dev-zzs' into test 2024-08-30 21:23:45 +08:00
97312c2c87 feat:作废 2024-08-30 20:42:51 +08:00
zzs01@yunemao.com
36c95564ea feat:装箱单删除行校验 2024-08-30 20:02:02 +08:00
zzs01@yunemao.com
e301c440ee chore:add merge miss 2024-08-30 18:18:19 +08:00
zzs01@yunemao.com
4134ca0132 Merge branch 'dev-calc' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
#	src/main/java/com/yem/wm/es/storagetrans/list/StorageTransKDListFilter.java
2024-08-30 18:16:05 +08:00
zzs01@yunemao.com
414689f525 Merge branch 'dev-ljw' into test 2024-08-30 18:15:00 +08:00
zzs01@yunemao.com
4405731da0 feat:外销合同4个公式计算 2024-08-30 18:07:49 +08:00
ljw
12ace7d23a 快递报销明细列表打开过滤 2024-08-30 18:04:23 +08:00
zzs01@yunemao.com
7eb5c3d888 Merge branch 'dev-ljw' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
#	src/main/java/kd/cosmic/Application.java
2024-08-30 15:42:51 +08:00
ljw
138e2fcedb 外销合同提交时子分录数据汇总到分录 2024-08-30 15:39:40 +08:00
zzs01@yunemao.com
1424d9616a feat:出库报关差值大于不为0,不允许下推 2024-08-30 15:17:54 +08:00
zzs01@yunemao.com
0b170c32de feat: 出库报关金额差值(合计) 2024-08-29 21:15:14 +08:00
ljw
b6a819ecfa 快递报销明细列表打开过滤 2024-08-29 21:14:41 +08:00
ljw
f4f7a1a668 快递报销明细列表打开过滤 2024-08-29 18:29:17 +08:00
ljw
2d76446768 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:07:54 +08:00
ljw
828106a3ea 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:07:40 +08:00