zzs01@yunemao.com
|
5d2c224238
|
Merge branch 'dev-declaration' into fix-report-zzs
|
2024-09-09 09:14:41 +08:00 |
|
|
|
9be8a84a57
|
配件发货明细表（已发货）
|
2024-09-07 14:07:21 +08:00 |
|
|
|
1c85620d5b
|
出口报关明细开票金额更换
|
2024-09-07 14:07:21 +08:00 |
|
|
|
671b33287d
|
配件发货明细表（已发货）
|
2024-09-07 11:20:47 +08:00 |
|
|
|
26d48a62e2
|
出口报关明细开票金额更换
|
2024-09-07 10:40:01 +08:00 |
|
|
|
22da2d8574
|
Merge branch 'test' into dev-ljw
|
2024-09-07 10:36:07 +08:00 |
|
|
|
0937b74657
|
Merge branch 'refs/heads/dev-book-payment' into test
|
2024-09-06 20:51:34 +08:00 |
|
|
|
cea38280d9
|
feat:发货联系书款项信息
|
2024-09-06 20:51:16 +08:00 |
|
|
|
d8d13f7dbc
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-06 19:28:09 +08:00 |
|
|
|
1e25a581d2
|
feat:发货联系书款项信息
|
2024-09-06 19:25:18 +08:00 |
|
|
|
9928b2fb86
|
change:国贸订单明细
|
2024-09-06 19:23:43 +08:00 |
|
|
|
a26db3adf6
|
feat:发货联系书款项信息
|
2024-09-06 19:06:42 +08:00 |
|
zzs01@yunemao.com
|
ddb6ffd8b7
|
feat:发货联系书款项信息
|
2024-09-06 19:01:56 +08:00 |
|
|
|
dea7868d6b
|
发运明细表（未发货）修复
|
2024-09-06 17:37:23 +08:00 |
|
zzs01@yunemao.com
|
752f50ebc3
|
Merge branch 'fix-report-zzs' into test
|
2024-09-06 15:34:52 +08:00 |
|
zzs01@yunemao.com
|
7f3dcb4e65
|
Merge branch 'fix-report-zzs'
|
2024-09-06 15:34:43 +08:00 |
|
zzs01@yunemao.com
|
51d8af6a7d
|
change:整机发运明细表
|
2024-09-06 15:34:25 +08:00 |
|
|
|
fbe6d5d043
|
配件发货明细表（未发货）
|
2024-09-06 15:23:03 +08:00 |
|
zzs01@yunemao.com
|
0c6187c580
|
Merge branch 'fix-report-zzs' into test
|
2024-09-06 14:05:47 +08:00 |
|
zzs01@yunemao.com
|
3a8c70150c
|
Merge branch 'fix-report-zzs'
|
2024-09-06 14:02:36 +08:00 |
|
|
|
50f0645265
|
发运明细表（提成）修复
|
2024-09-06 14:02:23 +08:00 |
|
|
|
13f5145fc2
|
明细报表开发
|
2024-09-06 14:02:23 +08:00 |
|
|
|
177a6d76b0
|
发运明细表（提成）修复
|
2024-09-06 11:40:36 +08:00 |
|
|
|
03e2317d6f
|
明细报表开发
|
2024-09-06 10:45:02 +08:00 |
|
zzs01@yunemao.com
|
b5900ccd56
|
change:整机发运明细表
|
2024-09-06 10:22:15 +08:00 |
|
|
|
8dc3b760ed
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-05 22:19:49 +08:00 |
|
|
|
3ec42e3ae9
|
明细报表开发
|
2024-09-05 22:19:41 +08:00 |
|
|
|
36e7cc6dc2
|
明细报表开发
|
2024-09-05 22:19:40 +08:00 |
|
|
|
b157236768
|
明细报表开发
|
2024-09-05 22:17:50 +08:00 |
|
|
|
a97d42f812
|
fix:国贸订单详情
|
2024-09-05 22:11:12 +08:00 |
|
|
|
dcd89945fa
|
明细报表开发
|
2024-09-05 21:54:57 +08:00 |
|
|
|
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 |
|
|
|
883c25593e
|
明细报表开发
|
2024-09-05 21:28:20 +08:00 |
|
|
|
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 |
|
|
|
abaa19acdc
|
明细报表开发
|
2024-09-05 19:43:27 +08:00 |
|
|
|
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 |
|
|
|
12a633c0d4
|
询价单二开
# Conflicts:
# src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
|
2024-09-04 20:35:27 +08:00 |
|
|
|
0b5ee97851
|
询价单二开
|
2024-09-04 20:31:51 +08:00 |
|
|
|
a6691b4d9b
|
wip:出口报关明细报表
|
2024-09-04 20:11:03 +08:00 |
|
|
|
e7c5b43607
|
单一窗口报关单给出口报关赋值时同时赋值美元汇率
|
2024-09-04 18:55:12 +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 |
|
|
|
a19eb6c208
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 21:56:33 +08:00 |
|
zzs01@yunemao.com
|
b720b5591f
|
feat:收款单校验取值调整
|
2024-09-03 21:56:13 +08:00 |
|
|
|
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 |
|
|
|
f70e051b7c
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 11:23:46 +08:00 |
|
|
|
5c02fd60c5
|
订舱通知单，审核后是否付款变为是
|
2024-09-03 11:23:45 +08:00 |
|
zzs01@yunemao.com
|
c3d07166df
|
feat:收款单校验取值调整
|
2024-09-03 11:22:40 +08:00 |
|
|
|
630b9212d2
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 10:36:01 +08:00 |
|
|
|
821ef4e448
|
订舱通知单，审核后是否付款变为是
|
2024-09-03 10:31:21 +08:00 |
|
|
|
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 |
|
|
|
0278d6e8e4
|
运输方式+费用项目+港口唯一
|
2024-09-02 21:18:20 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
