Commit Graph

2525 Commits (f27520d890b22535ee18e52d3b85296d7823183f)

Author SHA1 Message Date
zhangxiaofeng bb06fe2bd1 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 8635a74fce 运踪更新船期调整 8 months ago
jianghaiqing 63c94c7fa2 修改BC变更任务邮件自动转发功能,增加租户配置 8 months ago
jianghaiqing 4a2f6d8537 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 48f00ebb05 修改新增INTTRA订舱(MSK) 8 months ago
zhangxiaofeng 6f89e3d87a 接收BC信息推送 8 months ago
zhangxiaofeng daa712aa4b 通过运踪更新船舶动态:ATA ETA 8 months ago
zhangxiaofeng 2726dedce6 通过运踪更新船舶动态:ATD ETD MDGETA MDGATA 8 months ago
zhangxiaofeng fd06f0ff77 BC同步逻辑修改 8 months ago
zhangxiaofeng 61a054ec77 马士基API发送VGM 8 months ago
zhangxiaofeng 1a1ddf6591 ReceiveBcInfo时保存文件信息 8 months ago
zhangxiaofeng 85ff81d315 运营端保存订舱台账时同步类型调整 8 months ago
zhangxiaofeng 6046251b0d Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng f356544f9a 运营端保存订舱台账时,向客户端推送的类型改为文件,同时客户端向东胜推送的类型改为文件 8 months ago
jianghaiqing cfb3add07d Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing dcb307705b 修改马士基API订舱 8 months ago
wanghaomei ed5033daa7 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
wanghaomei e8615ce4d1 国家区号 8 months ago
jianghaiqing ed908f11d7 修改任务邮件转发 8 months ago
jianghaiqing c40abd3636 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 032a6f75f6 1、修改BC变更任务
2、增加INTTRA的订舱、截单功能
8 months ago
wanghaomei 881dd6a4d2 分类 8 months ago
zhangxiaofeng bc9d60fe5c Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 9bc3d36069 SendBookingOrder入参添加附件列表 8 months ago
wanghaomei 573b91339c 订舱模板 8 months ago
zhangxiaofeng ef53153c80 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 3fad45578a 接收BC信息更新订舱Dto 8 months ago
wanghaomei 5a1a84687a 客户订舱接口 8 months ago
zhangxiaofeng 48a49fdb03 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 5435d32abb 舱单校验调整:解决没分单情况下误提示的bug 8 months ago
jianghaiqing 51b00f2201 修改任务发送邮件 8 months ago
jianghaiqing d50620c991 修改BC发送邮件 8 months ago
jianghaiqing 5c4170b287 修改任务台BC变更结果查询 8 months ago
jianghaiqing ba76663011 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 91e932dc73 修改任务台 8 months ago
zhangxiaofeng bb5ac81940 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng f12a542fca 马士基正本下载接口 8 months ago
wanghaomei 241a55f6e6 自动订舱模板 8 months ago
zhangxiaofeng e96ecc7871 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 834e5bfbdc 单票正本下载 8 months ago
jianghaiqing f15e692a2d 修改舱位管理 8 months ago
jianghaiqing 530ed5f2b7 修改舱位 8 months ago
jianghaiqing 0280c9e571 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 9e3799824a 修改舱位 8 months ago
zhangxiaofeng 2f97e87782 舱单校验调整 8 months ago
zhangxiaofeng f9dd126739 接收船期后查询订舱进行更新时,查询条件中的航次去掉1NC、1MA 8 months ago
zhangxiaofeng 6500fcbd50 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 8d8ef8c979 舱单发送校验调整 8 months ago
jianghaiqing ec1251e4d3 修改任务台站DRAFT邮件功能 8 months ago
jianghaiqing aed2650ccb 修改任务台 8 months ago
jianghaiqing 28df50070f Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 79468fd1fb 修改任务台 8 months ago
zhangxiaofeng c13262ac45 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 9f0be5494d 电放提交接口调整 8 months ago
jianghaiqing 8750382281 修改预甩任务 8 months ago
jianghaiqing d5b93a3dff 修改预甩任务 8 months ago
zhangxiaofeng ce833c625a 添加舱位取消配套逻辑 8 months ago
jianghaiqing fe9ad59461 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing f5b0c36ae9 修改增加舱位的cancellation字段判断 8 months ago
zhangxiaofeng a07ca05352 马士基电放提交接口调整 8 months ago
zhangxiaofeng ac9f48d10b Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 1ac8f208b0 马士基电放提交接口 8 months ago
jianghaiqing df662c45c8 修改截单回执任务 8 months ago
jianghaiqing 334809922a 修改马士基订舱台账 8 months ago
jianghaiqing bf41b71ee8 修改DRAFT任务 8 months ago
jianghaiqing bf90e142f2 修改任务台 8 months ago
jianghaiqing 47a44f6583 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing fa9cbd561d 修改马士基API订舱的台账数据权限 8 months ago
wanghaomei e2ea429cb4 客户订舱账密 8 months ago
wanghaomei 7611609ccd Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
wanghaomei bc12a3edea 客户订舱账密 8 months ago
jianghaiqing bea8eb0c76 修改台账 8 months ago
jianghaiqing 9542b850ba 修改马士基API台账增加数据权限 8 months ago
jianghaiqing f3afaef012 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing d3d5250329 修改马士基API台账查询 8 months ago
zhangxiaofeng ae8f07e8c9 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 03c11a61ed 舱单发送校验调整 8 months ago
jianghaiqing d0c945ce83 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 82019b6327 修改马士基API的保存问题 8 months ago
zhangxiaofeng e1b5b592fe Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 8b5cde7015 舱单发送校验调整 8 months ago
jianghaiqing e2878eb358 修改马士基API订舱增加必填判断 8 months ago
jianghaiqing 1f1b8a30c4 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 814dc35a0c 修改马士基API订舱,取消使用船期表的起始地和目的地的港口代码,改用检索值 8 months ago
wanghaomei 35a584cc7f Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
wanghaomei 578e007985 箱量0 8 months ago
zhangxiaofeng 8fbd4ee5b0 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng cddf600473 舱单发送校验调整 8 months ago
jianghaiqing f0909100fc 修改任务台 8 months ago
jianghaiqing bbc49d5389 马士基API订舱 8 months ago
jianghaiqing 637276fea9 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 47c9f860d6 修改马士基订舱 8 months ago
zhangxiaofeng 66d9f8b323 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 8cbfd56851 舱单发送校验调整 8 months ago
jianghaiqing b050481ed3 修改马士基订舱判断船期ID问题 8 months ago
jianghaiqing 6ca696995a Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 4040d2d715 修改马士基API订舱 8 months ago
zhangxiaofeng cbbd30440f Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
zhangxiaofeng 4ce30bf9f5 舱单发送校验 8 months ago
jianghaiqing 0bfb35c562 修改马士基API订舱 8 months ago
jianghaiqing 6d412f5e4c 修改任务台 8 months ago
jianghaiqing 73514485e9 修改任务台账 8 months ago
jianghaiqing 3bc4a78757 修改任务台 8 months ago
jianghaiqing 329bff261b 新增任务 目的港未提货、未返空、任务格式单、任务SI回执 8 months ago
jianghaiqing ec774572ed 修改任务台账,增加实际操作人处理 8 months ago
zhangxiaofeng c64477652b 台账保存时,SaveLog只记录明确修改的字段 8 months ago
jianghaiqing 0e98683a07 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 493bfb9cb4 修改手动运踪推送服务状态 8 months ago
zhangxiaofeng 42fae8dbc7 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing d977f2589c 修改手动刷新运踪,增加已返场货物状态推送 8 months ago
jianghaiqing 446fb86442 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 9d122f053d 修改任务台 8 months ago
zhangxiaofeng fd96bfcd31 SendBookingOrder时,完善日志记录 8 months ago
zhangxiaofeng 79c8fb0106 手动推送BC相关字段 8 months ago
zhangxiaofeng 71ef30da6c 补充 8 months ago
zhangxiaofeng 2f9da19c65 客户订舱接收东胜推送添加验证;api接口授权添加日志 8 months ago
zhangxiaofeng 9c65a4eeb4 BC相关字段客户订舱同步调整 8 months ago
zhangxiaofeng 43ade29cd5 1. 接收东胜推送的订舱需求的接口添加KGS、REMARK, 2.添加接口“接收BC信息更新订舱” 3.SendBookingORder添加同步类型:“BC” 8 months ago
jianghaiqing 3fb5c28f5c 修改BC任务 8 months ago
jianghaiqing 32cf8aaf90 修改马士基API订舱 8 months ago
jianghaiqing 902b96fa63 修改马士基API订舱 8 months ago
jianghaiqing 82919efe6d 修改任务截止时间变更 8 months ago
jianghaiqing 5e60661478 修改服务项目保存 8 months ago
jianghaiqing 321e5f71df 新增中远订舱POST 8 months ago
jianghaiqing f2f229ab6a Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 8 months ago
jianghaiqing 35667637de 修改邮件配置 8 months ago
wanghaomei 6b58a5461a 状态 8 months ago
wanghaomei eba1cba36f 状态提示 8 months ago
zhangxiaofeng 273beb928a Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
zhangxiaofeng e18f6fcafd 接收外部订舱需求后自动推送运营端时箱信息为空问题 9 months ago
jianghaiqing 2a8d71478d 修改马士基API订舱 9 months ago
jianghaiqing 96bfec130b 修改马士基API订舱 9 months ago
jianghaiqing c81b5392f3 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing 63f8ffcc97 修改马士基API 9 months ago
zhangxiaofeng 2281c59256 合并 9 months ago
zhangxiaofeng f2742abfd5 接收订舱审核需求后逻辑调整 9 months ago
wanghaomei 21414bd6a1 放舱附件改名 9 months ago
wanghaomei 65f1072627 客户订舱接口 9 months ago
jianghaiqing 3a4a9ce6a1 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing c549c63288 修改马士基API订舱 9 months ago
jianghaiqing 5d8d093d42 修改马士基API订舱 9 months ago
wanghaomei cf8a7f9af1 订舱提交接口 9 months ago
jianghaiqing 960ccb89e1 修改马士基API订舱 9 months ago
jianghaiqing 0e1259b01d 修改BC通知模板 9 months ago
jianghaiqing 2d68f83284 修改马士基API订舱 9 months ago
jianghaiqing c652956b75 修改马士基API订舱
修改BC转发模板
9 months ago
jianghaiqing e2c1f90717 修改台账排序 9 months ago
jianghaiqing 7646f0a54d 修改马士基API订舱,增加必填项校验 9 months ago
jianghaiqing 0c621c4599 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing ce374ce57d 修改马士基API订舱 9 months ago
wanghaomei bfd78ff389 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
wanghaomei 73b4ab4f9d 校验 9 months ago
zhangxiaofeng a7102aa065 客户端接收订舱审核需求后推送东胜 9 months ago
jianghaiqing 8409ab2194 修改VGM任务 9 months ago
jianghaiqing 1974c70c9f 修改VGM回执 9 months ago
jianghaiqing fa1a6075a6 修改马士基订舱台账 9 months ago
jianghaiqing 118cab438c Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing c62c84aee3 修改任务台 9 months ago
zhangxiaofeng eb35998d5f 不同运行模式相关逻辑修改2 9 months ago
zhangxiaofeng 6257808fab Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
zhangxiaofeng d9f37cd1af 不同运行模式相关逻辑修改 9 months ago
jianghaiqing 9316b71be2 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing 45c5be764b 1、修改BC任务发送邮件功能
2、修改VGM任务功能
9 months ago
zhangxiaofeng 6a19f00873 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
zhangxiaofeng 4fd4192733 舱位库存统计逻辑添加两项统计维度:收货地、交货地,并在查询接口体现 9 months ago
jianghaiqing 638903ed05 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing 812b40c3e8 修改马士基API订舱 9 months ago
wanghaomei 644eebcbe2 扣费 9 months ago
jianghaiqing 8788b01031 修改马士基API订舱
修改手工刷新运踪,自动推送服务状态
9 months ago
jianghaiqing bfd9d2a1fa 修改马士基API订舱 9 months ago
jianghaiqing 00bf610b69 修改马士基API订舱改为新Service 9 months ago
wanghaomei bc273fe180 fee 9 months ago
wanghaomei fc871b0988 补扣接口 9 months ago
jianghaiqing d2834ce700 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing c0aa0136dd 修改服务状态推送 9 months ago
wanghaomei ec507dda14 补扣 9 months ago
wanghaomei 986bf3b619 扣费 9 months ago
zhangxiaofeng 70de766e46 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
zhangxiaofeng 216c337fcb 1.调整配置文件RunType属性;2.和川新建用户时,进行一些初始化操作 9 months ago
jianghaiqing 8507b3a5ff 修改BC任务的邮件转发功能 9 months ago
jianghaiqing f413b04a51 修改马士基API订舱 9 months ago
jianghaiqing d43d082ee3 新增马士基API订舱记录保存表 9 months ago
jianghaiqing bb8f85cd38 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing c0bf94e65b 1、修改马士基API发送订舱请求。
2、修改合约号管理,增加合约方公司全称、合约方公司代码、合约方联系人、合约方联系邮件、是否为本公司合约价格 true-是,false-否
9 months ago
wanghaomei 76e9370fc1 扣费 9 months ago
jianghaiqing ab3ae370ed Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing 08bacf9d47 修改马士基API订舱查询船期 9 months ago
wanghaomei a696fc2aaa Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
wanghaomei 3d1c0d242a 扣费 9 months ago
jianghaiqing 1c74fd6f5a 修改马士基API查询船期 9 months ago
jianghaiqing 573dbf5243 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing 4731781f01 修改马士基API查询船期功能 9 months ago
wanghaomei e5d8f888ca 扣费 9 months ago
wanghaomei 28cc3249cb Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing 26d02975a4 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing 8ccb5a2e89 新增马士基API查询港口接口 9 months ago
wanghaomei 27b661327b Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
zhangxiaofeng d2d3d64f91 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
zhangxiaofeng 73caaa7184 运营端订舱需求审核后通过mq推送东胜 9 months ago
wanghaomei 90e86c5fee Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago