Commit Graph

2158 Commits (29657ead7369a9f9e1963e30afa1059881428b20)

Author SHA1 Message Date
jianghaiqing a82a45fad5 修改BC任务 10 months ago
zhangxiaofeng 43e20c4d18 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 10 months ago
zhangxiaofeng e544ed322f feature:接收到东胜推送的修改船期的数据后,根据旧的船名、海关航次、内部航次、船公司Id,批量更新订舱中的海关航次字段 10 months ago
jianghaiqing be8aa435c4 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 10 months ago
jianghaiqing 3f1ed69b76 修改BC任务 10 months ago
zhangxiaofeng 8ee92c5fc9 bugfix:新建订舱以及修改订舱时无法正确引入POL ETA、POL ATD、POL ETD的问题 10 months ago
zhangxiaofeng 1c3f5c8ffb 合并 11 months ago
zhangxiaofeng 036a400778 舱位引入、取消引入 11 months ago
jianghaiqing f952a356a4 修改BC任务 11 months ago
jianghaiqing 10651a5135 修改BC任务 11 months ago
jianghaiqing e582cd3b57 修改BC任务 11 months ago
jianghaiqing 54f9c8f33b Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
jianghaiqing ec042b2649 修改BC任务 11 months ago
hao 30cc0c39d2 log 11 months ago
hao 3649dab625 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
hao 012fbc8849 merge 11 months ago
zhangxiaofeng 04dbd4eebf 合并 11 months ago
zhangxiaofeng 18029a5771 引入订舱:查询可用的舱位及箱子接口 11 months ago
jianghaiqing a866d7f132 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
jianghaiqing cab358d19b 修改BC任务 11 months ago
hao 27c262ad45 api 11 months ago
jianghaiqing 44894c802b Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
jianghaiqing 4389475b2d 修改BC任务 11 months ago
hao f66f83c6d7 库存 11 months ago
hao b35f765c90 库存 11 months ago
hao 32e5272109 bug 11 months ago
hao 9d3c09b3f2 舱位 11 months ago
jianghaiqing bd55f78c6a 修改邮件解析服务 11 months ago
jianghaiqing 7716a3bb50 修改邮件解析服务 11 months ago
jianghaiqing 7da90c4247 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
jianghaiqing cddc5fe4dd 修改邮件解析服务 11 months ago
zhangxiaofeng e4b1d83082 东胜批量同步客户接口调整 11 months ago
jianghaiqing 1d9f15c8ee 修改邮件解析服务,新增批量重新解析方法 11 months ago
jianghaiqing 56d5f7dc22 修改邮件解析服务,增加邮件解析注入管理 11 months ago
jianghaiqing 2f74b13533 修改邮件解析服务,增加邮件解析配置方法 11 months ago
jianghaiqing 8df5aba6f0 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
jianghaiqing 933c18d96b 修改邮件账户保存 11 months ago
hao 45ab5f6d3c 舱位 11 months ago
jianghaiqing 3b43ddb7c2 修改邮件解析服务,增加重新解析方法 11 months ago
jianghaiqing 8dd57f8165 修改邮件接收服务,新增邮箱账户维护服务 11 months ago
jianghaiqing d2199eaa47 新增邮件解析服务,主要实现邮件接收服务的设定 11 months ago
jianghaiqing 4c1610b0b4 修改运踪同步,增加已提箱状态推送和舱单放行状态推送 11 months ago
jianghaiqing 915591c9c0 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
jianghaiqing 6f54a9a852 修改订舱台账,无台账记录时检索查询报错 11 months ago
whm 4d511225ef TenantId 11 months ago
whm 3aa122263e list 11 months ago
zhangxiaofeng 50ab17121c 快递模块:优化调整 11 months ago
jianghaiqing f7fd5a1bd3 修改派车任务同步东胜方法 11 months ago
zhangxiaofeng 956309e223 快递模块调整:发件时,返回当前登陆人的寄件信息 11 months ago
jianghaiqing 5df190bfc3 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 11 months ago
jianghaiqing 25d92513de 修改派车任务,增加派车后单独同步东胜功能 11 months ago
zhangxiaofeng 44a835269b 快递模块调整:合并下单接口和保存接口 11 months ago
zhangxiaofeng fcef329e5b 快递模块:字段修改 11 months ago
zhangxiaofeng d8bb9447d5 快递模块调整:字段修改 11 months ago
wanghaomei 86b333b80c 运踪页面 11 months ago
wanghaomei 32ad3ca87d 运踪 11 months ago
zhangxiaofeng 2206f7ab88 快递模块对接费用等接口 11 months ago
zhangxiaofeng 2ddd852fa3 快递模块:面单查询下载、面单打印 12 months ago
wanghaomei d96152b75b 亿通账号对应 12 months ago
zhangxiaofeng 8ebc0226e9 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
zhangxiaofeng 2eae0d5126 解决编译bug 12 months ago
wanghaomei 930d512192 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
wanghaomei c1b9b2a316 CNTRTOTAL 12 months ago
zhangxiaofeng 99c28f001f 快递模块调整 12 months ago
wanghaomei 7f5893c8db 小票船司映射 12 months ago
wanghaomei d403843b53 小票 12 months ago
wanghaomei 03052050f2 运踪 12 months ago
wanghaomei ba915cfe28 港联欣 12 months ago
wanghaomei 1ed4758632 billtrace 12 months ago
wanghaomei fa6e8e00f4 运踪 12 months ago
jianghaiqing 5689a273ac Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
jianghaiqing 6946f2196d 修改VOLTA生成报文 12 months ago
wanghaomei da53139915 bug 12 months ago
wanghaomei d4c2e5265a 运踪 12 months ago
wanghaomei 13130685c3 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
wanghaomei acdb91f842 save 12 months ago
zhangxiaofeng abfed0149d 订舱台账查询范围调整:首次查询台账时就显示航线管理为登陆人的台账(和航线操作保持一致) 12 months ago
zhangxiaofeng ac93552870 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
zhangxiaofeng 54b9dbb83a 订舱台账查询范围调整:1.添加航线管理可视权限;2.移除航线操作的可编辑权限,仅可视 12 months ago
wanghaomei bc6b596198 船司与场站、订舱代理匹配关系 12 months ago
zhangxiaofeng fa65146118 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
zhangxiaofeng 72cb3e9fc2 解决 /DataSync/SyncVesselDateList 接口同步船期信息时,误把ATD、云港通ETD等数据更新为null的bug;顺便优化性能; 12 months ago
wanghaomei cd728a14b8 批量改船代 12 months ago
zhangxiaofeng 45c2a513b2 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
zhangxiaofeng 260f42e75b 快递模块:优化收寄件人管理部分 12 months ago
wanghaomei 238e663248 用户代码
船期表截单时间
12 months ago
wanghaomei 067f9a4021 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 12 months ago
wanghaomei 6daf565616 用户代码 12 months ago
jianghaiqing 2838d4fd91 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 5051c9c075 1、修改派车去掉订单booking_order的VERSION的更新动作
2、修改服务项目和状态去掉VERSION的赋值
1 year ago
zhangxiaofeng 05eb602fc1 快递模块:优化调整 1 year ago
zhangxiaofeng 92ac88f7e0 补充:运踪数据接收逻辑调整:更新某单的目的港eta时,不再更新同船名、同航次、同船公司的eta,ata 1 year ago
zhangxiaofeng e0e3abf37d 快递模块:微调 1 year ago
zhangxiaofeng ad57c73bfc 快递模块:增加下单自动保存地址簿功能,以及地址簿维护接口 1 year ago
zhangxiaofeng 2e73a57222 快递模块:月结相关 1 year ago
zhangxiaofeng 40d4788ffb 快递模块:快递动态与订舱动态 1 year ago
zhangxiaofeng 26918baff2 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
zhangxiaofeng 59fd30a3bb 运踪数据接收逻辑调整:更新某单的目的港eta时,不再更新同船名、同航次、同船公司的eta 1 year ago
jianghaiqing adf7598ae6 修改VOLTA 截单 1 year ago
jianghaiqing 4c2d70a990 修改VOLTA 截单EDI 修改公共邮件发送改为个人邮箱发送 1 year ago
zhangxiaofeng 0620893795 1.对接顺丰相关代码优化;2.添加订单取消接口 1 year ago
zhangxiaofeng 38cb5473c5 东胜同步订舱客户信息接口调整 1 year ago
zhangxiaofeng 4c6d3fd531 功能调整:运踪接收接口,接收的运踪信息主键从long改为string 1 year ago
jianghaiqing 2f30078c73 修改VOLTA 截单 1 year ago
jianghaiqing f99e00b73c 修改VOLTA 截单发送 1 year ago
jianghaiqing 66570a499c 修改VOLTA邮件标题 1 year ago
jianghaiqing 2078b17d74 修改VOLTA 发送截单功能 1 year ago
jianghaiqing 91abf2969e 订舱方法,新增VOLTA发送EDI 1 year ago
jianghaiqing 5b7d671921 修改VOLTA EDI帮助类,实现报文生成 1 year ago
jianghaiqing c9f83d37c8 修改VOLTA帮助类
修改状态保存问题
1 year ago
zhangxiaofeng 5a4b28e73b Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
zhangxiaofeng 81924e231a 功能:删除订舱时、清空提单号时调用大简云接口退订运踪 1 year ago
jianghaiqing 3e86d22373 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing c563009e8b 修改下货纸比对请求,增加船公司代码 1 year ago
zhangxiaofeng fd79135f79 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
zhangxiaofeng 2550e82806 调整爬虫上传船期港前接口,解决并发更新时数据被覆盖的问题:1.只修改指定列;2.只查询同船名航次的订舱; 1 year ago
jianghaiqing 7f36beb75b 新增VOLTA的EDI报文帮助类 1 year ago
zhangxiaofeng 757ec793b8 添加接口:返回指定订舱记录在场站、云港通、互联网+网站的HTML数据 1 year ago
jianghaiqing 14c18c3ce1 修改下货纸比对 1 year ago
jianghaiqing d50ced386e 修改下货纸比对 1 year ago
jianghaiqing 22d3f61ae6 修改下货纸比对 1 year ago
jianghaiqing 3b8ec05a4d 修改下货纸比对,增加自动下货纸比对接口 1 year ago
jianghaiqing 4726cd59c4 修改下货纸比对方法,增加下货纸自动比对方法 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 c03f3c7cd2 下货纸“货物标志”为“冻柜”时,对部分字段做校验:根据和场站确认结果重新调整 1 year ago
zhangxiaofeng 30b0bf5e6a 修改bug:添加查询舱单时的菜单列表权限数据的null值验证 1 year ago
zhangxiaofeng f8a9d7bca1 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
zhangxiaofeng 96c0b75963 修复bug:解决创建人更换了部门后原部门操作经理看不到之前创建的舱单台账的问题 1 year ago
jianghaiqing 2a59bf6eae 修改格式单比对接口,增加API认证 1 year ago
jianghaiqing 7d8b2b0e29 修改服务状态保存和取消,增加非登录情况判断 1 year ago
jianghaiqing a797af037c 修改格式单比对,增加日志 1 year ago
zhangxiaofeng 4dfa3e0f62 下货纸“货物标志”为“冻柜”时,对部分字段做校验 1 year ago
jianghaiqing bfca49b308 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing c32f52af6e 修改格式单比对 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 4010bd6ee5 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
LoyalYang 03337868d8 分单号 1 year ago
jianghaiqing 1cd3d62c62 修改格式单比对 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
wanghaomei 4b68ccb069 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
LoyalYang 3a84075ca8 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
LoyalYang d126e5ef0b 分单号不能重复 1 year ago
jianghaiqing 4ff4a08edc 修改格式单比对,增加租户判断 1 year ago
wanghaomei 0ae32d644f Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing 178dbac2df 修改格式单增加附页的文件写入订舱附件功能 1 year ago
wanghaomei 91bfff6a1d Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing f347abe967 新增格式单比对 1 year ago
wanghaomei e8532519a4 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wanghaomei 0a7c7522dc 放舱同步东胜的bug 1 year ago
jianghaiqing 8ad879f244 修改格式单比对功能 1 year ago
jianghaiqing 747531dcc2 修改运费协议号判断 1 year ago
jianghaiqing d33d50d28a 修改船公司EDI发送功能,增加运费协议号判断字符前、后是否有空格,有空格提示修改 1 year ago
jianghaiqing 3b553a862a 修改Draft比对,新增包装字段 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 3c6efbf645 修改状态推送方法,解决异常问题 1 year ago
jianghaiqing e2eb939dae 修改服务状态更新问题 1 year ago
jianghaiqing 924fc12de6 修改服务状态 1 year ago
jianghaiqing 994e3720e3 修改状态 1 year ago
jianghaiqing 346d088aa0 修改状态 1 year ago
jianghaiqing 2263370c90 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing d61693911d 修改服务状态取消 1 year ago
wanghaomei 77a8125239 东胜上传船期时,ATD清不掉的问题
船期编辑界面,ATD清不掉的问题
1 year ago
jianghaiqing 52c715dfee Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
jianghaiqing cf5eccc1ae 新增查询条件(货物状态)
修改同步方法
1 year ago
wanghaomei b653560019 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wanghaomei eaa962b89a 舱单保存逻辑优化 1 year ago
jianghaiqing cd3af958ca 修改取消派车,去掉判断状态必需已完成才能取消的限制 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
wanghaomei 8a976a75a5 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago
wanghaomei 1c60fad17b 取消运踪回推ATD的写入 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 1fae62ef6b 运踪目的港ETA的bug 1 year ago
wanghaomei 3db423947a 运踪回推ATD取消批量修改数据 1 year ago
jianghaiqing 3732933e37 修改格式单比对获取结果方法 1 year ago
jianghaiqing 2c0a32372e 修改Draft比对接口
新增查询Draft比对接口
1 year ago
jianghaiqing 94b3c1a08c 新增Draft(格式单)比对 1 year ago
jianghaiqing b17f82bd85 修改状态同步问题 1 year ago
jianghaiqing c1c74ac597 Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan 1 year ago