Commit Graph

1379 Commits

Author SHA1 Message Date
d427f6a104 Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-05 21:39:38 +08:00
fc33b58c8e fix:报表产品分类多选 2024-09-05 21:39:16 +08:00
ljw
883c25593e 明细报表开发 2024-09-05 21:28:20 +08:00
ljw
87c2587c0d 明细报表开发 2024-09-05 21:27:23 +08:00
0ed12d3870 Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-05 21:25:43 +08:00
1d42c39d8c change:报表产品分类多选 2024-09-05 20:44:19 +08:00
0c6cee0fae Merge remote-tracking branch 'origin/dev-ljw' into test 2024-09-05 19:57:31 +08:00
ljw
abaa19acdc 明细报表开发 2024-09-05 19:43:27 +08:00
ljw
8d9af3df5e change:销售提成整机 2024-09-05 19:31:51 +08:00
zzs01@yunemao.com
d65809238c Merge branch 'fix-report-zzs' 2024-09-05 15:56:58 +08:00
zzs01@yunemao.com
8be25973c9 Merge branch 'fix-report-zzs' into test 2024-09-05 15:52:50 +08:00
zzs01@yunemao.com
db5e6c097d Merge branch 'dev-declaration' into test 2024-09-05 15:52:41 +08:00
zzs01@yunemao.com
a8fef3ed3b change:国贸订单明细 2024-09-05 15:51:44 +08:00
zzs01@yunemao.com
fb84350512 change:销售提成整机 2024-09-05 15:39:16 +08:00
zzs01@yunemao.com
33ec5c134e change:国贸订单明细(生产线) 2024-09-05 15:15:15 +08:00
zzs01@yunemao.com
4801a0c93c change:国贸订单明细(生产线) 2024-09-05 14:59:01 +08:00
zzs01@yunemao.com
1997d31018 change:销售提成整机 2024-09-05 14:45:26 +08:00
zzs01@yunemao.com
d1fd8b0efc fix:出口报关明细报表,实际申报要素 2024-09-05 14:32:36 +08:00
zzs01@yunemao.com
ecfcde8156 fix:出口报关明细报表,实际申报要素 2024-09-05 14:18:43 +08:00
zzs01@yunemao.com
3118ea1501 change:销售提成整机 2024-09-05 14:14:17 +08:00
zzs01@yunemao.com
d98169b17b change:整机发运明细表 2024-09-05 11:52:34 +08:00
zzs01@yunemao.com
08a2952879 change:整机发运明细表 2024-09-05 11:51:35 +08:00
zzs01@yunemao.com
8a571e614a fix:出口报关明细报表,订单号 2024-09-05 11:26:30 +08:00
zzs01@yunemao.com
afc3b08ce2 fix:出口报关明细报表 2024-09-05 11:15:56 +08:00
zzs01@yunemao.com
c026971b54 fix:合同号查询错误 2024-09-05 10:31:45 +08:00
zzs01@yunemao.com
021d5560d6 feat:出口报关数据修复 2024-09-05 10:31:33 +08:00
67be1b36f5 Merge remote-tracking branch 'origin/dev-ljw' into test 2024-09-04 20:35:29 +08:00
ljw
12a633c0d4 询价单二开
# Conflicts:
#	src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
2024-09-04 20:35:27 +08:00
ljw
0b5ee97851 询价单二开 2024-09-04 20:31:51 +08:00
a6691b4d9b wip:出口报关明细报表 2024-09-04 20:11:03 +08:00
ljw
e7c5b43607 单一窗口报关单给出口报关赋值时同时赋值美元汇率 2024-09-04 18:55:12 +08:00
ljw
dc342bcdaf 单一窗口报关单给出口报关赋值时同时赋值美元汇率 2024-09-04 18:54:44 +08:00
zzs01@yunemao.com
3899b142bd Reapply "wip:出口报关明细报表"
This reverts commit 714b6f8ce7.
2024-09-04 18:53:48 +08:00
zzs01@yunemao.com
714b6f8ce7 Revert "wip:出口报关明细报表"
This reverts commit 3f669694c9.
2024-09-04 18:53:23 +08:00
zzs01@yunemao.com
ca485cb29d Merge branch 'dev-declaration' into test 2024-09-04 18:52:42 +08:00
zzs01@yunemao.com
3f669694c9 wip:出口报关明细报表 2024-09-04 18:51:59 +08:00
zzs01@yunemao.com
fd75a6a02e wip:出口报关明细报表,计算 2024-09-04 18:18:15 +08:00
zzs01@yunemao.com
9d0393bf46 wip:出口报关明细报表,保费(结算币别) 2024-09-04 17:59:00 +08:00
zzs01@yunemao.com
aaa6982cda wip:出口报关明细报表,海运费(结算币别) 2024-09-04 17:53:54 +08:00
zzs01@yunemao.com
a65e1d2a52 wip:出口报关明细报表,美元保险费 2024-09-04 17:34:16 +08:00
zzs01@yunemao.com
efa308487f wip:出口报关明细报表,原币保险费 2024-09-04 17:26:44 +08:00
zzs01@yunemao.com
7aac46297b wip:出口报关明细报表,原币保险费 2024-09-04 17:24:51 +08:00
zzs01@yunemao.com
92f5446ce8 wip:出口报关明细报表,原币海运费,美元海运费 2024-09-04 17:16:59 +08:00
d428ff953e fix:报表产品机型过滤不生效 2024-09-03 21:56:50 +08:00
ljw
a19eb6c208 订舱通知单,反审核后是否付款变为否 2024-09-03 21:56:33 +08:00
zzs01@yunemao.com
b720b5591f feat:收款单校验取值调整 2024-09-03 21:56:13 +08:00
ljw
40cd3bd4e5 订舱通知单,审核后是否付款变为是 2024-09-03 21:56:13 +08:00
d5c1164669 Merge branch 'refs/heads/dev-zzs' into test 2024-09-03 20:32:10 +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
d46ad9a63a Merge remote-tracking branch 'origin/dev-zzs' into dev-zzs 2024-09-03 20:17:40 +08:00