Commit Graph

1396 Commits

Author SHA1 Message Date
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
ab5ebbda1c fix:报表产品机型过滤不生效 2024-09-03 20:17:14 +08:00
zzs01@yunemao.com
f57d710de6 Merge branch 'dev-zzs' into test 2024-09-03 11:23:55 +08:00
ljw
f70e051b7c 订舱通知单,反审核后是否付款变为否 2024-09-03 11:23:46 +08:00
ljw
5c02fd60c5 订舱通知单,审核后是否付款变为是 2024-09-03 11:23:45 +08:00
zzs01@yunemao.com
c3d07166df feat:收款单校验取值调整 2024-09-03 11:22:40 +08:00
ljw
630b9212d2 订舱通知单,反审核后是否付款变为否 2024-09-03 10:36:01 +08:00
ljw
821ef4e448 订舱通知单,审核后是否付款变为是 2024-09-03 10:31:21 +08:00
ljw
b9d0be7678 订舱通知单,审核后是否付款变为是 2024-09-03 10:30:05 +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
373148ac90 fix:销售提成整机,首付款支付日为空 2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
f170c82c6b feat:整机合同带出防水布 2024-09-02 21:18:20 +08:00
ljw
0278d6e8e4 运输方式+费用项目+港口唯一 2024-09-02 21:18:20 +08:00
ljw
281f5c5207 至不允许小于等于从
从不能小于前一行的至
2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
3b506f4cca feat:CMMP部件明细表审核校验器 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
ljw
30bff50325 询价单二开 2024-09-02 19:46:54 +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
777b1b149e wip:PLM匹配,生成替换关系 2024-09-02 15:09:25 +08:00
zzs01@yunemao.com
0b9bb471d2 feat:货代公司,修改字段类型 2024-09-02 11:54:12 +08:00
zzs01@yunemao.com
c1701969f7 fix:销售提成整机,首付款支付日为空 2024-09-02 11:14:27 +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
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
26dd984ff8 Merge branch 'dev-ljw' into test 2024-09-02 09:57:27 +08:00