|
|
29a25ef7a9
|
fix:申报要素
|
2024-09-20 20:35:50 +08:00 |
|
|
|
bb9051668f
|
fix:申报要素
|
2024-09-20 20:35:14 +08:00 |
|
|
|
fd3d2f3dbc
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 20:13:36 +08:00 |
|
|
|
756bf2c97d
|
修改标签包含ensign盖章
|
2024-09-20 20:13:14 +08:00 |
|
|
|
113c90615d
|
fix:提交时云之家标题拼接
|
2024-09-20 20:12:41 +08:00 |
|
|
|
433d2bc5c2
|
fix:提交时云之家标题拼接
|
2024-09-20 20:12:18 +08:00 |
|
|
|
0d9a6b2eba
|
fix:提交时云之家标题拼接
|
2024-09-20 19:52:21 +08:00 |
|
|
|
0afb9bbc48
|
fix:提交时云之家标题拼接
|
2024-09-20 19:51:48 +08:00 |
|
|
|
5dc72ce621
|
fix:外销合同所有的物料都重新获取一遍申报要素
|
2024-09-20 18:39:47 +08:00 |
|
|
|
b820f15fda
|
fix:外销合同所有的物料都重新获取一遍申报要素
|
2024-09-20 18:39:35 +08:00 |
|
|
|
a19d8fd639
|
1.增加合同签章只同步pdf格式文件
2.增加回签确认必须上传附件校验
|
2024-09-20 18:18:10 +08:00 |
|
|
|
2df8e38c06
|
Merge branch 'dev-zhouc' into test
|
2024-09-20 17:04:49 +08:00 |
|
|
|
ea7b0e6279
|
1.增加外销合同上传附件 只校验 word格式存在标签；
2.增加框架合同上传附件 只校验 word格式存在标签；
3.增加框架合同合同签章同步云之家；
4.增加框架合同签章同步云之家回写；
|
2024-09-20 17:04:04 +08:00 |
|
|
|
858bcba932
|
Merge branch 'dev-zhouc' into test
|
2024-09-19 11:23:04 +08:00 |
|
|
|
015f53e685
|
1.修改外销合同签章名称包含 ensign
2.增加框架合同合同签章
|
2024-09-19 11:20:23 +08:00 |
|
|
|
47f3009e31
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-09-19 10:32:27 +08:00 |
|
|
|
e04e811087
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-09-19 10:32:09 +08:00 |
|
|
|
80219cf6dd
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:54:47 +08:00 |
|
|
|
727a10a3a3
|
Revert "fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定"
This reverts commit 93fa1a00
|
2024-09-18 22:39:47 +08:00 |
|
|
|
96e7ad5152
|
fix:外销合同软提示
|
2024-09-18 22:38:57 +08:00 |
|
|
|
93fa1a00a2
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:34:07 +08:00 |
|
|
|
270c17a302
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:33:46 +08:00 |
|
|
|
2dd9af9aa2
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:19:51 +08:00 |
|
|
|
e40425d02c
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:13:01 +08:00 |
|
|
|
ca6671b388
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:12:40 +08:00 |
|
|
|
7eb1ecacc2
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:09:56 +08:00 |
|
|
|
e29dbb6aac
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:09:25 +08:00 |
|
|
|
be3cb232d3
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 19:36:28 +08:00 |
|
|
|
685402c9c0
|
fix:外销合同软提示
|
2024-09-18 19:35:10 +08:00 |
|
|
|
fc05859dac
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 17:37:41 +08:00 |
|
|
|
db0264cc6e
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 16:48:25 +08:00 |
|
|
|
03d2c7a8eb
|
fix:外销合同软提示
|
2024-09-18 16:48:03 +08:00 |
|
|
|
77695e713d
|
fix:外销合同提交效验
|
2024-09-14 18:14:07 +08:00 |
|
|
|
612d85537d
|
fix:外销合同提交效验
|
2024-09-14 18:13:58 +08:00 |
|
|
|
45117092b3
|
fix:外销合同提交效验
|
2024-09-14 18:13:34 +08:00 |
|
|
|
56ca1a1883
|
fix:外销合同提交效验
|
2024-09-14 17:52:00 +08:00 |
|
|
|
b8eddb1823
|
fix:外销合同提交效验
|
2024-09-14 17:51:37 +08:00 |
|
|
|
f24a52881b
|
fix:外销合同提交效验
|
2024-09-14 17:48:04 +08:00 |
|
|
|
81079a5b31
|
fix:外销合同提交效验
|
2024-09-14 17:44:51 +08:00 |
|
|
|
ea8d9fa222
|
fix:外销合同提交效验
|
2024-09-14 17:34:11 +08:00 |
|
|
|
eb2c1c4a3e
|
fix:贷记单客户更改为集团客户
|
2024-09-14 16:30:25 +08:00 |
|
zzs01@yunemao.com
|
4f2b123a08
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 16:14:58 +08:00 |
|
zzs01@yunemao.com
|
1f2e6ec504
|
fix:发货联系书款项到位情况
|
2024-09-14 16:14:51 +08:00 |
|
|
|
599aa65181
|
fix:贷记单客户更改为集团客户
|
2024-09-14 14:29:28 +08:00 |
|
|
|
571bb72581
|
fix:外销合同数量汇总
|
2024-09-13 16:13:10 +08:00 |
|
|
|
d607e346c1
|
fix:外销合同数量汇总
|
2024-09-13 16:12:50 +08:00 |
|
|
|
ff56780319
|
fix:外销合同报错处理
|
2024-09-13 13:35:16 +08:00 |
|
|
|
64faacc5b6
|
fix:外销合同报错处理
|
2024-09-13 13:35:15 +08:00 |
|
|
|
38287ec1cb
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 13:35:14 +08:00 |
|
|
|
95b5de8af1
|
fix:业务分类为整机并且是否赠品为是的必填
|
2024-09-13 13:35:13 +08:00 |
|
|
|
9e041625db
|
fix:外销合同报错处理
|
2024-09-13 13:16:18 +08:00 |
|
|
|
09b784dec7
|
fix:外销合同报错处理
|
2024-09-13 13:16:17 +08:00 |
|
|
|
323bb9997e
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 12:57:42 +08:00 |
|
|
|
254308bdc5
|
fix:业务分类为整机并且是否赠品为是的必填
|
2024-09-13 12:57:41 +08:00 |
|
|
|
598d498aaa
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 11:27:26 +08:00 |
|
|
|
38b30e43ec
|
fix:外销合同保存效验
|
2024-09-12 20:36:56 +08:00 |
|
|
|
546031f7c1
|
fix:外销合同保存效验
|
2024-09-12 20:36:55 +08:00 |
|
|
|
1ae18e6a7d
|
fix:外销合同保存效验
|
2024-09-12 20:23:12 +08:00 |
|
|
|
39afb0d07a
|
fix:外销合同保存效验
|
2024-09-12 20:11:39 +08:00 |
|
zzs01@yunemao.com
|
e61f6fe6f5
|
Merge branch 'dev-comp-price' into test
|
2024-09-12 16:17:00 +08:00 |
|
zzs01@yunemao.com
|
91e9efd122
|
feat:整机价格
|
2024-09-12 16:11:42 +08:00 |
|
zzs01@yunemao.com
|
3d344212fc
|
Merge branch 'dev-comp-price' into test
# Conflicts:
# src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
|
2024-09-12 15:51:23 +08:00 |
|
zzs01@yunemao.com
|
788f9a2aa8
|
feat:整机价格
|
2024-09-12 15:49:08 +08:00 |
|
zzs01@yunemao.com
|
9817b240bf
|
fix:折扣率计算（价格条款）
(cherry picked from commit e039cda4b4)
|
2024-09-11 14:40:02 +08:00 |
|
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 |
|
|
|
75850fd0e1
|
外销合同：提交效验附件面板是否有值
|
2024-09-10 14:29:02 +08:00 |
|
|
|
e524223637
|
销售出库审核效验
|
2024-09-10 14:29:02 +08:00 |
|
|
|
d553b4b1c6
|
外销合同：提交效验附件面板是否有值
|
2024-09-09 18:14:43 +08:00 |
|
zzs01@yunemao.com
|
51e0d68059
|
wip:整机价格
|
2024-09-09 18:14:04 +08:00 |
|
zzs01@yunemao.com
|
a27d050b49
|
wip:获取标准价：销售FCA标配青岛单价、金额
|
2024-09-09 17:30:04 +08:00 |
|
|
|
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 |
|
|
|
a26db3adf6
|
feat:发货联系书款项信息
|
2024-09-06 19:06:42 +08:00 |
|
zzs01@yunemao.com
|
ddb6ffd8b7
|
feat:发货联系书款项信息
|
2024-09-06 19:01:56 +08:00 |
|
|
|
a19eb6c208
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 21:56:33 +08:00 |
|
|
|
40cd3bd4e5
|
订舱通知单，审核后是否付款变为是
|
2024-09-03 21:56:13 +08:00 |
|
|
|
f70e051b7c
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 11:23:46 +08:00 |
|
|
|
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 |
|
|
|
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
|
1424d9616a
|
feat:出库报关差值大于不为0，不允许下推
|
2024-08-30 15:17:54 +08:00 |
|
zzs01@yunemao.com
|
0b170c32de
|
feat: 出库报关金额差值（合计）
|
2024-08-29 21:15:14 +08:00 |
|
|
|
b6a819ecfa
|
快递报销明细列表打开过滤
|
2024-08-29 21:14:41 +08:00 |
|
|
|
f4f7a1a668
|
快递报销明细列表打开过滤
|
2024-08-29 18:29:17 +08:00 |
|
|
|
2d76446768
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:07:54 +08:00 |
|
|
|
828106a3ea
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:07:40 +08:00 |
|
zzs01@yunemao.com
|
901b12f2ed
|
feat: 出库报关金额差值（合计）
|
2024-08-29 14:47:49 +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 |
|
|
|
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 |
|
|
|
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
|
cf4598c101
|
wip
|
2024-08-27 14:48:49 +08:00 |
|
zzs01@yunemao.com
|
c30a97c291
|
wip
|
2024-08-27 14:28:28 +08:00 |
|
zzs01@yunemao.com
|
f0288c563b
|
查询客户购买过的资源API
|
2024-08-27 10:33:00 +08:00 |
|
violet
|
672713b3c2
|
first commit
|
2024-08-26 09:19:12 +08:00 |
|
