 wet
|
c61b65426a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
b084e6f178
|
bookingid作为条件获取客户信息
|
2 years ago |
jianghaiqing
|
0ad7643a9a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
5288fbfc89
|
修改调取规则校验功能，增加基础数据的字段为空的判断
|
2 years ago |
|
wet
|
5a0338e52a
|
装船时间
|
2 years ago |
|
wet
|
5296212f07
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
580b22a78e
|
1
|
2 years ago |
 wanghaomei
|
61326ee384
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wanghaomei
|
628fe05694
|
打印模板不显示问题
|
2 years ago |
|
wet
|
f6d526e23a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
fddb9cb48d
|
运踪订阅
|
2 years ago |
|
wet
|
c881f9b90c
|
权限
|
2 years ago |
|
jianghaiqing
|
e213bf8253
|
修改船公司字段，原来字段拼写错误
|
2 years ago |
|
wet
|
0f6fe23268
|
列表
|
2 years ago |
|
wet
|
9783bef16b
|
列表展示
|
2 years ago |
|
wet
|
8057d19b88
|
权限
|
2 years ago |
|
wet
|
7c6339c2e2
|
权限
|
2 years ago |
|
wet
|
504b642ba2
|
关系人保存
|
2 years ago |
|
wet
|
084715fe39
|
关系人
|
2 years ago |
|
wet
|
b03353209c
|
关系人
|
2 years ago |
|
wet
|
65567f9c5d
|
放舱删除
|
2 years ago |
|
wet
|
6f5466a5b5
|
附件名称
|
2 years ago |
|
wet
|
418ae00c8d
|
排序
|
2 years ago |
|
wet
|
b8a79a8b62
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
efb6dd3943
|
排序
|
2 years ago |
|
jianghaiqing
|
578dffc74b
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
f75e4cf892
|
修改订舱发送EDI功能，增加发送时自动写入到附件
修改EDI方法，去掉删除文件方法
|
2 years ago |
|
wet
|
ec47f74320
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
e845bb5697
|
运踪接口对接
|
2 years ago |
|
jianghaiqing
|
386a921c54
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
c982b2c85a
|
新增中转港的国家代码对应
|
2 years ago |
|
wet
|
09ab1939ee
|
调用运踪接口
|
2 years ago |
|
wet
|
2af2e9c8bb
|
接口地址
|
2 years ago |
|
wet
|
91f6fed668
|
接口地址
|
2 years ago |
|
wet
|
0bc72d58c2
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
764ad191db
|
订舱状态
|
2 years ago |
|
wanghaomei
|
c14d5761b5
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
3c82cfc4a5
|
客户信息暂时写死本公司数据
打印模板列表动态接口
|
2 years ago |
|
wet
|
aa0283baf6
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
a9b2685d4e
|
公共接口
|
2 years ago |
|
wanghaomei
|
1eab3e9f16
|
订舱打印记录列表
|
2 years ago |
|
wet
|
b05edcffba
|
webaccountconfig 修改
|
2 years ago |
|
wanghaomei
|
4846349d4a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
78cdd52ab4
|
租户网站账号维护
订舱状态分类
|
2 years ago |
|
jianghaiqing
|
ba22cfae08
|
修改基础数据增加国家的处理
箱型增加分类字段（大小箱）
修改调取规则增加大小箱对应和卸货港的国家对应
|
2 years ago |
|
jianghaiqing
|
4d5a92c7e6
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
30fe2ebcb7
|
修改基础数据接口，增加航线和航线与港口的关系的新增、查询
|
2 years ago |
|
wanghaomei
|
128883d744
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
8916aac796
|
报表报错异常抓取
打印增加docx类型
|
2 years ago |
|
wet
|
3310e13a04
|
提单号搜索
|
2 years ago |
|
jianghaiqing
|
b481f90b24
|
修改订舱规则调取，增加日志记录
|
2 years ago |
|
jianghaiqing
|
d641dd50f5
|
修改批注
|
2 years ago |
|
jianghaiqing
|
5022f58b6f
|
修改EDI增加日志
|
2 years ago |
|
jianghaiqing
|
1b59f22fcf
|
修改EDI方法
|
2 years ago |
|
jianghaiqing
|
e6a65a4fce
|
修改订舱EDI方法
|
2 years ago |
|
jianghaiqing
|
8c371547eb
|
修改订舱EDI增加字段的对应
|
2 years ago |
|
jianghaiqing
|
c8e5caa70d
|
修改PIL发送EDI，去掉收、发、通的特殊字符替换。
修改调取规则方法
|
2 years ago |
|
wanghaomei
|
6ff4b8c8b7
|
去除主单的分单号校验
|
2 years ago |
|
wanghaomei
|
1436f86f9a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
7271d0a9e9
|
打印下载直接预览显示
|
2 years ago |
|
wet
|
cf45380061
|
新增编辑修改
|
2 years ago |
|
wet
|
f672323be3
|
新增接口修改
|
2 years ago |
|
wanghaomei
|
2ed0752527
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
ea9350f84b
|
小票、VGM映射修改
打印模板重复校验
|
2 years ago |
|
wet
|
41a8b96344
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
ec75ed94ad
|
注释
|
2 years ago |
|
jianghaiqing
|
632ff10e33
|
修改取值问题
|
2 years ago |
|
jianghaiqing
|
b99e945c97
|
新增航线基础、航线和港口对应关系基础数据
修改订舱的规则校验，通过卸货港匹配航线信息。
|
2 years ago |
|
wanghaomei
|
a3563c354c
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
162d742c23
|
报表模块
|
2 years ago |
|
wet
|
d567a9859f
|
名称修改
|
2 years ago |
|
wet
|
f6178b7b11
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
06c5bcb561
|
批量vgm
|
2 years ago |
|
wanghaomei
|
9cb6881339
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wanghaomei
|
a3ce4c114f
|
模板文件找不到的问题
|
2 years ago |
|
jianghaiqing
|
08c2eea3be
|
修改订舱EDI扩展更新方法
|
2 years ago |
|
jianghaiqing
|
c100369d08
|
修改EDI扩展信息的更新方法
|
2 years ago |
|
jianghaiqing
|
205d513013
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
4d0e48e3ee
|
修改EDI扩展信息的注释说明
|
2 years ago |
|
wet
|
77881c8d3f
|
定时任务
|
2 years ago |
|
wet
|
e908538d43
|
临时文件下载
|
2 years ago |
|
wet
|
0c5e4adbbb
|
打印文件下载
|
2 years ago |
|
wet
|
83e42e662e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
1866559ed0
|
定时删除临时文件
|
2 years ago |
|
jianghaiqing
|
813ff0e84c
|
修改订舱的保存方法
|
2 years ago |
|
wanghaomei
|
672fe0665a
|
ocr功能
|
2 years ago |
|
wet
|
548d3750e3
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
270745adb7
|
批量编辑
|
2 years ago |
|
wanghaomei
|
c267b4eaa6
|
临时文件配置
|
2 years ago |
|
wet
|
f324d30d0b
|
运踪账号维护提示
|
2 years ago |
|
wet
|
9dd8087e42
|
日志展示字段
|
2 years ago |
|
wanghaomei
|
15cc3f1747
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
5160fd7529
|
订舱实体descrip
|
2 years ago |
|
wet
|
4727b73dc5
|
缓存
|
2 years ago |
|
wet
|
4344a6c6b8
|
场站
|
2 years ago |
|
jianghaiqing
|
9fbad0fcb7
|
修改订舱的保存方法，解决保存是箱下多品名为空和EDI扩展信息为空的情况
|
2 years ago |
|
jianghaiqing
|
e26f75620f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
d3cb1dfe04
|
修改订舱保存方法，增加EDI扩展信息保存。
修改发送EDI，部分信息从EDI扩展获取。
|
2 years ago |
|
wet
|
bafb4e6f3c
|
返回业务id
|
2 years ago |
|
wet
|
56bb38cab8
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
68eafd63d9
|
新增返回业务id
|
2 years ago |
|
wanghaomei
|
c55ac67c3e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
36f33b983f
|
邮箱设置、网站账号权限问题
|
2 years ago |
|
wet
|
c6422515b2
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
0bb0415ba6
|
查询条件修改
|
2 years ago |
|
wanghaomei
|
87d38a7b95
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
e0a5594f04
|
订舱打印
|
2 years ago |
|
jianghaiqing
|
f5a929b210
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
52c76540db
|
修改EDIRemark赋值
|
2 years ago |
|
wet
|
939fede35f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
012983a7a0
|
分单
|
2 years ago |
|
jianghaiqing
|
110d739901
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
c74d9f3e2b
|
修改订舱EDI代码
修改调取规则平台方法
修改配置文件
|
2 years ago |
|
wet
|
096c606831
|
分单
|
2 years ago |
|
wet
|
41ec1921ed
|
主分单验证
|
2 years ago |
|
jianghaiqing
|
ba82e79c6c
|
修改EDI的FTP发送方式，使用公用接口发送FTP报文
|
2 years ago |
|
jianghaiqing
|
3fedb785cd
|
新增FTP Client上传EDI文件
|
2 years ago |
|
wet
|
5fbb48e173
|
分单
|
2 years ago |
|
wet
|
096c6991bc
|
1
|
2 years ago |
|
wet
|
16e2590723
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
91e636be99
|
分单
|
2 years ago |
|
wanghaomei
|
ed6dd5e782
|
场站数据
|
2 years ago |
|
wanghaomei
|
2cb01c4d45
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
9083456d20
|
获取场站数据
|
2 years ago |
|
wet
|
fc72c183cf
|
缓存
|
2 years ago |
|
wet
|
8215685b89
|
系统缓存
|
2 years ago |
|
wet
|
26ada4888f
|
fujian
|
2 years ago |
|
jianghaiqing
|
81464a6c32
|
修改代码参数
|
2 years ago |
|
jianghaiqing
|
e062b4789d
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
e8e96a8cc0
|
修改测试PIL帮助类的方法
|
2 years ago |
|
wanghaomei
|
5955d722f4
|
Oops.Oh会导致插入sys_log_ex，改为Oops.Bah
|
2 years ago |
|
wanghaomei
|
a1e273e1e0
|
订舱状态
|
2 years ago |
|
wanghaomei
|
81ae057b32
|
路由名称
|
2 years ago |
|
wet
|
b094f6ce12
|
租户名称修改
|
2 years ago |
|
wet
|
907abb8363
|
日志返回数据格式
|
2 years ago |
|
wanghaomei
|
f7ee65c3cb
|
重新修改被还原的文件
样单
|
2 years ago |
|
wanghaomei
|
a02cb30a02
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
79392182e5
|
样单
|
2 years ago |
|
wet
|
0c2a5cb181
|
缓存
|
2 years ago |
|
wet
|
e7b1f69176
|
缓存
|
2 years ago |
|
jianghaiqing
|
baa07e43fa
|
修改参数
|
2 years ago |
|
jianghaiqing
|
40428951c0
|
开启规则请求
|
2 years ago |
|
jianghaiqing
|
ead536c4ec
|
修改请求方法参数
|
2 years ago |
|
wanghaomei
|
d8c4d2e6cd
|
下货纸异步
放舱发送
|
2 years ago |
|
wanghaomei
|
2c2a198681
|
放舱发送
|
2 years ago |
|
jianghaiqing
|
76a562f1e8
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
7245fa73aa
|
修改说明
|
2 years ago |
|
wanghaomei
|
1fea7bb844
|
订舱关系人
|
2 years ago |
|
jianghaiqing
|
dd9d9f7ec5
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
9f9b14dbf1
|
修改EDI的Helper
|
2 years ago |