|
|
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 |
|
|
|
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 |
|
zzs01@yunemao.com
|
f90e7f8d58
|
Merge branch 'dev-zzs' into test
|
2024-09-02 09:57:11 +08:00 |
|
zzs01@yunemao.com
|
28e8697e2d
|
feat:CMMP部件明细表审核校验器
|
2024-09-02 09:56:52 +08:00 |
|
zzs01@yunemao.com
|
7dd1363193
|
feat:订舱委托取消部分字段必填
|
2024-09-02 09:51:28 +08:00 |
|
zzs01@yunemao.com
|
0f1778e7e3
|
wip:PLM匹配，生成替换关系
|
2024-09-02 09:41:57 +08:00 |
|
zzs01@yunemao.com
|
1e074f37ae
|
wip:PLM匹配，生成替换关系
|
2024-09-02 09:36:08 +08:00 |
|
zzs01@yunemao.com
|
7ea350de04
|
feat:服务维修单无权限修改
|
2024-09-02 09:34:33 +08:00 |
|
|
|
4cb081c782
|
fix:发货联系书欠款校验
|
2024-08-31 17:50:56 +08:00 |
|
|
|
f9511ecb94
|
运输方式+费用项目+港口唯一
|
2024-08-31 16:37:44 +08:00 |
|
|
|
56b8060d6a
|
至不允许小于等于从
从不能小于前一行的至
|
2024-08-31 16:37:28 +08:00 |
|
|
|
7d13bfac7e
|
feat:作废
|
2024-08-31 14:28:38 +08:00 |
|
|
|
88299446ed
|
feat:作废
(cherry picked from commit b34dff0fdb)
|
2024-08-31 14:03:14 +08:00 |
|
|
|
5155e7aab2
|
feat:生成贷记单逻辑
|
2024-08-30 21:50:11 +08:00 |
|
|
|
0862be9930
|
Merge branch 'refs/heads/dev-zzs' into test
|
2024-08-30 21:23:45 +08:00 |
|
|
|
edf4d0d0d6
|
feat:延付申请拼接标题
|
2024-08-30 21:23:15 +08:00 |
|
|
|
7693dc71dd
|
feat:折扣后销售单价计算
|
2024-08-30 21:22:29 +08:00 |
|
|
|
97312c2c87
|
feat:作废
|
2024-08-30 20:42:51 +08:00 |
|
|
|
8457b51317
|
feat:标题拼接
|
2024-08-30 20:40:36 +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 |
|
|
|
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 |
|
|
|
138e2fcedb
|
外销合同提交时子分录数据汇总到分录
|
2024-08-30 15:39:40 +08:00 |
|
zzs01@yunemao.com
|
23b0248f08
|
Merge branch 'dev-zzs' into test
|
2024-08-30 15:26:47 +08:00 |
|
zzs01@yunemao.com
|
1424d9616a
|
feat:出库报关差值大于不为0，不允许下推
|
2024-08-30 15:17:54 +08:00 |
|
|
|
f4c1de4baf
|
Merge branch 'dev-ljw' into dev-change
|
2024-08-30 10:31:31 +08:00 |
|
|
|
18d40f65c6
|
快递报销明细列表打开过滤
|
2024-08-30 10:31:20 +08:00 |
|
|
|
9af58dec3a
|
外销合同提交时子分录数据汇总到分录
|
2024-08-30 10:18:52 +08:00 |
|
zzs01@yunemao.com
|
43c219e4b9
|
feat:应回款倒计时调整，加负号
|
2024-08-29 21:15:14 +08:00 |
|
zzs01@yunemao.com
|
0b170c32de
|
feat: 出库报关金额差值（合计）
|
2024-08-29 21:15:14 +08:00 |
|
|
|
b6a819ecfa
|
快递报销明细列表打开过滤
|
2024-08-29 21:14:41 +08:00 |
|
zzs01@yunemao.com
|
1d129a25ed
|
Merge branch 'feat-void-reason'
|
2024-08-29 21:14:09 +08:00 |
|
|
|
f4f7a1a668
|
快递报销明细列表打开过滤
|
2024-08-29 18:29:17 +08:00 |
|
zzs01@yunemao.com
|
7756bbcf57
|
Merge branch 'dev-zzs' into test
|
2024-08-29 18:08:28 +08:00 |
|
|
|
2d76446768
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:07:54 +08:00 |
|
|
|
828106a3ea
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:07:40 +08:00 |
|
zzs01@yunemao.com
|
e4b60d8433
|
feat:应回款倒计时调整，加负号
|
2024-08-29 18:06:14 +08:00 |
|
|
|
aa6a3e0b31
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:03:35 +08:00 |
|
|
|
af565627e5
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:02:25 +08:00 |
|
zzs01@yunemao.com
|
c8cda50b5b
|
wip:PLM匹配，生成替换关系
|
2024-08-29 17:48:29 +08:00 |
|
zzs01@yunemao.com
|
db1cce9b4d
|
wip:PLM匹配，生成替换关系
|
2024-08-29 17:31:52 +08:00 |
|
zzs01@yunemao.com
|
15ec1e9cac
|
wip:PLM匹配，生成替换关系
|
2024-08-29 17:01:41 +08:00 |
|
zzs01@yunemao.com
|
901b12f2ed
|
feat: 出库报关金额差值（合计）
|
2024-08-29 14:47:49 +08:00 |
|
zzs01@yunemao.com
|
8fc5708bed
|
Merge branch 'feat-void-reason' into test
|
2024-08-29 14:34:51 +08:00 |
|
zzs01@yunemao.com
|
7c59762995
|
feat: 作废原因
|
2024-08-29 14:32:51 +08:00 |
|
zzs01@yunemao.com
|
1f1535a6a9
|
fix: 销售出库提交差值
|
2024-08-29 14:07:01 +08:00 |
|
|
|
47f627e91c
|
订舱产品需求单 作废功能完善 （作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ）
|
2024-08-29 11:33:11 +08:00 |
|
|
|
0205f3f397
|
订舱产品需求单 作废功能完善 （作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ）
|
2024-08-29 11:30:12 +08:00 |
|
|
|
c9022a8e35
|
l
|
2024-08-29 10:10:20 +08:00 |
|
zzs01@yunemao.com
|
98a5437cbf
|
Merge branch 'main' into dev-zzs
|
2024-08-29 09:24:26 +08:00 |
|
zzs01@yunemao.com
|
068d66138b
|
Merge branch 'dev-ljw'
|
2024-08-28 22:13:26 +08:00 |
|
|
|
fd585814d5
|
l
|
2024-08-28 22:12:12 +08:00 |
|
zzs01@yunemao.com
|
eddc69e089
|
Merge branch 'dev-ljw'
|
2024-08-28 22:03:01 +08:00 |
|
|
|
6bdc942369
|
Merge remote-tracking branch 'orinin/dev-ljw' into dev-ljw
|
2024-08-28 22:01:01 +08:00 |
|
|
|
28069ceb59
|
l
|
2024-08-28 22:00:41 +08:00 |
|
|
|
e85348a1b5
|
Merge pull request 'ljw' (#5) from dev-ljw into main
Reviewed-on: #5
|
2024-08-28 21:13:15 +08:00 |
|
|
|
f1f4337099
|
l
|
2024-08-28 21:12:43 +08:00 |
|
zzs01@yunemao.com
|
fe577e254b
|
Merge branch 'dev-ljw' into test
|
2024-08-28 19:24:45 +08:00 |
|
zzs01@yunemao.com
|
38da4269be
|
fix: yem_sharethecost
|
2024-08-28 19:24:20 +08:00 |
|
zzs01@yunemao.com
|
d7458c3f8d
|
chore: Application
|
2024-08-28 17:50:45 +08:00 |
|
|
|
c6f606c769
|
Merge pull request 'dev-ljw' (#4) from dev-ljw into test
Reviewed-on: #4
|
2024-08-28 17:42:18 +08:00 |
|
|
|
12ba81e92a
|
l
|
2024-08-28 17:38:58 +08:00 |
|
zzs01@yunemao.com
|
728a223675
|
Merge branch 'feat-order-api' into test
|
2024-08-28 16:51:52 +08:00 |
|
zzs01@yunemao.com
|
eac83a3efe
|
feat:查询购买过的产品机型
|
2024-08-28 16:50:32 +08:00 |
|
|
|
25b7dd7643
|
Merge pull request 'fix-st-audit' (#3) from fix-st-audit into test
Reviewed-on: #3
|
2024-08-28 16:20:20 +08:00 |
|
zzs01@yunemao.com
|
6812e76958
|
fix:流程中订舱审核报错
|
2024-08-28 16:15:08 +08:00 |
|
zzs01@yunemao.com
|
286e959c4f
|
wip:WORD转PDF
|
2024-08-28 15:47:20 +08:00 |
|
|
|
fab8a9cd9f
|
l
|
2024-08-27 20:04:06 +08:00 |
|
zzs01@yunemao.com
|
713cc279a8
|
wip
|
2024-08-27 14:50:37 +08:00 |
|
zzs01@yunemao.com
|
cf4598c101
|
wip
|
2024-08-27 14:48:49 +08:00 |
|
|
|
8966670dec
|
l
|
2024-08-27 14:40:40 +08:00 |
|
zzs01@yunemao.com
|
c30a97c291
|
wip
|
2024-08-27 14:28:28 +08:00 |
|
zzs01@yunemao.com
|
f3e95505a5
|
价格库查询API
|
2024-08-27 11:35:45 +08:00 |
|
zzs01@yunemao.com
|
f0288c563b
|
查询客户购买过的资源API
|
2024-08-27 10:33:00 +08:00 |
|
zzs01@yunemao.com
|
e5519f773d
|
服务维修作废状态更新到整机档案
|
2024-08-26 14:34:24 +08:00 |
|
violet
|
672713b3c2
|
first commit
|
2024-08-26 09:19:12 +08:00 |
|
