Commit Graph

834 Commits

Author SHA1 Message Date
ljw
be3cb232d3 fix:明细信息的销售方式包含CKD时,装柜信息的整机件数不锁定,其他情况都锁定 2024-09-18 19:36:28 +08:00
ljw
685402c9c0 fix:外销合同软提示 2024-09-18 19:35:10 +08:00
ljw
8d19014968 fix:调拨订单申请单提交效验 2024-09-18 19:35:10 +08:00
ljw
fc05859dac fix:明细信息的销售方式包含CKD时,装柜信息的整机件数不锁定,其他情况都锁定 2024-09-18 17:37:41 +08:00
ljw
db0264cc6e fix:明细信息的销售方式包含CKD时,装柜信息的整机件数不锁定,其他情况都锁定 2024-09-18 16:48:25 +08:00
ljw
03d2c7a8eb fix:外销合同软提示 2024-09-18 16:48:03 +08:00
ljw
3177cc32bf fix:调拨订单申请单提交效验 2024-09-18 11:21:50 +08:00
ljw
77695e713d fix:外销合同提交效验 2024-09-14 18:14:07 +08:00
ljw
612d85537d fix:外销合同提交效验 2024-09-14 18:13:58 +08:00
ljw
45117092b3 fix:外销合同提交效验 2024-09-14 18:13:34 +08:00
ljw
56ca1a1883 fix:外销合同提交效验 2024-09-14 17:52:00 +08:00
ljw
b8eddb1823 fix:外销合同提交效验 2024-09-14 17:51:37 +08:00
ljw
f24a52881b fix:外销合同提交效验 2024-09-14 17:48:04 +08:00
ljw
81079a5b31 fix:外销合同提交效验 2024-09-14 17:44:51 +08:00
ljw
ea8d9fa222 fix:外销合同提交效验 2024-09-14 17:34:11 +08:00
ljw
577661be20 Merge branch 'test' into dev-ljw 2024-09-14 17:15:05 +08:00
ljw
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
ljw
599aa65181 fix:贷记单客户更改为集团客户 2024-09-14 14:29:28 +08:00
ljw
7e35c677ce fix:贷记单客户更改为集团客户 2024-09-14 14:29:07 +08:00
ljw
15361766d5 fix:贷记单客户更改为集团客户 2024-09-13 17:55:45 +08:00
ljw
6d7975611d fix:贷记单客户更改为集团客户 2024-09-13 17:51:45 +08:00
ljw
77ceedb342 fix:贷记单客户更改为集团客户 2024-09-13 17:49:16 +08:00
ljw
571bb72581 fix:外销合同数量汇总 2024-09-13 16:13:10 +08:00
ljw
d607e346c1 fix:外销合同数量汇总 2024-09-13 16:12:50 +08:00
ljw
ebad3d6430 fix:外销合同数量汇总 2024-09-13 16:12:09 +08:00
ljw
ff56780319 fix:外销合同报错处理 2024-09-13 13:35:16 +08:00
ljw
64faacc5b6 fix:外销合同报错处理 2024-09-13 13:35:15 +08:00
ljw
38287ec1cb fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 13:35:14 +08:00
ljw
95b5de8af1 fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 13:35:13 +08:00
ljw
9e041625db fix:外销合同报错处理 2024-09-13 13:16:18 +08:00
ljw
09b784dec7 fix:外销合同报错处理 2024-09-13 13:16:17 +08:00
ljw
e46d0607ff fix:外销合同报错处理 2024-09-13 13:16:05 +08:00
ljw
f23e5859b5 fix:外销合同报错处理 2024-09-13 13:15:16 +08:00
ljw
323bb9997e fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 12:57:42 +08:00
ljw
254308bdc5 fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 12:57:41 +08:00
ljw
e0444aa985 fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 11:32:51 +08:00
ljw
beb8ba050e fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 11:32:35 +08:00
ljw
598d498aaa fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 11:27:26 +08:00
ljw
38b30e43ec fix:外销合同保存效验 2024-09-12 20:36:56 +08:00
ljw
546031f7c1 fix:外销合同保存效验 2024-09-12 20:36:55 +08:00
ljw
1ae18e6a7d fix:外销合同保存效验 2024-09-12 20:23:12 +08:00
ljw
8df8c434f2 fix:外销合同保存效验 2024-09-12 20:22:56 +08:00
ljw
39afb0d07a fix:外销合同保存效验 2024-09-12 20:11:39 +08:00
ljw
53fda19d54 fix:外销合同保存效验 2024-09-12 20:03:44 +08:00
ljw
05b7799960 fix:云之家获取按钮 2024-09-12 17:37:41 +08:00
ljw
2b328be8ea fix:云之家获取按钮 2024-09-12 17:37:25 +08:00
ljw
043c719773 fix:云之家获取按钮 2024-09-12 16:58:37 +08:00
ljw
3087a59a1e fix:云之家获取按钮 2024-09-12 16:53:43 +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
85d54a455f feat:整机价格 2024-09-12 16:06:25 +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
135a1b4b5a fix:贷记单审核校验 2024-09-12 15:15:17 +08:00
ljw
dacfce217a fix:云之家回写日志 2024-09-12 14:33:45 +08:00
ljw
f59cf5c382 fix:礼品领用申请审核 2024-09-12 11:35:29 +08:00
ljw
b9f79c2e8e fix:礼品领用申请审核 2024-09-12 11:35:07 +08:00
zzs01@yunemao.com
d91e0df71d fix:贷记单审核校验 2024-09-12 10:40:44 +08:00
ljw
23ef73e3ac 外销合同:新增单据报错处理 2024-09-11 14:40:22 +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
ljw
ae66b4b326 Merge branch 'dev-change' into dev-ljw 2024-09-11 10:52:08 +08:00
zzs01@yunemao.com
70fefff998 fix:折扣率计算
(cherry picked from commit 9b0ddf97e2)
2024-09-11 09:36:40 +08:00
zzs01@yunemao.com
0cffc88208 Merge branch 'fix-discount-rate' into test 2024-09-10 19:02:00 +08:00
zzs01@yunemao.com
bf656fa44e fix:库区同步定时任务
(cherry picked from commit 618fc6c004)
2024-09-10 19:01:30 +08:00
zzs01@yunemao.com
ad42a15754 change:折扣率计算 2024-09-10 19:00:19 +08:00
ljw
c8bf28a942 外销合同:新增单据报错处理 2024-09-10 17:46:51 +08:00
zzs01@yunemao.com
e04dd91174 wip:整机价格 2024-09-10 17:18:11 +08:00
zzs01@yunemao.com
a807b931db Merge branch 'refs/heads/fix-warehouse' into test 2024-09-10 16:46:13 +08:00
zzs01@yunemao.com
f6f7a2185f change:订单产品需求单下推库区库位携带取消 2024-09-10 16:27:39 +08:00
zzs01@yunemao.com
e8d228de8e fix:贷记单提交报错
(cherry picked from commit 6db339b94f)
2024-09-10 14:37:27 +08:00
zzs01@yunemao.com
6db339b94f fix:贷记单提交报错 2024-09-10 14:36:51 +08:00
ljw
75850fd0e1 外销合同:提交效验附件面板是否有值 2024-09-10 14:29:02 +08:00
ljw
e524223637 销售出库审核效验 2024-09-10 14:29:02 +08:00
ljw
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
1c5a7e853f wip:获取标准价 2024-09-09 17:54:35 +08:00
zzs01@yunemao.com
a27d050b49 wip:获取标准价:销售FCA标配青岛单价、金额 2024-09-09 17:30:04 +08:00
zzs01@yunemao.com
5a2d7edaa0 wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价 2024-09-09 17:15:34 +08:00
ljw
2beaa7f72c 外销合同:提交效验附件面板是否有值 2024-09-09 17:06:58 +08:00
ljw
c11b14cf95 销售出库审核效验 2024-09-09 15:48:44 +08:00
ljw
532173b6dc Merge branch 'dev-change' into test 2024-09-09 11:29:51 +08:00
cea38280d9 feat:发货联系书款项信息 2024-09-06 20:51:16 +08:00
1e25a581d2 feat:发货联系书款项信息 2024-09-06 19:25:18 +08:00
ljw
a26db3adf6 feat:发货联系书款项信息 2024-09-06 19:06:42 +08:00
zzs01@yunemao.com
ddb6ffd8b7 feat:发货联系书款项信息 2024-09-06 19:01:56 +08:00
zzs01@yunemao.com
0c6187c580 Merge branch 'fix-report-zzs' into test 2024-09-06 14:05:47 +08:00
ljw
13f5145fc2 明细报表开发 2024-09-06 14:02:23 +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
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
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
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
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
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
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
0b9bb471d2 feat:货代公司,修改字段类型 2024-09-02 11:54:12 +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
7dd1363193 feat:订舱委托取消部分字段必填 2024-09-02 09:51:28 +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
ljw
f9511ecb94 运输方式+费用项目+港口唯一 2024-08-31 16:37:44 +08:00
ljw
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
ljw
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
ljw
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
ljw
18d40f65c6 快递报销明细列表打开过滤 2024-08-30 10:31:20 +08:00
ljw
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
ljw
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
ljw
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
ljw
2d76446768 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:07:54 +08:00
ljw
828106a3ea 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:07:40 +08:00
zzs01@yunemao.com
e4b60d8433 feat:应回款倒计时调整,加负号 2024-08-29 18:06:14 +08:00
ljw
aa6a3e0b31 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:03:35 +08:00
ljw
af565627e5 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:02:25 +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
ljw
47f627e91c 订舱产品需求单 作废功能完善 (作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ) 2024-08-29 11:33:11 +08:00
ljw
0205f3f397 订舱产品需求单 作废功能完善 (作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ) 2024-08-29 11:30:12 +08:00
zzs01@yunemao.com
068d66138b Merge branch 'dev-ljw' 2024-08-28 22:13:26 +08:00
ljw
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
ljw
6bdc942369 Merge remote-tracking branch 'orinin/dev-ljw' into dev-ljw 2024-08-28 22:01:01 +08:00
ljw
28069ceb59 l 2024-08-28 22:00:41 +08:00
ljw
e85348a1b5 Merge pull request 'ljw' (#5) from dev-ljw into main
Reviewed-on: #5
2024-08-28 21:13:15 +08:00
ljw
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
ljw
c6f606c769 Merge pull request 'dev-ljw' (#4) from dev-ljw into test
Reviewed-on: #4
2024-08-28 17:42:18 +08:00
ljw
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
ljw
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
zzs01@yunemao.com
e5519f773d 服务维修作废状态更新到整机档案 2024-08-26 14:34:24 +08:00
violet
672713b3c2 first commit 2024-08-26 09:19:12 +08:00