Commit Graph

45 Commits

Author SHA1 Message Date
ljw
c8bf28a942 外销合同:新增单据报错处理 2024-09-10 17:46:51 +08:00
ljw
f4c1de4baf Merge branch 'dev-ljw' into dev-change 2024-08-30 10:31:31 +08:00
ljw
18d40f65c6 快递报销明细列表打开过滤 2024-08-30 10:31:20 +08:00
ljw
9af58dec3a 外销合同提交时子分录数据汇总到分录 2024-08-30 10:18:52 +08:00
ljw
f4f7a1a668 快递报销明细列表打开过滤 2024-08-29 18:29:17 +08:00
ljw
aa6a3e0b31 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:03:35 +08:00
ljw
af565627e5 外销合同 将子分录的配置英文名称拼接到该字段,拼接格式: 2024-08-29 18:02:25 +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
ljw
c9022a8e35 l 2024-08-29 10:10:20 +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
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
4c8ff75bf1 Merge branch 'dev-zzs' into test 2024-08-28 15:47:36 +08:00
zzs01@yunemao.com
286e959c4f wip:WORD转PDF 2024-08-28 15:47:20 +08:00
9e926dcb20 Merge pull request 'test' (#2) from test into main
Reviewed-on: #2
2024-08-28 10:16:46 +08:00
ljw
fab8a9cd9f l 2024-08-27 20:04:06 +08:00
zzs01@yunemao.com
e861a3c62f Merge remote-tracking branch 'origin/dev-zzs' into test 2024-08-27 14:52:33 +08:00
zzs01@yunemao.com
c3f14bdc9f Merge remote-tracking branch 'origin/dev-zzs' into test 2024-08-27 14:51:05 +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
ljw
8966670dec l 2024-08-27 14:40:40 +08:00
ljw
12c316893e Merge remote-tracking branch 'orinin/test' into dev-ljw 2024-08-27 14:40:23 +08:00
zzs01@yunemao.com
95195bb712 Merge branch 'main' into dev-ljw
# Conflicts:
#	.gitignore
#	cosmic.build.xml
#	cosmic.properties
#	src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java
#	src/main/java/com/yem/wm/task/ServiceRepairTask.java
#	src/main/java/kd/cosmic/Application.java
#	src/main/java/kd/cosmic/server/Launcher.java
2024-08-27 14:32:53 +08:00
zzs01@yunemao.com
c30a97c291 wip 2024-08-27 14:28:28 +08:00
ljw
6c55309096 l 2024-08-27 14:23:51 +08:00
zzs01@yunemao.com
32671a6e5a Merge branch 'dev-zzs' into test 2024-08-27 11:36:54 +08:00
zzs01@yunemao.com
f3e95505a5 价格库查询API 2024-08-27 11:35:45 +08:00
zzs01@yunemao.com
65db6bde58 Merge remote-tracking branch 'origin/test' into test 2024-08-27 10:33:52 +08:00
zzs01@yunemao.com
f0288c563b 查询客户购买过的资源API 2024-08-27 10:33:00 +08:00
4599bb43bd Merge pull request '服务维修作废状态更新到整机档案' (#1) from dev-zzs into test
Reviewed-on: #1
2024-08-26 14:40:45 +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