 wet
|
670c863b9f
|
分单信息edi
|
2 years ago |
jianghaiqing
|
7dd9c0d24e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
42ab260e81
|
修改订舱的EDI增加辅助字段1-4
|
2 years ago |
|
wet
|
ff5b2e9657
|
获取列表字段
|
2 years ago |
|
wet
|
9341fc7a01
|
excel导入
|
2 years ago |
|
wet
|
2b6f536d97
|
件数合计
|
2 years ago |
|
wet
|
f9092e0b1d
|
件重尺
|
2 years ago |
|
wet
|
797587b7f6
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
d4f3b56c9b
|
修改付费方式EDI提示
|
2 years ago |
|
jianghaiqing
|
fda37aa325
|
修改EDI增加付款方式的EDI基础数据检索
|
2 years ago |
|
wet
|
2f772563da
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
7b6de7c4a9
|
保存
|
2 years ago |
|
jianghaiqing
|
1827293f33
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
d4344d36a0
|
修改EDI增加付费方式EDI映射调取
|
2 years ago |
|
wet
|
bcc3b38154
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
 wanghaomei
|
baa35017d7
|
打印文件名
|
2 years ago |
|
wet
|
1bcc90ab9d
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
10b525a114
|
excel
|
2 years ago |
|
wanghaomei
|
ea8e4db58d
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
8c2221374b
|
API授权启用禁用功能
|
2 years ago |
|
wet
|
7b28c01dbc
|
excel
|
2 years ago |
|
wet
|
acf3012238
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
91b99d26ac
|
exce
|
2 years ago |
|
wanghaomei
|
83bf6d43ac
|
放舱提示不支持的船公司的bug
|
2 years ago |
|
wet
|
35246de5fa
|
excel样式
|
2 years ago |
|
wet
|
ad0b5984c8
|
大隐
|
2 years ago |
|
wet
|
9785842e2d
|
打印
|
2 years ago |
|
wet
|
0ddc4fcceb
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
e15ece4bea
|
模板
|
2 years ago |
|
wanghaomei
|
954b36e7dd
|
提单确认保存返回id
|
2 years ago |
|
wanghaomei
|
1dd6dbf138
|
打印文件名称
|
2 years ago |
|
wanghaomei
|
5195bbf4b1
|
打印文件名
|
2 years ago |
|
wanghaomei
|
e769b4815d
|
拉取打印模板bug
|
2 years ago |
|
wanghaomei
|
f4464c940d
|
拉取打印模板bug
|
2 years ago |
|
wet
|
ca0d8bbc67
|
ATD
|
2 years ago |
|
wet
|
41926d6c0e
|
ATD同步更新
|
2 years ago |
|
wet
|
683ee5f98c
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
92c907368f
|
排序
|
2 years ago |
|
wanghaomei
|
912e5536fe
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
6f9e6f9bac
|
保存打印记录的bug
|
2 years ago |
|
wet
|
4e4092b78e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Myshipping.Application.xml
|
2 years ago |
|
jianghaiqing
|
9bf0eb98eb
|
修改EDI
|
2 years ago |
|
jianghaiqing
|
c09f750dd0
|
订舱DTO，增加品名代码、品名
|
2 years ago |
|
wanghaomei
|
fc5a99825b
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
b915567238
|
region
|
2 years ago |
|
jianghaiqing
|
c3e7bc6840
|
修改EDI增加分单不能生成EDI判断
|
2 years ago |
|
jianghaiqing
|
20ae84abde
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
dc2ac60301
|
修改EDI
|
2 years ago |
|
wanghaomei
|
6a322f1ab1
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Myshipping.Application.xml
|
2 years ago |
|
wanghaomei
|
d725206e10
|
打印接口调整
|
2 years ago |
|
wet
|
05c14a5d99
|
副本分数
|
2 years ago |
|
wet
|
e6cee7cf94
|
excel daochu
|
2 years ago |
|
wet
|
ff367ea1bb
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
3d95d45dd2
|
excel
|
2 years ago |
|
wanghaomei
|
8cde73e112
|
打印接口统一
|
2 years ago |
|
wet
|
2de926c191
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
b643225e65
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
94dd9b1923
|
打印模块修改，增加新分类，准备废除旧版
|
2 years ago |
|
wet
|
edfbce4e7b
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
7f82fe19f2
|
船期
|
2 years ago |
|
jianghaiqing
|
d6c7cf2342
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
7aa674e8fb
|
修改EDI下载
|
2 years ago |
|
wet
|
2831c5483a
|
定时删除
|
2 years ago |
|
jianghaiqing
|
ab74b16e30
|
修改ESL的EDI生成
|
2 years ago |
|
wet
|
20ad6f02e2
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
466b768847
|
分提单号
|
2 years ago |
|
jianghaiqing
|
b09e3f4f8e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
a854e6cec7
|
修改EDI，增加ESL
|
2 years ago |
|
wet
|
97e148bc4e
|
去重
|
2 years ago |
|
wet
|
4c228279aa
|
提单号重复
|
2 years ago |
|
wet
|
6eae4efc9f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
8a1cf589db
|
删除临时文件
|
2 years ago |
|
wanghaomei
|
158647fa8c
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
37d3ade77d
|
订舱打印新接口
|
2 years ago |
|
wet
|
087a43e1de
|
货运动态
|
2 years ago |
|
wet
|
14d0c0099f
|
运踪
|
2 years ago |
|
wet
|
ab8a92db6e
|
公共库sort
|
2 years ago |
|
jianghaiqing
|
4de4118f10
|
修改订舱的EDI扩展字段
|
2 years ago |
|
wet
|
9f1b491e1c
|
excel
|
2 years ago |
|
jianghaiqing
|
30ada3bb2a
|
修改EDI，增加需要场站EDI的精确判断，PIL&CNTAO
|
2 years ago |
|
wet
|
ac38b8d3c0
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
4a9a425651
|
打印
|
2 years ago |
|
wanghaomei
|
7bdab43027
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
a40e6c20a3
|
放舱信息加字段
客户信息加提单信息字段
打印服务增加放舱信息等内容
|
2 years ago |
|
wet
|
04cba339c3
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
aecd145321
|
分单
|
2 years ago |
|
jianghaiqing
|
2b708197fb
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
42bca2fd6f
|
修改EDI的换行符
|
2 years ago |
|
wet
|
8ab8bc8939
|
分单
|
2 years ago |
|
wet
|
8191b10cde
|
权限
|
2 years ago |
|
wet
|
2bb8117935
|
ETD去掉时分秒
|
2 years ago |
|
wet
|
34c41e1494
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
747db48289
|
打印
|
2 years ago |
|
wanghaomei
|
d9d7f7b9dc
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Myshipping.Application.xml
|
2 years ago |
|
wanghaomei
|
41830f0b63
|
打印模板
|
2 years ago |
|
jianghaiqing
|
958fc4f440
|
修改EDI的提示信息
|
2 years ago |
|
jianghaiqing
|
0355ab30f8
|
修改EDI的包装对应
|
2 years ago |
|
wet
|
236e9aa50f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
4fe47d56d9
|
船名映射
|
2 years ago |
|
jianghaiqing
|
b6f457427f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
2be8283970
|
1、增加我的任务统计
2、修改订舱EDI的包装对应
|
2 years ago |
|
wet
|
47c3fd6685
|
运踪订阅日志
|
2 years ago |
|
wet
|
abf1d2f5d5
|
运踪调用
|
2 years ago |
|
wet
|
2dfe52abf9
|
打印模板权限
|
2 years ago |
|
wet
|
a333e7f8f3
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
52b8b751ac
|
用户授权
|
2 years ago |
|
wanghaomei
|
704dc5e552
|
放舱修改
|
2 years ago |
|
wet
|
7d6bc9a2ce
|
调用运踪
|
2 years ago |
|
wet
|
ed83427593
|
批量调用运踪
|
2 years ago |
|
wet
|
1e8cbf1703
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
7171046d79
|
OCR附件保存到订舱
|
2 years ago |
|
wet
|
6d0964f325
|
船期信息
|
2 years ago |
|
wanghaomei
|
ff709bf850
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
d55a553ddc
|
客户模块，增加操作、单证、销售、客服等字段
|
2 years ago |
|
wet
|
f6d10a9a52
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
08f799c732
|
运踪
|
2 years ago |
|
wanghaomei
|
431a0113f5
|
放舱文件多格式
|
2 years ago |
|
wanghaomei
|
3a3bd62893
|
打印文件名称格式
|
2 years ago |
|
wet
|
94b18a1422
|
接口
|
2 years ago |
|
wet
|
d58e3b13de
|
运踪 备注 运输服务
|
2 years ago |
|
wet
|
8e6f261cba
|
权限恢复
|
2 years ago |
|
wet
|
9de9103e31
|
Merge branch 'booking_auth_dev'
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
684ab6a3f7
|
权限
|
2 years ago |
|
wet
|
5a0338e52a
|
装船时间
|
2 years ago |
|
wet
|
5296212f07
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
580b22a78e
|
1
|
2 years ago |
|
wanghaomei
|
61326ee384
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wanghaomei
|
628fe05694
|
打印模板不显示问题
|
2 years ago |
|
wet
|
fddb9cb48d
|
运踪订阅
|
2 years ago |
|
wet
|
c881f9b90c
|
权限
|
2 years ago |
|
wet
|
0f6fe23268
|
列表
|
2 years ago |
|
wet
|
9783bef16b
|
列表展示
|
2 years ago |
|
wet
|
8057d19b88
|
权限
|
2 years ago |
|
wet
|
65567f9c5d
|
放舱删除
|
2 years ago |
|
wet
|
6f5466a5b5
|
附件名称
|
2 years ago |
|
wet
|
418ae00c8d
|
排序
|
2 years ago |
|
wet
|
b8a79a8b62
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
efb6dd3943
|
排序
|
2 years ago |
|
jianghaiqing
|
578dffc74b
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
f75e4cf892
|
修改订舱发送EDI功能，增加发送时自动写入到附件
修改EDI方法，去掉删除文件方法
|
2 years ago |
|
wet
|
e845bb5697
|
运踪接口对接
|
2 years ago |
|
wet
|
09ab1939ee
|
调用运踪接口
|
2 years ago |
|
wet
|
2af2e9c8bb
|
接口地址
|
2 years ago |
|
wet
|
91f6fed668
|
接口地址
|
2 years ago |
|
wet
|
0bc72d58c2
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
764ad191db
|
订舱状态
|
2 years ago |
|
wanghaomei
|
c14d5761b5
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
3c82cfc4a5
|
客户信息暂时写死本公司数据
打印模板列表动态接口
|
2 years ago |
|
wet
|
aa0283baf6
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
a9b2685d4e
|
公共接口
|
2 years ago |
|
wanghaomei
|
1eab3e9f16
|
订舱打印记录列表
|
2 years ago |
|
wet
|
b05edcffba
|
webaccountconfig 修改
|
2 years ago |
|
wanghaomei
|
128883d744
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
8916aac796
|
报表报错异常抓取
打印增加docx类型
|
2 years ago |
|
wet
|
3310e13a04
|
提单号搜索
|
2 years ago |
|
jianghaiqing
|
b481f90b24
|
修改订舱规则调取，增加日志记录
|
2 years ago |
|
jianghaiqing
|
d641dd50f5
|
修改批注
|
2 years ago |
|
jianghaiqing
|
5022f58b6f
|
修改EDI增加日志
|
2 years ago |
|
jianghaiqing
|
1b59f22fcf
|
修改EDI方法
|
2 years ago |
|
jianghaiqing
|
e6a65a4fce
|
修改订舱EDI方法
|
2 years ago |
|
jianghaiqing
|
8c371547eb
|
修改订舱EDI增加字段的对应
|
2 years ago |
|
jianghaiqing
|
c8e5caa70d
|
修改PIL发送EDI，去掉收、发、通的特殊字符替换。
修改调取规则方法
|
2 years ago |
|
wanghaomei
|
6ff4b8c8b7
|
去除主单的分单号校验
|
2 years ago |
|
wanghaomei
|
1436f86f9a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
7271d0a9e9
|
打印下载直接预览显示
|
2 years ago |
|
wet
|
cf45380061
|
新增编辑修改
|
2 years ago |
|
wet
|
f672323be3
|
新增接口修改
|
2 years ago |
|
wanghaomei
|
2ed0752527
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
ea9350f84b
|
小票、VGM映射修改
打印模板重复校验
|
2 years ago |
|
wet
|
41a8b96344
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
ec75ed94ad
|
注释
|
2 years ago |
|
wanghaomei
|
a3563c354c
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
162d742c23
|
报表模块
|
2 years ago |
|
wet
|
d567a9859f
|
名称修改
|
2 years ago |
|
wet
|
f6178b7b11
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
06c5bcb561
|
批量vgm
|
2 years ago |
|
wanghaomei
|
9cb6881339
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wanghaomei
|
a3ce4c114f
|
模板文件找不到的问题
|
2 years ago |
|
jianghaiqing
|
08c2eea3be
|
修改订舱EDI扩展更新方法
|
2 years ago |
|
jianghaiqing
|
c100369d08
|
修改EDI扩展信息的更新方法
|
2 years ago |
|
jianghaiqing
|
205d513013
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
4d0e48e3ee
|
修改EDI扩展信息的注释说明
|
2 years ago |
|
wet
|
77881c8d3f
|
定时任务
|
2 years ago |
|
wet
|
e908538d43
|
临时文件下载
|
2 years ago |
|
wet
|
0c5e4adbbb
|
打印文件下载
|
2 years ago |
|
wet
|
83e42e662e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
1866559ed0
|
定时删除临时文件
|
2 years ago |
|
jianghaiqing
|
813ff0e84c
|
修改订舱的保存方法
|
2 years ago |
|
wanghaomei
|
672fe0665a
|
ocr功能
|
2 years ago |
|
wet
|
548d3750e3
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
270745adb7
|
批量编辑
|
2 years ago |
|
wanghaomei
|
c267b4eaa6
|
临时文件配置
|
2 years ago |
|
wet
|
f324d30d0b
|
运踪账号维护提示
|
2 years ago |
|
wet
|
9dd8087e42
|
日志展示字段
|
2 years ago |
|
wet
|
4727b73dc5
|
缓存
|
2 years ago |
|
wet
|
4344a6c6b8
|
场站
|
2 years ago |
|
jianghaiqing
|
9fbad0fcb7
|
修改订舱的保存方法，解决保存是箱下多品名为空和EDI扩展信息为空的情况
|
2 years ago |
|
jianghaiqing
|
e26f75620f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
d3cb1dfe04
|
修改订舱保存方法，增加EDI扩展信息保存。
修改发送EDI，部分信息从EDI扩展获取。
|
2 years ago |
|
wet
|
bafb4e6f3c
|
返回业务id
|
2 years ago |