Commit Graph

1234 Commits (e12f01ca9933a7262ca9a1934074bf19aecdbe5b)

Author SHA1 Message Date
zhangxiaofeng 79c8fb0106 手动推送BC相关字段 9 months ago
zhangxiaofeng 9c65a4eeb4 BC相关字段客户订舱同步调整 9 months ago
zhangxiaofeng 43ade29cd5 1. 接收东胜推送的订舱需求的接口添加KGS、REMARK, 2.添加接口“接收BC信息更新订舱” 3.SendBookingORder添加同步类型:“BC” 9 months ago
jianghaiqing 3fb5c28f5c 修改BC任务 9 months ago
jianghaiqing 32cf8aaf90 修改马士基API订舱 9 months ago
jianghaiqing 902b96fa63 修改马士基API订舱 9 months ago
jianghaiqing 321e5f71df 新增中远订舱POST 9 months ago
jianghaiqing 35667637de 修改邮件配置 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
wanghaomei 21414bd6a1 放舱附件改名 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 7646f0a54d 修改马士基API订舱,增加必填项校验 9 months ago
jianghaiqing ce374ce57d 修改马士基API订舱 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 d9f37cd1af 不同运行模式相关逻辑修改 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 812b40c3e8 修改马士基API订舱 9 months ago
jianghaiqing 8788b01031 修改马士基API订舱
修改手工刷新运踪,自动推送服务状态
9 months ago
jianghaiqing bfd9d2a1fa 修改马士基API订舱 9 months ago
jianghaiqing 00bf610b69 修改马士基API订舱改为新Service 9 months ago
wanghaomei fc871b0988 补扣接口 9 months ago
wanghaomei ec507dda14 补扣 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 08bacf9d47 修改马士基API订舱查询船期 9 months ago
jianghaiqing 1c74fd6f5a 修改马士基API查询船期 9 months ago
jianghaiqing 4731781f01 修改马士基API查询船期功能 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
zhangxiaofeng d2d3d64f91 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
zhangxiaofeng 73caaa7184 运营端订舱需求审核后通过mq推送东胜 9 months ago
jianghaiqing 08134abfc7 修改马士基订舱API 9 months ago
jianghaiqing d65787fa22 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 9 months ago
jianghaiqing cc7b360d48 修改马士基API订舱 9 months ago
zhangxiaofeng c23f598da1 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 10 months ago
zhangxiaofeng d203b50a6d 客户订舱:BookingOrder/ChangeServiceItem接口bug修复 10 months ago
jianghaiqing 5a1392ee45 修改马士基订舱参数 10 months ago
jianghaiqing 85fbfca7fa 修改,新增马士基API查询商品方法 10 months ago
jianghaiqing e4fccb108c 新增马士基API订舱方法 10 months ago
jianghaiqing 17cd81a7ff Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 10 months ago
jianghaiqing 768dd76cdf 新增马士基API订舱功能 10 months ago
zhangxiaofeng af14f9260b 客户订舱代码迁移 10 months ago
zhangxiaofeng 01901fe5a8 Merge branch 'customer' 10 months ago
zhangxiaofeng e52a87fb79 迁移客户订舱BookingCustomerOrderService相关代码 10 months ago
zhangxiaofeng 3de25b72b8 合并 10 months ago
zhangxiaofeng f4d611beb9 订舱日志模块命名调整 10 months ago
jianghaiqing 36fdf9b55b 修改日志提示缩减字符量 10 months ago
jianghaiqing 68f3aa6334 修改舱位分配回写提单号推送日志说明 10 months ago
zhangxiaofeng 21e4d06ae9 订舱保存时报主键重复bug修复 10 months ago
zhangxiaofeng 1042d09107 修改订舱台账前,验证箱信息的件尺重、封号是否会被覆盖逻辑调整 10 months ago
zhangxiaofeng 0e491b8018 修改订舱台账前,验证箱信息的件尺重、封号是否会被覆盖逻辑调整 10 months ago
zhangxiaofeng afbd8a6258 CheckCtnCover接口调整 10 months ago
zhangxiaofeng 3ae6adeee4 添加接口:1.修改订舱台账前,验证箱信息的件尺重、封号是否会被覆盖 2. 订舱箱信息查询接口 10 months ago
zhangxiaofeng c78d1a9834 /BookingOrder/GetAllData接口响应添加FromFunc字段 10 months ago
zhangxiaofeng 29d7cf2dba 添加订舱修改的日志:单票舱位分配查询、单票BC更新订舱信息、接收换船后更新订舱、执行下货纸比对、下货纸自动比对回写状态 10 months ago
zhangxiaofeng 3da4d35738 日志记录调整:货物状态相关 10 months ago
zhangxiaofeng e1ffcfda93 日志记录调整 10 months ago
zhangxiaofeng cb852bf353 添加订舱修改的日志:派车任务回写、手动更新船期后批量更新订舱、刷新运踪、执行邮件Draft比对、执行邮件Draft比对(含有附件)、手动设置订舱货物状态 10 months ago
zhangxiaofeng e79fd6f21e 仅格式化,无其它修改 10 months ago
zhangxiaofeng 6fdcee2c8a BookingOrderService添加日志:设置货物状态、取消设置货物状态 10 months ago
zhangxiaofeng 59522b37dd BookingOrderService添加日志:删除订舱、恢复删除订舱、批量编辑船代、批量编辑订舱、更新货物状态 10 months ago
hao bec9ec3cb6 日志 10 months ago
zhangxiaofeng 33910e3dd0 直发VGM的方式添加船司、场站映射功能 11 months ago
zhangxiaofeng 248057f55f 运踪订阅:保存订舱时,取消自动订阅目的港运踪 11 months ago
zhangxiaofeng b5486ceb3b 舱位引入功能调整 11 months ago
jianghaiqing c1f09f7d04 修改舱位增加附件查询
修改BC任务
11 months ago
zhangxiaofeng 8ed83a9869 添加IBookingSlotService 11 months ago
zhangxiaofeng 8ee92c5fc9 bugfix:新建订舱以及修改订舱时无法正确引入POL ETA、POL ATD、POL ETD的问题 11 months ago
zhangxiaofeng 036a400778 舱位引入、取消引入 11 months ago
hao 45ab5f6d3c 舱位 11 months ago
jianghaiqing 915591c9c0 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
jianghaiqing 6f54a9a852 修改订舱台账,无台账记录时检索查询报错 12 months ago
whm 4d511225ef TenantId 12 months ago
whm 3aa122263e list 12 months ago
wanghaomei 32ad3ca87d 运踪 1 year ago
wanghaomei d96152b75b 亿通账号对应 1 year ago
wanghaomei c1b9b2a316 CNTRTOTAL 1 year ago
wanghaomei 7f5893c8db 小票船司映射 1 year ago
wanghaomei 03052050f2 运踪 1 year ago
wanghaomei 1ed4758632 billtrace 1 year ago
wanghaomei fa6e8e00f4 运踪 1 year ago
wanghaomei da53139915 bug 1 year ago
wanghaomei d4c2e5265a 运踪 1 year ago
wanghaomei 13130685c3 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wanghaomei acdb91f842 save 1 year ago
zhangxiaofeng abfed0149d 订舱台账查询范围调整:首次查询台账时就显示航线管理为登陆人的台账(和航线操作保持一致) 1 year ago
zhangxiaofeng 54b9dbb83a 订舱台账查询范围调整:1.添加航线管理可视权限;2.移除航线操作的可编辑权限,仅可视 1 year ago
wanghaomei cd728a14b8 批量改船代 1 year ago
wanghaomei 238e663248 用户代码
船期表截单时间
1 year ago
wanghaomei 067f9a4021 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wanghaomei 6daf565616 用户代码 1 year ago
jianghaiqing 5051c9c075 1、修改派车去掉订单booking_order的VERSION的更新动作
2、修改服务项目和状态去掉VERSION的赋值
1 year ago
jianghaiqing adf7598ae6 修改VOLTA 截单 1 year ago
jianghaiqing 4c2d70a990 修改VOLTA 截单EDI 修改公共邮件发送改为个人邮箱发送 1 year ago
zhangxiaofeng 4c6d3fd531 功能调整:运踪接收接口,接收的运踪信息主键从long改为string 1 year ago
jianghaiqing 2f30078c73 修改VOLTA 截单 1 year ago
jianghaiqing f99e00b73c 修改VOLTA 截单发送 1 year ago
jianghaiqing 2078b17d74 修改VOLTA 发送截单功能 1 year ago
jianghaiqing 91abf2969e 订舱方法,新增VOLTA发送EDI 1 year ago
zhangxiaofeng 81924e231a 功能:删除订舱时、清空提单号时调用大简云接口退订运踪 1 year ago
zhangxiaofeng 757ec793b8 添加接口:返回指定订舱记录在场站、云港通、互联网+网站的HTML数据 1 year ago
zhangxiaofeng 1201314318 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
zhangxiaofeng b1d74c5826 需求:订舱台账查询接口返回【删除时间】,并添加【删除时间】查询条件 1 year ago
wanghaomei 13febc93bc 跟踪保存耗时 1 year ago
zhangxiaofeng 30b0bf5e6a 修改bug:添加查询舱单时的菜单列表权限数据的null值验证 1 year ago
zhangxiaofeng 96c0b75963 修复bug:解决创建人更换了部门后原部门操作经理看不到之前创建的舱单台账的问题 1 year ago
zhangxiaofeng da1fc2bf0f 使用SendBookingOrder()推送订舱单数据前通过Cache判断是否正在走删除逻辑,来决定是否推送 1 year ago
wanghaomei 52a8930a20 分单号校验重复 1 year ago
wanghaomei f164febb7e Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
LoyalYang 03337868d8 分单号 1 year ago
LoyalYang fefe21cdf0 分单允许多租户 1 year ago
LoyalYang 4245977096 分单号编辑时允许保存 1 year ago
LoyalYang 5025ef584e 分单号不能重复修改20230920 1 year ago
wanghaomei 45f4e2c40f Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
LoyalYang d126e5ef0b 分单号不能重复 1 year ago
wanghaomei 0a7c7522dc 放舱同步东胜的bug 1 year ago
jianghaiqing 747531dcc2 修改运费协议号判断 1 year ago
jianghaiqing d33d50d28a 修改船公司EDI发送功能,增加运费协议号判断字符前、后是否有空格,有空格提示修改 1 year ago
jianghaiqing 7e1f3226ba 修改获取服务项目bug 1 year ago
jianghaiqing 8115380598 1、修改服务项目增加单独推送东胜同步方法
2、Draft格式单比对dto增加3个字段
1 year ago
jianghaiqing 5a20e11b92 修改服务状态 1 year ago
jianghaiqing 9e63bf9ebb 修改东胜同步方法,服务状态和申请箱使 1 year ago
jianghaiqing 127443cb4c 修改台账查询 1 year ago
jianghaiqing 912b56900d 修改订舱台账增加“货物状态”的个人配置判断,只有开启了此列显示才批量读取货物状态信息 1 year ago
jianghaiqing a5d1ffb71e Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
1 year ago
jianghaiqing b5ff162d60 修改Draft格式单比对
修改服务状态的保存、取消和订舱台账加载
1 year ago
wanghaomei ca1600eec2 注释 1 year ago
wanghaomei 87a0a93b00 分单自动订阅运踪导致的问题
分单不能单独推送东胜
1 year ago
jianghaiqing 9b58095144 服务项目和服务状态拉取方法增加用时写日志 1 year ago
jianghaiqing e2eb939dae 修改服务状态更新问题 1 year ago
jianghaiqing 924fc12de6 修改服务状态 1 year ago
jianghaiqing 994e3720e3 修改状态 1 year ago
jianghaiqing 346d088aa0 修改状态 1 year ago
jianghaiqing d61693911d 修改服务状态取消 1 year ago
jianghaiqing cf5eccc1ae 新增查询条件(货物状态)
修改同步方法
1 year ago
jianghaiqing fdb23ccd3a Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing faa8ce32a1 修改下货纸比对增加箱量字段
新增格式单比多台账字段
1 year ago
wanghaomei 68d6fef3e3 自动引入场站数据判断全部提箱
用户增加英文名
1 year ago
jianghaiqing 6090701240 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing bb00bd43d1 修改格式单比对功能,修改服务同步服务 1 year ago
wanghaomei 3f1928145e 自动引入场站开关判断问题 1 year ago
wanghaomei 8e85896b34 vgm签署人、上传人 1 year ago
wanghaomei 3db423947a 运踪回推ATD取消批量修改数据 1 year ago
jianghaiqing c1c74ac597 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing ab2ae62ab8 修改服务状态同步方法 1 year ago
wanghaomei 524fb2ab89 下货纸修改 1 year ago
wet 705fb741a7 提箱小票 1 year ago
wet db2e24f7d1 扩展状态返回 1 year ago
wet 1dd61b9c49 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wanghaomei 04c283eb58 自动引入场站数据消息已读 1 year ago
wanghaomei 361977ef81 自动引入场站数据消息已读 1 year ago
wet df034888f4 代码注释 1 year ago
wet fdced8e111 提箱小票 1 year ago
wet 42154002da 提箱小票 1 year ago
wet 878da4a92e Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wet a32c4a480d 封账 1 year ago
wanghaomei f67d3e6df1 自动引入场站记录信息 1 year ago
wet 8a7b04c8e8 封账 1 year ago
wet 8606441a02 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wet b2f89f56e9 东胜封账 1 year ago
wanghaomei beaf6636b2 自动引入调整 1 year ago
wet 4082ea9647 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wet c781f07913 注释 1 year ago
jianghaiqing 32f2a68a9e Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 9ed8bcf0f7 修改订舱台账判断如果当前订舱未关联状态,则返回空列表 1 year ago
wet 39abe58174 数据权限 1 year ago
wanghaomei 17c13a948b 临时恢复数据 1 year ago
jianghaiqing c6c21f8569 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 481539fd8e 修改订舱台账,增加了新的服务项目加载方法 1 year ago
wet 8ffc7d0dd3 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wet e0c9dfd16c 提箱小票 1 year ago
jianghaiqing 83cd7ad550 1、新增服务状态订舱台账查询类
2、修改服务方法注解
1 year ago
jianghaiqing 065be76160 暂时去掉加载服务状态 1 year ago
jianghaiqing eb599c39c4 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 952eae1b6b 修改服务状态拉取。
修改订舱台账
1 year ago
wet 59e26bdd6e 快递 1 year ago
jianghaiqing 1d9ba5bf3b Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 4248436fd9 修改服务加载增加日志 1 year ago
wet ac1f4b58ed 舱单 1 year ago
wet 1c3e66b318 小票直接返回信息 1 year ago
wet 052a678329 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
1 year ago
wet b2c770f081 小票 1 year ago
jianghaiqing 8f3fcca703 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing a03b155d5e 修改订舱保存状态 1 year ago
wet ac9dd0f443 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wet 4e557f19c8 恢复删除 1 year ago
jianghaiqing 8b2031b137 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing d5563f5554 迁入 1 year ago
wanghaomei 3096fd4a09 临时文件上传功能
保存附带临时文件保存
1 year ago
wanghaomei 2eb352d787 自动引入场站数据提示内容 1 year ago
jianghaiqing 52afe88fa0 修改服务项目 1 year ago
jianghaiqing 2c07c90b2c 修改服务状态加载方法 1 year ago
jianghaiqing d59cc41381 修改保存状态和取消状态方法参数 1 year ago
jianghaiqing 70135e22ab 修改服务项目状态推送和取消 1 year ago
jianghaiqing ebe4205944 修改服务项目状态检索 1 year ago
jianghaiqing 0092cb5382 修改服务状态加载方法 1 year ago
jianghaiqing a9a0d7d6bb 修改服务项目保存、获取详情 1 year ago
jianghaiqing 4921e7872d 修改查询服务项目列表 1 year ago
jianghaiqing 6791c80de0 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 036b4f9470 修改服务项目 1 year ago
wanghaomei 02c422c489 自动引入场站数据时,包装取值优化 1 year ago
wanghaomei 64fcd41ce0 自动引入箱封号bug 1 year ago
jianghaiqing 62820a212a Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 3861acedb8 修改订舱查询服务项目(不修改原来的方法,新增方法) 1 year ago
wet 1b3a43229a 船期变更 1 year ago
wet b9382322b9 1 1 year ago
wet 8acddb61ea 去重 1 year ago
wet 0afb96fc54 场站code映射 1 year ago
wet 248fcc6583 船期自动变更 1 year ago
wet 3ab8d90509 提箱自动化 1 year ago
wet 807a270843 1 1 year ago
wet fe32e2f27c 自动提箱 1 year ago
wet e75724d9e8 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wet c3560fe0b1 修改自动订阅规则 1 year ago
jianghaiqing 4ada8d21f1 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing a84dc92dd9 修改保存,新增校验代码不能重复 1 year ago
wanghaomei ebb1ca99df VGM直发根据船司配置 1 year ago
wet f39f9dad2d 日期查询 1 year ago
wet 2684cb68e4 1 1 year ago
wanghaomei e9262bf23e 保存如果通知时,生成小票或VGM链接失败,不提示错误 1 year ago
wet 62bbcf2f04 时间排序 1 year ago
wet 3a0f51be3a 运踪调用 1 year ago
wet 3401684b59 运踪订阅 1 year ago
wet ff777ad8ca 运踪刷新 1 year ago
wet af6ea320c5 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wet ee9a4ee899 刷新运踪 1 year ago
wanghaomei d75aef545f 客户订舱修改
港联捷下货纸修改
港联欣下货纸加船司限制
1 year ago
wanghaomei 7e1a1f8a67 客户订舱同步修改 1 year ago
wet 369766962f 运踪订阅标识 1 year ago
wet cb2c73b2da 变更提单号 1 year ago
wet 635cfcf6e4 权限控制 1 year ago