cjy
|
9a8475335d
|
打印模板添加模块代码；订舱货物状态添加接口
|
4 months ago |
jianghaiqing
|
0749628da2
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
471ee2693b
|
修改舱位
|
4 months ago |
zhangxiaofeng
|
62d2570a5a
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
633b14289c
|
任务接收、创建调整为多人
|
4 months ago |
|
jianghaiqing
|
4d6f7e7486
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
8f9c402fd1
|
修改舱位删除
|
4 months ago |
|
cjy
|
4f0d4ecf51
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
137d8e65bd
|
订舱货物状态修改
|
4 months ago |
嵇文龙
|
2935718691
|
更改模板类型
|
4 months ago |
|
嵇文龙
|
8d6fafcf99
|
工作流类型修改为枚举
|
4 months ago |
|
cjy
|
0f5cbcc865
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
4b7bb77f66
|
往来单位联系人添加船信息
|
4 months ago |
|
jianghaiqing
|
db74828eef
|
修改舱位台账
|
4 months ago |
|
jianghaiqing
|
2d94483bcd
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
63709fd321
|
修改舱位标签
|
4 months ago |
|
嵇文龙
|
25e3235de3
|
业务任务交互表增加主键
|
4 months ago |
|
嵇文龙
|
cb86573add
|
工作流状态更改为枚举
|
4 months ago |
|
jianghaiqing
|
4193489bc3
|
修改舱位导入
|
4 months ago |
|
jianghaiqing
|
c7617f9820
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
a7d255f1ee
|
修改舱位台账
|
4 months ago |
|
cjy
|
ded937968e
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
9236fb9b63
|
获取用户邮箱及客户参数接口 ，添加租户名称
|
4 months ago |
|
嵇文龙
|
4f815bdf72
|
任务台创建参数
|
4 months ago |
|
嵇文龙
|
c1bee4dfee
|
发票申请列表增加合计值
|
4 months ago |
|
嵇文龙
|
9a6773f49a
|
发票明细总金额计算
|
4 months ago |
|
jianghaiqing
|
b1bba1d160
|
修改往来单位，增加操作、单证、揽货人、客服名称
|
4 months ago |
|
jianghaiqing
|
4c064cb29d
|
修改舱位
|
4 months ago |
|
jianghaiqing
|
4fcdee1c32
|
修改舱位
|
4 months ago |
|
jianghaiqing
|
ec18011f40
|
修改舱位管理
|
4 months ago |
|
jianghaiqing
|
85c47d348f
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
55a6f707d1
|
修改舱位
|
4 months ago |
|
zhangxiaofeng
|
68ef3830cd
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
4cb8276178
|
两个方法：工作流创建任务、工作流设置任务状态
|
4 months ago |
|
zhangxiaofeng
|
ac190326a6
|
任务编排执行日志调整、判断条件调整
|
4 months ago |
|
cjy
|
e7a8c80470
|
客户对账合计数据
|
4 months ago |
|
cjy
|
7bba5e9683
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
b6ca6a6002
|
统一格式化1900-01-01等异常日期格式，添加订单关系人Id
|
4 months ago |
|
嵇文龙
|
4056524386
|
海运出口任务服务
|
4 months ago |
|
jianghaiqing
|
45e05029c5
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
0d2d96739d
|
修改舱位
|
4 months ago |
|
嵇文龙
|
cc860e4bcb
|
添加开关API对接
|
4 months ago |
|
zhangxiaofeng
|
236c855f23
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
66064b7315
|
任务台执行调整
|
4 months ago |
|
jianghaiqing
|
e271ed539b
|
修改舱位管理
|
4 months ago |
|
jianghaiqing
|
051d2aeff8
|
修改舱位
|
4 months ago |
|
zhangxiaofeng
|
28a4367ed2
|
任务台修改
|
4 months ago |
|
zhangxiaofeng
|
792c95618e
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
2bdba4997b
|
任务台：接收BC后生成舱位配置
|
4 months ago |
|
cjy
|
1451831602
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
4858eb59b5
|
邮箱配置及打印修改
|
4 months ago |
|
jianghaiqing
|
cf4d370ec6
|
修改预订舱
|
4 months ago |
|
jianghaiqing
|
2102bef944
|
修改预订舱台账
|
4 months ago |
|
jianghaiqing
|
25ab279a36
|
修改合约管理
|
4 months ago |
|
jianghaiqing
|
76433e468d
|
修改预订舱
|
4 months ago |
|
jianghaiqing
|
5199dcef5a
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
e55e1164b9
|
修改预订舱
|
4 months ago |
|
zhangxiaofeng
|
881cd618d4
|
迁移大简云通过Header授权的方式
|
4 months ago |
|
cjy
|
13df02a721
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
83b4a34a70
|
打印修改
|
4 months ago |
|
jianghaiqing
|
d196e05aa0
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
509d178467
|
修改MSK API
|
4 months ago |
|
cjy
|
58405de358
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
ee4e65033b
|
打印模板修改 添加模板编码及接口
|
4 months ago |
|
嵇文龙
|
1db768c746
|
生成发票明细的bug修复
|
4 months ago |
|
jianghaiqing
|
15aa5f9e0d
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
ebae4bf0d5
|
修改舱位
|
4 months ago |
|
zhangxiaofeng
|
e00354c41f
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
zhangxiaofeng
|
ddbff347a3
|
任务台相关
|
4 months ago |
|
cjy
|
5a7aa688d6
|
修改
|
4 months ago |
|
cjy
|
9c8301ff75
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
33bf30e116
|
修改订单联系人相关
|
4 months ago |
|
jianghaiqing
|
f6f53fe8d9
|
修改舱位管理
|
4 months ago |
|
jianghaiqing
|
22c00c10a2
|
修改合约管理
|
4 months ago |
|
jianghaiqing
|
9787283bb4
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
1237267572
|
修改缓存
修改合约管理
|
4 months ago |
|
cjy
|
f7067ab0e0
|
海运出口添加字段，状态显示等
|
4 months ago |
|
jianghaiqing
|
d592d8a4c0
|
修改舱位管理
|
4 months ago |
|
jianghaiqing
|
662dd243a8
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
jianghaiqing
|
609fafcd42
|
修改舱位实体类
修改舱位接口
|
4 months ago |
|
cjy
|
6038595444
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
4 months ago |
|
cjy
|
f4b1c858a8
|
打印组件迁移
|
4 months ago |
|
jianghaiqing
|
0f2a8954ce
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
e9a60e3328
|
修改合约号管理增加船公司映射
|
5 months ago |
|
zhangxiaofeng
|
386718dc16
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
zhangxiaofeng
|
14e329def1
|
任务台执行相关
|
5 months ago |
|
jianghaiqing
|
f0aa90412a
|
新增舱位标签的controller
|
5 months ago |
|
jianghaiqing
|
b37caf89df
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
c813233d94
|
修改舱位管理
|
5 months ago |
|
zhangxiaofeng
|
09581e5cc5
|
合并
|
5 months ago |
|
zhangxiaofeng
|
534e50014d
|
任务台相关
|
5 months ago |
|
嵇文龙
|
c0c630bbee
|
明细表删除引用实体基类
|
5 months ago |
|
cjy
|
6e2d1e2b43
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
237927bbf2
|
基类添加记录用户名称
|
5 months ago |
|
jianghaiqing
|
0b07437e20
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
727a626689
|
新增订舱合约号管理
修改马士基API订舱
|
5 months ago |
|
嵇文龙
|
02c3e00a89
|
标准发票提交开票
|
5 months ago |
|
jianghaiqing
|
c1b25073f9
|
修改MSK API查船期
|
5 months ago |
|
jianghaiqing
|
eb5acea9d4
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
a77d0e78e6
|
修改马士基API 检索港口、检索商品
|
5 months ago |
|
cjy
|
105f46ec97
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
7fc5f92c85
|
租户参数设置及相关接口
|
5 months ago |
|
jianghaiqing
|
d15420c182
|
修改MSK API
|
5 months ago |
|
jianghaiqing
|
5f50087d22
|
增加预订舱的选择
|
5 months ago |
|
jianghaiqing
|
65ecbec26b
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
a982561cd5
|
修改舱位管理
|
5 months ago |
|
cjy
|
bfcc2b81b1
|
根据类型获取用户
|
5 months ago |
|
cjy
|
647b09f843
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
6fdb2317a4
|
提单历史引入及相关修改
|
5 months ago |
|
嵇文龙
|
b906766e08
|
获取发票详情
|
5 months ago |
|
嵇文龙
|
5b292efc82
|
标准开票类签入
|
5 months ago |
|
jianghaiqing
|
9083604cb0
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
4168188693
|
修改舱位管理
增加日志提取解析
|
5 months ago |
|
嵇文龙
|
e0fe67fc76
|
自由开票bug修复
|
5 months ago |
|
zhangxiaofeng
|
cf26578add
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
zhangxiaofeng
|
67b0cd9f29
|
任务台
|
5 months ago |
|
cjy
|
21d671f7a9
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
cab17ae534
|
权限修改
|
5 months ago |
|
zhangxiaofeng
|
bf02d31a56
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
zhangxiaofeng
|
787523ae41
|
任务台：任务创建
|
5 months ago |
|
zhangxiaofeng
|
2c3e7c1584
|
任务台：添加逻辑
|
5 months ago |
|
嵇文龙
|
956f843e58
|
应付开票状态
|
5 months ago |
|
嵇文龙
|
c7dd72d375
|
增加业务开票状态
|
5 months ago |
|
cjy
|
b88687712a
|
修改
|
5 months ago |
|
jianghaiqing
|
00642f7f7e
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
d080bdfa51
|
新增舱位管理的接口
|
5 months ago |
|
嵇文龙
|
904568c49c
|
提交发票自由开票
|
5 months ago |
|
嵇文龙
|
487216dfc6
|
提交发票开票
|
5 months ago |
|
嵇文龙
|
a38309c4f6
|
发票开出相关类的签入
|
5 months ago |
|
zhangxiaofeng
|
12e29a4a33
|
任务台：补充实体类
|
5 months ago |
|
jianghaiqing
|
5870172a0b
|
新增舱位标签实体类
|
5 months ago |
|
jianghaiqing
|
f14ee93518
|
新增舱位管理实体类
|
5 months ago |
|
jianghaiqing
|
a8740e1702
|
修改MSK API的台账
|
5 months ago |
|
jianghaiqing
|
9ef643eb1d
|
修改第三方账户，增加字段
|
5 months ago |
|
jianghaiqing
|
9cc6454092
|
修改MSK SPOT 订舱
|
5 months ago |
|
jianghaiqing
|
17fc163841
|
新增马士基API合约订舱controllor
新增马士基API SPOT订舱
|
5 months ago |
|
jianghaiqing
|
881ec4ce3a
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
cc3fb1ba2c
|
修改预订舱
|
5 months ago |
|
cjy
|
6d06c07838
|
业务锁定 费用锁定 及财务api
|
5 months ago |
|
cjy
|
de366049c7
|
自动对账接口修改
|
5 months ago |
|
cjy
|
66bbf80822
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
94908fb98c
|
提单接口修改
|
5 months ago |
|
嵇文龙
|
ca8f7f4043
|
修复OnDeleteDetailAsync未能更新状态的bug
|
5 months ago |
|
cjy
|
b5374547ae
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
e10a267bf2
|
自动对账接口及收发通末班修改
|
5 months ago |
|
嵇文龙
|
53d93b2fc4
|
用于结算的付费申请单
|
5 months ago |
|
嵇文龙
|
32242bc42f
|
合并提交结算单
|
5 months ago |
|
嵇文龙
|
e7193d4273
|
获取付费自由结算及其明细
|
5 months ago |
|
jianghaiqing
|
361c0619be
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
fb4746a351
|
redis模块
|
5 months ago |
|
jianghaiqing
|
48ada64312
|
暂存
|
5 months ago |
|
cjy
|
c91814e258
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
8b7f3bbb9a
|
三级菜单修改1
|
5 months ago |
|
jianghaiqing
|
e462881cf6
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
4404523b6a
|
新增预订舱dto和接口
|
5 months ago |
|
cjy
|
3fd5e0c741
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
50d3ea2348
|
舱单分票信息
|
5 months ago |
|
嵇文龙
|
d12fa3cf67
|
自由结算签入
|
5 months ago |
|
嵇文龙
|
0ec97089be
|
提交结算单bug修复
|
5 months ago |
|
嵇文龙
|
0bba27794f
|
付费结算删除
|
5 months ago |
|
嵇文龙
|
373646d302
|
创建付费申请结算单
|
5 months ago |
|
cjy
|
f8015c2a54
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
0970f4a87e
|
操作权限相关接口
|
5 months ago |
|
jianghaiqing
|
3308bf0bd1
|
修改预订舱的实体类
|
5 months ago |
|
jianghaiqing
|
701feb1a8d
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
jianghaiqing
|
9b6585b518
|
修改预订舱的主表实体类
|
5 months ago |
|
cjy
|
c383eaa0a2
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |
|
cjy
|
1319909520
|
修改
|
5 months ago |
|
jianghaiqing
|
2e55a4d981
|
新增预订舱实体类
|
5 months ago |
ZR20090193-陈敬勇
|
23a32cbfe5
|
海运出口提单管理修改及分单列表；操作权限部分
|
5 months ago |
|
ZR20090193-陈敬勇
|
1136d56462
|
自动对账修改
|
5 months ago |
|
ZR20090193-陈敬勇
|
4dbd89a90e
|
海运出口列表合计统计及状态字段排序筛选
|
5 months ago |
|
ZR20090193-陈敬勇
|
8f327865ee
|
自动对账接口部分
|
5 months ago |
|
嵇文龙
|
95bcd131d3
|
付费结算列表API签入
|
5 months ago |
|
嵇文龙
|
88264e5985
|
结算相关实体模型
|
5 months ago |
|
嵇文龙
|
531bb000c5
|
撤销审批bug修复
|
5 months ago |
|
嵇文龙
|
10fe2d89b0
|
删除时重新计算付费申请总金额统计
|
5 months ago |
|
ZR20090193-陈敬勇
|
6b99cc5b5e
|
更新租户权限菜单接口
|
5 months ago |
|
ZR20090193-陈敬勇
|
104697e40b
|
权限修改 添加英文字段、租户取消授权菜单
|
5 months ago |
|
ZR20090193-陈敬勇
|
4c398bf0be
|
多语言消息提示等
|
5 months ago |
|
嵇文龙
|
c09b29add3
|
付费申请提交增加逻辑判断
|
5 months ago |
|
嵇文龙
|
b884841013
|
增加FailedWithDesc，自动获取定义常量的值和描述
|
5 months ago |
|
嵇文龙
|
c72e62b093
|
消息提示统一修改为多语言消息提示
|
5 months ago |
|
嵇文龙
|
800cb94f8f
|
费用记录，将返回的消息提示修改为多语言支持
|
5 months ago |
|
嵇文龙
|
9878a5f1c8
|
获取发票申请详情增加费用统计
|
5 months ago |
|
嵇文龙
|
6066533715
|
发票申请审核接口
|
5 months ago |
|
嵇文龙
|
70983287ff
|
获取两种币别之间的汇率
|
5 months ago |
|
嵇文龙
|
16a6c6bc91
|
付费申请待审核列表独立出来
|
5 months ago |
|
嵇文龙
|
dd226109d0
|
发票模板生成
|
5 months ago |
|
嵇文龙
|
0b7b4855a5
|
获取发票详情及其明细API
|
5 months ago |
|
嵇文龙
|
0a1faaa02c
|
修改费用记录表部分字段与数据库不同步的问题
|
5 months ago |
|
ZR20090193-陈敬勇
|
b5555298a8
|
修改
|
5 months ago |
|
ZR20090193-陈敬勇
|
74e64a76e7
|
edi接口添加校验
|
5 months ago |
|
ZR20090193-陈敬勇
|
fad21caaae
|
修改字段
|
5 months ago |
|
ZR20090193-陈敬勇
|
1a4a050876
|
海运出口EDI相关接口优化
|
5 months ago |
|
ZR20090193-陈敬勇
|
7472b0eef0
|
修改
|
5 months ago |
|
ZR20090193-陈敬勇
|
e5818eecd2
|
海运出口Edi 相关接口调整
|
5 months ago |
|
ZR20090193-陈敬勇
|
fe89025be7
|
用户字段设置及查询条件设置添加标识序号
|
5 months ago |
|
ZR20090193-陈敬勇
|
8080a29968
|
提箱小票修改
|
5 months ago |
|
ZR20090193-陈敬勇
|
0181e4370b
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
5 months ago |