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
|
2078b17d74
|
修改VOLTA 发送截单功能
|
1 year ago |
|
jianghaiqing
|
91abf2969e
|
订舱方法，新增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
|
2550e82806
|
调整爬虫上传船期港前接口，解决并发更新时数据被覆盖的问题：1.只修改指定列；2.只查询同船名航次的订舱；
|
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
|
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 |
|
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 |
|
jianghaiqing
|
ab2ae62ab8
|
修改服务状态同步方法
|
1 year ago |
|
wanghaomei
|
524fb2ab89
|
下货纸修改
|
1 year ago |
 wet
|
705fb741a7
|
提箱小票
|
1 year ago |
|
wet
|
db2e24f7d1
|
扩展状态返回
|
1 year ago |
|
wet
|
6544e4b908
|
注释
|
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 |
|
jianghaiqing
|
ce9cc8563a
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
jianghaiqing
|
d3ef8e76cc
|
1、修改派车撤销删除，增加直接删除。
2、新增服务状态同步方法。
|
1 year ago |
|
wet
|
8a7b04c8e8
|
封账
|
1 year ago |
|
jianghaiqing
|
d76a2e3802
|
修改派车，增加更新车队
|
1 year ago |
|
jianghaiqing
|
2065c8b305
|
修改派车新增
|
1 year ago |
|
jianghaiqing
|
6df46a59c6
|
修改派车的撤销删除方法
|
1 year ago |
|
jianghaiqing
|
c03798ea3a
|
修改派车的撤销并删除
|
1 year ago |
|
jianghaiqing
|
03e675a796
|
修改任务派车改为POST
|
1 year ago |
|
jianghaiqing
|
651cff8933
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
jianghaiqing
|
e3ed31c92e
|
修改任务派车功能，增加先保存后派车
|
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 |
|
jianghaiqing
|
4c226cd6b2
|
修改派车自动获取工厂名称
|
1 year ago |
|
jianghaiqing
|
5813339283
|
修改订舱派车，增加新增派车自动调取上一票非作废的派车数据（实际毛重、开票方式、提货工厂、工厂联系人+电话、工厂地址、派车单备注）
|
1 year ago |
|
jianghaiqing
|
6b47bfba34
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
jianghaiqing
|
feb62d80dc
|
修改派车，修改单票撤销方法，增加直接删除参数
|
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
|
049a6608ca
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
wet
|
39abe58174
|
数据权限
|
1 year ago |
|
jianghaiqing
|
d183780e46
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
jianghaiqing
|
d93a904098
|
修改服务项目
|
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
|
1f53972307
|
修改服务加载增加日志
|
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
|
c1163e7f82
|
顺丰字典调用
|
1 year ago |
|
wet
|
b57ef299b3
|
舱单
|
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
|
c892e32658
|
修改服务项目缓存时间
修改服务状态保存
|
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 |
|
wet
|
96dd2beb10
|
顺
|
1 year ago |
|
wet
|
a7a711bb10
|
1
|
1 year ago |
|
wet
|
bd8c12642c
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
wanghaomei
|
2eb352d787
|
自动引入场站数据提示内容
|
1 year ago |
|
jianghaiqing
|
c89b85ae2a
|
修改服务项目运行日志
|
1 year ago |
|
jianghaiqing
|
010fa5f26d
|
修改服务项目日志
|
1 year ago |
|
jianghaiqing
|
a0f68015f4
|
修改服务加载，增加日志记录
|
1 year ago |
|
jianghaiqing
|
16904ad985
|
修改服务状态获取
|
1 year ago |
|
jianghaiqing
|
131fe767b9
|
修改状态获取方法
|
1 year ago |
|
jianghaiqing
|
79ce8d382b
|
修改状态保存
|
1 year ago |
|
jianghaiqing
|
a4d852fb25
|
修改服务状态保存，增加完成时间为空并且备注不为空，不标注完成
|
1 year ago |
|
wet
|
3b436e2cc8
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
wet
|
dedcf0c659
|
1
|
1 year ago |
|
jianghaiqing
|
0deb10cc34
|
修改服务状态取消
|
1 year ago |
|
jianghaiqing
|
e9d6e3c5d2
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
jianghaiqing
|
dc9f2dae03
|
修改服务状态取消
|
1 year ago |
|
wet
|
647ad43f76
|
顺丰快递查询
|
1 year ago |
|
wet
|
1c1507b713
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
wet
|
231958908b
|
省份
|
1 year ago |
|
jianghaiqing
|
efbaf67fa7
|
修改服务项目加载
|
1 year ago |
|
jianghaiqing
|
52afe88fa0
|
修改服务项目
|
1 year ago |
|
jianghaiqing
|
4b7bdaf74d
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
jianghaiqing
|
d02de7e7f2
|
修改服务项目状态加载
|
1 year ago |
|
wet
|
52bf2d1554
|
1
|
1 year ago |
|
wet
|
03cf1a9e53
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
wet
|
e625fb8ae8
|
顺丰快递
|
1 year ago |
|
jianghaiqing
|
611f131e58
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
jianghaiqing
|
2c07c90b2c
|
修改服务状态加载方法
|
1 year ago |
|
wet
|
49d00316be
|
Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan
|
1 year ago |
|
wet
|
8f3304bd01
|
快递
|
1 year ago |
|
jianghaiqing
|
e819764f3b
|
修改派车更新订舱的版本号
|
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 |