Commit Graph

765 Commits (1ff9bad2dab9b0a2aba72b11e28eb5033f0ce353)

Author SHA1 Message Date
wet ec47f74320 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet e845bb5697 运踪接口对接
jianghaiqing 386a921c54 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing c982b2c85a 新增中转港的国家代码对应
wet 09ab1939ee 调用运踪接口
wet 2af2e9c8bb 接口地址
wet 91f6fed668 接口地址
wet 0bc72d58c2 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 764ad191db 订舱状态
wanghaomei c14d5761b5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 3c82cfc4a5 客户信息暂时写死本公司数据
打印模板列表动态接口
wet aa0283baf6 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
wet a9b2685d4e 公共接口
wanghaomei 1eab3e9f16 订舱打印记录列表
wet b05edcffba webaccountconfig 修改
jianghaiqing ba22cfae08 修改基础数据增加国家的处理
箱型增加分类字段(大小箱)
修改调取规则增加大小箱对应和卸货港的国家对应
jianghaiqing 4d5a92c7e6 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 30fe2ebcb7 修改基础数据接口,增加航线和航线与港口的关系的新增、查询
wanghaomei 128883d744 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 8916aac796 报表报错异常抓取
打印增加docx类型
wet 3310e13a04 提单号搜索
jianghaiqing b481f90b24 修改订舱规则调取,增加日志记录
jianghaiqing d641dd50f5 修改批注
jianghaiqing 5022f58b6f 修改EDI增加日志
jianghaiqing 1b59f22fcf 修改EDI方法
jianghaiqing e6a65a4fce 修改订舱EDI方法
jianghaiqing 8c371547eb 修改订舱EDI增加字段的对应
jianghaiqing c8e5caa70d 修改PIL发送EDI,去掉收、发、通的特殊字符替换。
修改调取规则方法
wanghaomei 6ff4b8c8b7 去除主单的分单号校验
wanghaomei 1436f86f9a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 7271d0a9e9 打印下载直接预览显示
wet cf45380061 新增编辑修改
wet f672323be3 新增接口修改
wanghaomei 2ed0752527 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei ea9350f84b 小票、VGM映射修改
打印模板重复校验
wet 41a8b96344 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet ec75ed94ad 注释
jianghaiqing 632ff10e33 修改取值问题
jianghaiqing b99e945c97 新增航线基础、航线和港口对应关系基础数据
修改订舱的规则校验,通过卸货港匹配航线信息。
wanghaomei a3563c354c Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 162d742c23 报表模块
wet d567a9859f 名称修改
wet f6178b7b11 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 06c5bcb561 批量vgm
wanghaomei 9cb6881339 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
wanghaomei a3ce4c114f 模板文件找不到的问题
jianghaiqing 08c2eea3be 修改订舱EDI扩展更新方法
jianghaiqing c100369d08 修改EDI扩展信息的更新方法
jianghaiqing 205d513013 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 4d0e48e3ee 修改EDI扩展信息的注释说明
wet 77881c8d3f 定时任务
wet e908538d43 临时文件下载
wet 0c5e4adbbb 打印文件下载
wet 83e42e662e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 1866559ed0 定时删除临时文件
jianghaiqing 813ff0e84c 修改订舱的保存方法
wanghaomei 672fe0665a ocr功能
wet 548d3750e3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 270745adb7 批量编辑
wanghaomei c267b4eaa6 临时文件配置
wet f324d30d0b 运踪账号维护提示
wet 9dd8087e42 日志展示字段
wet 4727b73dc5 缓存
wet 4344a6c6b8 场站
jianghaiqing 9fbad0fcb7 修改订舱的保存方法,解决保存是箱下多品名为空和EDI扩展信息为空的情况
jianghaiqing e26f75620f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing d3cb1dfe04 修改订舱保存方法,增加EDI扩展信息保存。
修改发送EDI,部分信息从EDI扩展获取。
wet bafb4e6f3c 返回业务id
wet 56bb38cab8 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 68eafd63d9 新增返回业务id
wanghaomei c55ac67c3e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 36f33b983f 邮箱设置、网站账号权限问题
wet c6422515b2 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 0bb0415ba6 查询条件修改
wanghaomei 87d38a7b95 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei e0a5594f04 订舱打印
jianghaiqing f5a929b210 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 52c76540db 修改EDIRemark赋值
wet 939fede35f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 012983a7a0 分单
jianghaiqing 110d739901 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing c74d9f3e2b 修改订舱EDI代码
修改调取规则平台方法
修改配置文件
wet 096c606831 分单
wet 41ec1921ed 主分单验证
jianghaiqing ba82e79c6c 修改EDI的FTP发送方式,使用公用接口发送FTP报文
jianghaiqing 3fedb785cd 新增FTP Client上传EDI文件
wet 5fbb48e173 分单
wet 096c6991bc 1
wet 16e2590723 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
wet 91e636be99 分单
wanghaomei 2cb01c4d45 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 9083456d20 获取场站数据
wet fc72c183cf 缓存
wet 8215685b89 系统缓存
wet 26ada4888f fujian
jianghaiqing 81464a6c32 修改代码参数
jianghaiqing e062b4789d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing e8e96a8cc0 修改测试PIL帮助类的方法
wanghaomei 5955d722f4 Oops.Oh会导致插入sys_log_ex,改为Oops.Bah
wanghaomei a1e273e1e0 订舱状态
wanghaomei 81ae057b32 路由名称
wet b094f6ce12 租户名称修改
wet 907abb8363 日志返回数据格式
wanghaomei f7ee65c3cb 重新修改被还原的文件
样单
wanghaomei a02cb30a02 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 79392182e5 样单
wet 0c2a5cb181 缓存
wet e7b1f69176 缓存
jianghaiqing baa07e43fa 修改参数
jianghaiqing 40428951c0 开启规则请求
jianghaiqing ead536c4ec 修改请求方法参数
wanghaomei d8c4d2e6cd 下货纸异步
放舱发送
wanghaomei 2c2a198681 放舱发送
jianghaiqing 76a562f1e8 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 7245fa73aa 修改说明
wanghaomei 1fea7bb844 订舱关系人
jianghaiqing dd9d9f7ec5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 9f9b14dbf1 修改EDI的Helper
wanghaomei 40f2930eb9 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 21f56c88b9 发送下货纸
jianghaiqing 1c1120a729 修改命名空间
jianghaiqing e11a01c388 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing d50d6c4187 1、新增订舱、截单EDI对应的model
2、修改订舱、截单EDI增加PIL生成报文功能。
wanghaomei 0f592296c8 改列报错
wanghaomei 644cc6ef2a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei c5d87080c4 VGM直发
wet 158f7bb8fd Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
wet b5d29e8547 字段名称更改
wanghaomei 17885cd453 VGM直发
wanghaomei 812dd574b0 直发VGM
jianghaiqing 3884cdec3d 新增订舱和截单EDI方法
jianghaiqing 817687e05d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing a7f0fefdf7 新增订舱和截单EDI方法
wet ca94d57c1f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 5bb65e3489 租户参数
wanghaomei e5f5e7211e link
wanghaomei 5072ae1cb9 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei f3b87316c2 订舱关系人
vgm、vgm&si链接
wet 2560729dd8 查询条件
wanghaomei 320e58e34b Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 7df5128c35 放舱链接
jianghaiqing 2d17d6289a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing afb3837795 增加请求规则引擎的集装箱和货物明细
wanghaomei af7ad0a5e3 region
wanghaomei 996c979382 提箱小票
wanghaomei 323dcfd7cf 小票
wanghaomei 3646699481 提箱小票
wanghaomei 83540877bd ErrorCode
wanghaomei d152e4e551 小票
wanghaomei 3ca6171f7d 提箱小票
wet e1b879af2e 枚举提示修改
wanghaomei 681099c7ad Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei d450d80a0b 下货纸
钉钉客服消息模块
wet d8cb5d6970 字段修改
wet 544c32a97f 公共类
wet 33b26cd540 公共类缓存
wanghaomei 81fb3d49af 下货纸、链接、样单
wet 88e362dbb2 注释
wanghaomei 695e351520 冲突合并
wanghaomei b8e62b295a 订舱打印模板
打印模板测试
wet 8e77f46364 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet ca6ac450ca 货运动态
jianghaiqing b2d10e8682 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing fe2ba94818 修改订单调取规则引擎,增加海运订舱的实体类对应mapper
wanghaomei 7d853e8496 打印模板修改
wanghaomei b233c6cefa EDI
wet 827bba193e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet f5419bb354 缓存
wanghaomei 5d20d63359 下货纸
邮件发送
jianghaiqing b7266ffd98 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing bd2f3a5a8e 修改调取规则引擎方法
wanghaomei af71d511bb Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
wanghaomei dd591ab790 下货纸
wet 1e5eddd6a5 缓存
wet 300124d65a 字典缓存
wanghaomei 8dc390cb8a 公共库缓存
下货纸
wet 0fc07ebb40 货运动态
wet 316fa2cf35 附件类型
wet f54ad444d6 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet af50e045e8 新增字段
jianghaiqing ae36d4d6bd Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 57e186f645 1、新增海运订舱调取规则平台方法和报文。
2、增加配置选项。
wet f0bf955242 修改实体
wet 79062cef2e 修改实体名称
wet f7795b6587 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet f3040ae405 订舱
wanghaomei 987e0933bb Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 97bca53938 文件保存相关修改
wet e16d147416 日志
wet eae3206966 订舱明细空值判断
wet 057fad08c7 修改命名
wet 58baa19c9c 租户参数
wet 1ab8eb257e 附件 备注
wet 2c670eefaf 订舱备注
wet 1235493b42 日志
wet 734da08aa8 获取日志
wet 67766cd1e1 日志
wet 3f283ba9b6 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet b2a7be38de 权限
wanghaomei 4a125ee783 打印模板维护
wet 695bc01b52 订舱
wet b329c27472 订舱
wanghaomei 4466296ba3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 80972e5ded 订舱模板维护
wet 1ba883dc15 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 0db8814a96 订舱
wanghaomei 057bc9f326 用户自定义设置
wanghaomei 3a5a480f75 订舱客户
wanghaomei 2be8cfb8b3 订舱客户
订舱自定义配置
wanghaomei e90b2e2bca apiuser
action事务
wanghaomei 2f9a1add26 用户密码改为DES加密
wanghaomei 8d55d73727 箱信息、多品名
wanghaomei b0d978be08 订舱主表
wanghaomei 5c363a58c1 修改命名空间
wanghaomei fbcc5d6367 初始提交