jianghaiqing
|
6b76beacde
|
修改INTTRA
|
3 months ago |
|
jianghaiqing
|
0823f39cfe
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
48d141492a
|
修改INTTRA
|
3 months ago |
zhangxiaofeng
|
01e90ad7cd
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
9c670cb9c3
|
BC对比订单
|
3 months ago |
 dengyu
|
360ecd9189
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
dengyu
|
dfe7724fdc
|
20240815 租箱和月结账单基本完成
|
3 months ago |
cjy
|
96f938a0c9
|
海运出口详情修改、船公司商品下拉返回助记码
|
3 months ago |
|
cjy
|
835b6c3590
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
2713d2da14
|
列表查询按创建时间倒序排序
|
3 months ago |
|
jianghaiqing
|
c01b2755df
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
d5bd6c5f16
|
修改INTTRA
|
3 months ago |
|
cjy
|
5fb85bf3b0
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
e7ca94def2
|
海运出口添加开港时间
|
3 months ago |
嵇文龙
|
f411cf08a8
|
订舱委托模板
|
3 months ago |
|
cjy
|
ad36866165
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
40a16c16b7
|
航线信息修改
|
3 months ago |
|
jianghaiqing
|
2bc8458469
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
cd2659581d
|
修改INTTRA
|
3 months ago |
|
cjy
|
52a355919e
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
bf04bca19b
|
海运出口 场站引入优化
|
3 months ago |
|
嵇文龙
|
c26c2f3d40
|
获取所需业务数据
|
3 months ago |
|
嵇文龙
|
3f8ba4d956
|
根据Id获取海运出口数据
|
3 months ago |
|
嵇文龙
|
1d875e2cea
|
创建服务项目动作
|
3 months ago |
|
cjy
|
1b106c8923
|
初始化业务费用状态修改
|
3 months ago |
|
cjy
|
86df7af2bd
|
往来单位助记码生成、往来单位重复检测
|
3 months ago |
|
cjy
|
7eaec58ace
|
往来单位添加来源明细
|
3 months ago |
|
cjy
|
7fbc5e49a5
|
运综刷新订舱记录
|
3 months ago |
|
zhangxiaofeng
|
8146a54fee
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
27a5440d30
|
设置任务状态接口添加根据配置修改订单业务状态的功能
|
3 months ago |
|
cjy
|
491c50831d
|
商品信息下拉修改
|
3 months ago |
|
cjy
|
37ccc9410f
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
c751aceb51
|
数据权限修改
|
3 months ago |
|
嵇文龙
|
f77bcee54e
|
内容模板建立文件夹
|
3 months ago |
|
cjy
|
1299889e6d
|
海运出口修改
|
3 months ago |
|
cjy
|
8e065174c9
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
74b2a7ad6b
|
海运出口详情修改
|
3 months ago |
|
嵇文龙
|
70833b5831
|
收件人从订单中获取
|
3 months ago |
|
cjy
|
8c064dc331
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
0726f70fe1
|
数据权限部分修改 及 海运出口详情箱报价修改
|
3 months ago |
|
jianghaiqing
|
39d90c4e34
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
464e71eb0a
|
修改预甩任务
|
3 months ago |
|
嵇文龙
|
6a0437461b
|
邮件模板服务支持自定义附件
|
3 months ago |
|
嵇文龙
|
7775448e14
|
移除任务邮件发送配置表的ServerId字段
|
3 months ago |
|
嵇文龙
|
6faf460bb9
|
放舱-入货通知
|
3 months ago |
|
jianghaiqing
|
4a2af33f3d
|
修改任务读文件
|
3 months ago |
|
jianghaiqing
|
cc5cb0df79
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
17fd2a1c9f
|
修改任务查看方法
|
3 months ago |
|
zhangxiaofeng
|
c75c247aba
|
任务执行：记日志报mysql异常的问题
|
3 months ago |
|
zhangxiaofeng
|
67520a58ec
|
任务查询：任务台账个人任务不显示自己创建的任务，只显示自己要处理的任务
|
3 months ago |
|
zhangxiaofeng
|
1ba609f2ea
|
测试接口
|
3 months ago |
|
zhangxiaofeng
|
2310d7db3e
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
d60558ca01
|
优化：根据任务类型+海运出口订单Id查询任务分配的人员列表
|
3 months ago |
|
嵇文龙
|
86f290753f
|
增加模板渲染缓存
|
3 months ago |
|
嵇文龙
|
cc96089e92
|
屏蔽新开发功能
|
3 months ago |
|
zhangxiaofeng
|
47d99da6dc
|
调整：根据当前节点Id，获取工作流下一个任务类型
|
3 months ago |
|
zhangxiaofeng
|
8572214da1
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
a16ff28a3f
|
任务编排配置修改
|
3 months ago |
|
cjy
|
f56bb58a64
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
f6020136d7
|
打印修改及海运出口使用动态编码规则
|
3 months ago |
|
jianghaiqing
|
c68b0b3006
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
a04fa05bb1
|
修改SPOT
|
3 months ago |
|
zhangxiaofeng
|
71042087c0
|
海运出口订单Id查询任务分配的人员列表修改
|
3 months ago |
|
嵇文龙
|
4fba5113f4
|
获取给定任务的下一任务类型
|
3 months ago |
|
嵇文龙
|
c52fec3e9a
|
增加入货通知方法
|
3 months ago |
|
zhangxiaofeng
|
b4b7c3e347
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
571dbcd43f
|
根据当前节点Id，获取工作流下一个任务类型
|
3 months ago |
|
嵇文龙
|
6a8fbfb9fc
|
发送下货纸
|
3 months ago |
|
cjy
|
8a085a0bd6
|
海运出口修改
|
3 months ago |
|
cjy
|
b148462ff1
|
海运出口添加so备注、签单要求
|
3 months ago |
|
cjy
|
adb1ea7adb
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
c03b6e8ea1
|
修改港口查询 添加五字码检索
|
3 months ago |
|
嵇文龙
|
0873fcf968
|
屏蔽新功能
|
3 months ago |
|
嵇文龙
|
93a519cd14
|
优化ConditionHelper
|
3 months ago |
|
嵇文龙
|
45ec4cb909
|
增加任务类型级别的设置
|
3 months ago |
|
zhangxiaofeng
|
2e47b255b7
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
eaa0940d57
|
(多个任务类型)根据任务类型列表+海运出口订单Id查询任务分配的人员列表
|
3 months ago |
|
cjy
|
0ba3af5fac
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
4ee76e5bd3
|
海运出口添加航司航线
|
3 months ago |
|
zhangxiaofeng
|
beb9d72872
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
9323731bca
|
任务分配：添加根据任务类型及业务Id返回分配人员的方法
|
3 months ago |
|
cjy
|
e8733749e3
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
24b2d94ce2
|
修改
|
3 months ago |
|
嵇文龙
|
b62bb3dd07
|
增加交互任务配置表
|
3 months ago |
|
zhangxiaofeng
|
c319352452
|
从任务台抽离出Json条件判断方法为公共方法
|
3 months ago |
|
cjy
|
c8d92ecb74
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
1653cbf72d
|
海运出口修改
|
3 months ago |
|
嵇文龙
|
ceac902f9f
|
加入后天任务运行日志
|
4 months ago |
|
嵇文龙
|
9cb137d29b
|
修改测试方法
|
4 months ago |
|
zhangxiaofeng
|
7db60be931
|
修改表名
|
4 months ago |
|
嵇文龙
|
915e9830d8
|
邮件发送拆分为独立单元
|
4 months ago |
|
嵇文龙
|
d8c604c989
|
前端组织JSON结构错有误，加入临时修复代码，待前端改正后移除
|
4 months ago |
|
嵇文龙
|
46d487f143
|
暂时修复工作流审批bug
|
4 months ago |
|
cjy
|
69b4844268
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
eab06a0f6f
|
数据同步接口修改
|
4 months ago |
|
zhangxiaofeng
|
44fd9b0389
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
cca9623071
|
任务编排调整：优化流程匹配、节点执行判断时的判断方式
|
4 months ago |
|
嵇文龙
|
2f72e70aee
|
修改工作流的最后一步不再更新内容
|
4 months ago |
|
cjy
|
f5b553b0df
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
c532ac8b21
|
船公司信息模块
|
4 months ago |
|
zhangxiaofeng
|
39fb9c327a
|
箱信息查询列表去除机构Id过滤
|
4 months ago |
|
zhangxiaofeng
|
7ed38aa349
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
16eaf6a0c2
|
海运出口详情接口暂时清除机构id过滤
|
4 months ago |
|
jianghaiqing
|
0eefcbfb9d
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
571992c6b7
|
修改任务台
|
4 months ago |
|
zhangxiaofeng
|
779abf9d3e
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
10699aafa4
|
临时去掉任务基础表机构筛选
|
4 months ago |
|
嵇文龙
|
2d5c060e3f
|
用户邮件签名Html代码
|
4 months ago |
|
嵇文龙
|
fdb520f9c4
|
邮件模板完成
|
4 months ago |
|
dengyu
|
8e761723ad
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
dengyu
|
131c6d50d0
|
20240809_2 ddlucky
|
4 months ago |
|
cjy
|
33251e1a3f
|
修改
|
4 months ago |
|
cjy
|
011b1002f6
|
添加邮件签名
|
4 months ago |
|
cjy
|
1f0a8c43e1
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
c5d33fbe7c
|
集装箱报价-服务
|
4 months ago |
|
cjy
|
2b8131cc44
|
二級緩存修改
|
4 months ago |
|
jianghaiqing
|
ccb8b8536f
|
修改任务台
|
4 months ago |
|
jianghaiqing
|
225c7b022b
|
修改任务台
|
4 months ago |
|
jianghaiqing
|
a3de25446c
|
去掉gateway的FEEAPI依赖
|
4 months ago |
|
jianghaiqing
|
4393bb0f2b
|
修改
|
4 months ago |
|
jianghaiqing
|
a9361de1d1
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
d8abaeb188
|
新增2个授权
|
4 months ago |
|
cjy
|
ff5cab40c8
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
b697b00077
|
etd开船日期修改联动会计期间
|
4 months ago |
|
jianghaiqing
|
d28b7998d8
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
96e1d3074a
|
修改运输计划变更任务
|
4 months ago |
|
cjy
|
43a9cf33a0
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
f79fa6bf54
|
修改
|
4 months ago |
|
dengyu
|
4b7072f008
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
dengyu
|
10d337add0
|
20240809
|
4 months ago |
|
cjy
|
c7b444cda6
|
打印修改
|
4 months ago |
|
cjy
|
11cf54a849
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
e667660821
|
二级缓存区分租户
|
4 months ago |
|
嵇文龙
|
b0eaa77c98
|
工作流bug修复
|
4 months ago |
|
cjy
|
8678c8f826
|
海运出口添加合约号及相关修改
|
4 months ago |
|
cjy
|
e7378afbb8
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
bf1ec34f6c
|
包装信息修改
|
4 months ago |
|
嵇文龙
|
bb9138261e
|
工作流bug修复
|
4 months ago |
|
cjy
|
97d455345b
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
3534a66072
|
修改字段
|
4 months ago |
|
jianghaiqing
|
24514f879f
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
038f51b39e
|
修改舱位查询
|
4 months ago |
|
cjy
|
ad29265ac4
|
修改
|
4 months ago |
|
cjy
|
f4c2d70e17
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
d958422332
|
海运出口 添加所属分部名称、舱位类型、出单方式字段
|
4 months ago |
|
jianghaiqing
|
a0f0af1c72
|
修改INTTRA
|
4 months ago |
|
jianghaiqing
|
943a2bed19
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
a0fa232517
|
修改INTTRA
|
4 months ago |
|
cjy
|
5bdc471cad
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
d71e78561f
|
港口信息修改
|
4 months ago |
|
jianghaiqing
|
a972025ce1
|
修改INTTRA
|
4 months ago |
|
jianghaiqing
|
04cb2f9bcc
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
d0e99f875c
|
修改INTTRA
|
4 months ago |
|
cjy
|
ba474124a6
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
39fc81dc28
|
打印模块修改
|
4 months ago |
|
嵇文龙
|
a13e63064e
|
修改动作服务名
|
4 months ago |
|
zhangxiaofeng
|
b57dc1b1bf
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
6cf5514e26
|
任务执行异常记录优化
|
4 months ago |
|
jianghaiqing
|
dd1d5646b5
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
f5f4ad1ec5
|
修改读取配置
|
4 months ago |
|
cjy
|
359f97c652
|
修改商品信息接口
|
4 months ago |
|
cjy
|
d410811ea4
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
36836f1eeb
|
修改
|
4 months ago |
|
jianghaiqing
|
64b34684af
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
27ccd18912
|
修改任务接口
|
4 months ago |
|
cjy
|
f8bfb41671
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
58409d5e3d
|
修改
|
4 months ago |
|
jianghaiqing
|
5f1edc7fdf
|
1
|
4 months ago |
|
jianghaiqing
|
761fa598d7
|
1
|
4 months ago |
|
嵇文龙
|
43e7d8c6ef
|
临时签入
|
4 months ago |
|
jianghaiqing
|
2deab5fac3
|
修改BC自动转发
|
4 months ago |
|
zhangxiaofeng
|
872b7977ab
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
c9ed187f4a
|
任务台相关
|
4 months ago |
|
cjy
|
9d6d9c44de
|
包装、商品、船名 、航次sqlsugar二次缓存；签单方式修改
|
4 months ago |
|
cjy
|
50466cd3d4
|
用户缓存修改
|
4 months ago |
|
cjy
|
e15040b372
|
修改
|
4 months ago |
|
cjy
|
a0e72782c7
|
用户缓存修改
|
4 months ago |
|
cjy
|
5e92cb5c05
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
6e586bd901
|
海运出口添加相关港口代码
|
4 months ago |
|
jianghaiqing
|
96d8cf38b6
|
修改BC任务
|
4 months ago |
|
jianghaiqing
|
e86055b2c3
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
eea07cb5fa
|
修改BC差异提取
|
4 months ago |
|
cjy
|
7a43ada5f8
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
08473b42d0
|
港口信息修改
|
4 months ago |
|
jianghaiqing
|
2284ba47d4
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
7194b133c4
|
增加运输计划变更任务
|
4 months ago |
|
cjy
|
c1e6b3dffc
|
港口 往来单位 修改返回值
|
4 months ago |
|
cjy
|
0b1d629077
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
da71cfe747
|
sqlsugar 二级缓存修改
|
4 months ago |
|
嵇文龙
|
a865c6e3d4
|
解决提交冲突
|
4 months ago |
|
嵇文龙
|
7d981239da
|
获取发票商品编码
|
4 months ago |
|
cjy
|
d6e28e539d
|
打印api修改
|
4 months ago |
|
cjy
|
f648a9e29d
|
海运出口等异常日志修改
|
4 months ago |
|
cjy
|
002ac7c5ac
|
修改
|
4 months ago |
|
cjy
|
aff7a8ed02
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
24da640c19
|
港口、往来单位查询优化、添加sqlsugar二级缓存
|
4 months ago |
|
jianghaiqing
|
e5a12fd980
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
c81123d5e6
|
修改INTTRA
|
4 months ago |
|
嵇文龙
|
28a6109c0b
|
工作流修复分支判断bug
|
4 months ago |
|
嵇文龙
|
9b568f45c1
|
增加对退舱任务的审核支持
|
4 months ago |