jianghaiqing
|
2776e6a9ea
|
修改我的任务的正版下载功能
|
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
|
60db2eeb28
|
修改EDI枚举
|
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 |
|
jianghaiqing
|
986b6445fc
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
6289721fc5
|
修改我的任务增加正本下载
|
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 |
|
jianghaiqing
|
e66b5ab894
|
修改参数的删除功能
|
2 years ago |
|
jianghaiqing
|
710afdf63c
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
f05685fec2
|
新增品名分类、合约号增、删、改查
|
2 years ago |
|
wet
|
087a43e1de
|
货运动态
|
2 years ago |
|
wet
|
14d0c0099f
|
运踪
|
2 years ago |
|
wanghaomei
|
9bd70346c1
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
4757651200
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs
|
2 years ago |
|
jianghaiqing
|
43b1e47b7d
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
b32c0c8f30
|
新增品名参数台账查询
|
2 years ago |
|
wanghaomei
|
477fa6e2b8
|
打印模板分类
|
2 years ago |
|
wet
|
ab8a92db6e
|
公共库sort
|
2 years ago |
|
jianghaiqing
|
67e282da05
|
完成品名参数的增、删、改，单票查询和模糊检索
|
2 years ago |
|
jianghaiqing
|
e2c2ae7bc6
|
新增参数合约号、参数品名、参数品名分类实体类
|
2 years ago |
|
jianghaiqing
|
4de4118f10
|
修改订舱的EDI扩展字段
|
2 years ago |
|
wet
|
777bc1b204
|
公共库排序
|
2 years ago |
|
wet
|
42b24b2553
|
excel
|
2 years ago |
|
wet
|
b7d58d434c
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
9f1b491e1c
|
excel
|
2 years ago |
|
jianghaiqing
|
67c6ea7cf4
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
f35e7f3895
|
修改我的任务台账查询
|
2 years ago |
|
wet
|
5cf7f17cb3
|
船期
|
2 years ago |
|
wet
|
cb92470059
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
1007d3b89a
|
权限模板删除
|
2 years ago |
|
wanghaomei
|
de54b12932
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
0d17968790
|
打印模板前期修改
|
2 years ago |
|
wet
|
1a8cb1cdeb
|
打印模板权限
|
2 years ago |
|
wet
|
e7770aa659
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
25057a31ef
|
excel模板
|
2 years ago |
|
jianghaiqing
|
2deb39c434
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
3f3f3ca5a7
|
修改订舱EDI补充信息，增加订舱人说明、（欧盟港口、伊朗港口、KHI），南美东，巴西线木质包装情况
|
2 years ago |
|
wet
|
5f47364a48
|
打印模板
|
2 years ago |
|
wet
|
b8f85fd072
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
62bdfc19cb
|
修改我的任务统计
|
2 years ago |
|
wet
|
127977ff34
|
模板权限
|
2 years ago |
|
wet
|
25f0da3e3e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
fb0f2ab637
|
修改我的任务统计
|
2 years ago |
|
wet
|
d20dd1f3b0
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
bf4b98f911
|
excel模板
|
2 years ago |
|
jianghaiqing
|
530dba46da
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
30ada3bb2a
|
修改EDI，增加需要场站EDI的精确判断，PIL&CNTAO
|
2 years ago |
|
wet
|
ddb5c37729
|
模板权限
|
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
|
ce27afea8c
|
打印模板允许不修改文件
|
2 years ago |
|
wanghaomei
|
0740690918
|
打印模板查询bug
|
2 years ago |
|
wanghaomei
|
7f0ddf5c1e
|
打印模板主分单条件
|
2 years ago |
|
wanghaomei
|
ae3383436d
|
订舱打印模板主分单bug
|
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 |
|
wanghaomei
|
c01c2d45b1
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
101ce04b18
|
收发通模板修改
|
2 years ago |
|
wet
|
8191b10cde
|
权限
|
2 years ago |
|
wet
|
7ff72682df
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
2bb8117935
|
ETD去掉时分秒
|
2 years ago |
|
jianghaiqing
|
32d3f4f28a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
c45017ff70
|
修改EDI的生成方法，增加字段null报错问题
|
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
|
9b8e388440
|
修改我的任务统计
|
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
|
77184f2c77
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
abf1d2f5d5
|
运踪调用
|
2 years ago |
|
jianghaiqing
|
08490f6758
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
d849507d63
|
修改任务方法
|
2 years ago |
|
wet
|
2dfe52abf9
|
打印模板权限
|
2 years ago |
|
jianghaiqing
|
e61cf3d8c7
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
e92dc08a79
|
修改任务新增方法
|
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 |
|
jianghaiqing
|
caa2f25f32
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
ab7c861270
|
新增任务请求方法
|
2 years ago |
|
wanghaomei
|
704dc5e552
|
放舱修改
|
2 years ago |
|
wanghaomei
|
d21f914865
|
客户详情加操作、单证等字段
|
2 years ago |
|
wet
|
7d6bc9a2ce
|
调用运踪
|
2 years ago |
|
wet
|
258f2b2b9d
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
ed83427593
|
批量调用运踪
|
2 years ago |
|
jianghaiqing
|
df40e55156
|
新增我的任务，增加相关表和数据库配置信息
|
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
|
40a6d2806f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
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 |
|
wanghaomei
|
a82adc1643
|
自动添加客户联系人
|
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
|
aece4e0672
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
712cfab5a3
|
修改调取规则的异常提示
|
2 years ago |
|
wet
|
c61b65426a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
b084e6f178
|
bookingid作为条件获取客户信息
|
2 years ago |
|
jianghaiqing
|
0ad7643a9a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
5288fbfc89
|
修改调取规则校验功能，增加基础数据的字段为空的判断
|
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
|
f6d526e23a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
fddb9cb48d
|
运踪订阅
|
2 years ago |
|
wet
|
c881f9b90c
|
权限
|
2 years ago |
|
jianghaiqing
|
e213bf8253
|
修改船公司字段，原来字段拼写错误
|
2 years ago |
|
wet
|
0f6fe23268
|
列表
|
2 years ago |
|
wet
|
9783bef16b
|
列表展示
|
2 years ago |
|
wet
|
8057d19b88
|
权限
|
2 years ago |
|
wet
|
7c6339c2e2
|
权限
|
2 years ago |
|
wet
|
504b642ba2
|
关系人保存
|
2 years ago |
|
wet
|
084715fe39
|
关系人
|
2 years ago |
|
wet
|
b03353209c
|
关系人
|
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
|
ec47f74320
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
e845bb5697
|
运踪接口对接
|
2 years ago |
|
jianghaiqing
|
386a921c54
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
c982b2c85a
|
新增中转港的国家代码对应
|
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
|
4846349d4a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
78cdd52ab4
|
租户网站账号维护
订舱状态分类
|
2 years ago |
|
jianghaiqing
|
ba22cfae08
|
修改基础数据增加国家的处理
箱型增加分类字段（大小箱）
修改调取规则增加大小箱对应和卸货港的国家对应
|
2 years ago |
|
jianghaiqing
|
4d5a92c7e6
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
30fe2ebcb7
|
修改基础数据接口，增加航线和航线与港口的关系的新增、查询
|
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 |
|
jianghaiqing
|
632ff10e33
|
修改取值问题
|
2 years ago |
|
jianghaiqing
|
b99e945c97
|
新增航线基础、航线和港口对应关系基础数据
修改订舱的规则校验，通过卸货港匹配航线信息。
|
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 |
|
wanghaomei
|
15cc3f1747
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
5160fd7529
|
订舱实体descrip
|
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 |
|
wet
|
56bb38cab8
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
68eafd63d9
|
新增返回业务id
|
2 years ago |
|
wanghaomei
|
c55ac67c3e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
36f33b983f
|
邮箱设置、网站账号权限问题
|
2 years ago |
|
wet
|
c6422515b2
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
0bb0415ba6
|
查询条件修改
|
2 years ago |
|
wanghaomei
|
87d38a7b95
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
e0a5594f04
|
订舱打印
|
2 years ago |
|
jianghaiqing
|
f5a929b210
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
52c76540db
|
修改EDIRemark赋值
|
2 years ago |
|
wet
|
939fede35f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
012983a7a0
|
分单
|
2 years ago |
|
jianghaiqing
|
110d739901
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
c74d9f3e2b
|
修改订舱EDI代码
修改调取规则平台方法
修改配置文件
|
2 years ago |
|
wet
|
096c606831
|
分单
|
2 years ago |
|
wet
|
41ec1921ed
|
主分单验证
|
2 years ago |
|
jianghaiqing
|
ba82e79c6c
|
修改EDI的FTP发送方式，使用公用接口发送FTP报文
|
2 years ago |
|
jianghaiqing
|
3fedb785cd
|
新增FTP Client上传EDI文件
|
2 years ago |
|
wet
|
5fbb48e173
|
分单
|
2 years ago |
|
wet
|
096c6991bc
|
1
|
2 years ago |
|
wet
|
16e2590723
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
91e636be99
|
分单
|
2 years ago |
|
wanghaomei
|
ed6dd5e782
|
场站数据
|
2 years ago |
|
wanghaomei
|
2cb01c4d45
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
9083456d20
|
获取场站数据
|
2 years ago |
|
wet
|
fc72c183cf
|
缓存
|
2 years ago |
|
wet
|
8215685b89
|
系统缓存
|
2 years ago |
|
wet
|
26ada4888f
|
fujian
|
2 years ago |
|
jianghaiqing
|
81464a6c32
|
修改代码参数
|
2 years ago |
|
jianghaiqing
|
e062b4789d
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
e8e96a8cc0
|
修改测试PIL帮助类的方法
|
2 years ago |
|
wanghaomei
|
5955d722f4
|
Oops.Oh会导致插入sys_log_ex，改为Oops.Bah
|
2 years ago |
|
wanghaomei
|
a1e273e1e0
|
订舱状态
|
2 years ago |
|
wanghaomei
|
81ae057b32
|
路由名称
|
2 years ago |
|
wet
|
b094f6ce12
|
租户名称修改
|
2 years ago |
|
wet
|
907abb8363
|
日志返回数据格式
|
2 years ago |
|
wanghaomei
|
f7ee65c3cb
|
重新修改被还原的文件
样单
|
2 years ago |
|
wanghaomei
|
a02cb30a02
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
79392182e5
|
样单
|
2 years ago |
|
wet
|
0c2a5cb181
|
缓存
|
2 years ago |
|
wet
|
e7b1f69176
|
缓存
|
2 years ago |
|
jianghaiqing
|
baa07e43fa
|
修改参数
|
2 years ago |
|
jianghaiqing
|
40428951c0
|
开启规则请求
|
2 years ago |
|
jianghaiqing
|
ead536c4ec
|
修改请求方法参数
|
2 years ago |
|
wanghaomei
|
d8c4d2e6cd
|
下货纸异步
放舱发送
|
2 years ago |
|
wanghaomei
|
2c2a198681
|
放舱发送
|
2 years ago |
|
jianghaiqing
|
76a562f1e8
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
7245fa73aa
|
修改说明
|
2 years ago |
|
wanghaomei
|
1fea7bb844
|
订舱关系人
|
2 years ago |
|
jianghaiqing
|
dd9d9f7ec5
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
9f9b14dbf1
|
修改EDI的Helper
|
2 years ago |
|
wanghaomei
|
40f2930eb9
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
21f56c88b9
|
发送下货纸
|
2 years ago |
|
jianghaiqing
|
1c1120a729
|
修改命名空间
|
2 years ago |
|
jianghaiqing
|
e11a01c388
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
d50d6c4187
|
1、新增订舱、截单EDI对应的model
2、修改订舱、截单EDI增加PIL生成报文功能。
|
2 years ago |
|
wanghaomei
|
0f592296c8
|
改列报错
|
2 years ago |
|
wanghaomei
|
644cc6ef2a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
c5d87080c4
|
VGM直发
|
2 years ago |
|
wet
|
158f7bb8fd
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wet
|
b5d29e8547
|
字段名称更改
|
2 years ago |
|
wanghaomei
|
17885cd453
|
VGM直发
|
2 years ago |
|
wanghaomei
|
812dd574b0
|
直发VGM
|
2 years ago |
|
jianghaiqing
|
3884cdec3d
|
新增订舱和截单EDI方法
|
2 years ago |
|
jianghaiqing
|
817687e05d
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
a7f0fefdf7
|
新增订舱和截单EDI方法
|
2 years ago |
|
wet
|
ca94d57c1f
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
5bb65e3489
|
租户参数
|
2 years ago |
|
wanghaomei
|
e5f5e7211e
|
link
|
2 years ago |
|
wanghaomei
|
5072ae1cb9
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
f3b87316c2
|
订舱关系人
vgm、vgm&si链接
|
2 years ago |
|
wet
|
2560729dd8
|
查询条件
|
2 years ago |
|
wanghaomei
|
320e58e34b
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
7df5128c35
|
放舱链接
|
2 years ago |
|
jianghaiqing
|
2d17d6289a
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
afb3837795
|
增加请求规则引擎的集装箱和货物明细
|
2 years ago |
|
wanghaomei
|
af7ad0a5e3
|
region
|
2 years ago |
|
wanghaomei
|
996c979382
|
提箱小票
|
2 years ago |
|
wanghaomei
|
323dcfd7cf
|
小票
|
2 years ago |
|
wanghaomei
|
3646699481
|
提箱小票
|
2 years ago |
|
wanghaomei
|
83540877bd
|
ErrorCode
|
2 years ago |
|
wanghaomei
|
d152e4e551
|
小票
|
2 years ago |
|
wanghaomei
|
3ca6171f7d
|
提箱小票
|
2 years ago |
|
wet
|
e1b879af2e
|
枚举提示修改
|
2 years ago |
|
wanghaomei
|
681099c7ad
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
d450d80a0b
|
下货纸
钉钉客服消息模块
|
2 years ago |
|
wet
|
d8cb5d6970
|
字段修改
|
2 years ago |
|
wet
|
544c32a97f
|
公共类
|
2 years ago |
|
wet
|
33b26cd540
|
公共类缓存
|
2 years ago |
|
wanghaomei
|
81fb3d49af
|
下货纸、链接、样单
|
2 years ago |
|
wet
|
88e362dbb2
|
注释
|
2 years ago |
|
wanghaomei
|
695e351520
|
冲突合并
|
2 years ago |
|
wanghaomei
|
b8e62b295a
|
订舱打印模板
打印模板测试
|
2 years ago |
|
wet
|
8e77f46364
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
ae5c81b4d6
|
货运动态
|
2 years ago |
|
wet
|
ca6ac450ca
|
货运动态
|
2 years ago |
|
jianghaiqing
|
b2d10e8682
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
fe2ba94818
|
修改订单调取规则引擎，增加海运订舱的实体类对应mapper
|
2 years ago |
|
wanghaomei
|
c9c65fd8be
|
下货纸文件
|
2 years ago |
|
wanghaomei
|
7d853e8496
|
打印模板修改
|
2 years ago |
|
wanghaomei
|
b233c6cefa
|
EDI
|
2 years ago |
|
wanghaomei
|
3755ab2ce3
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
41c709da60
|
下货纸
|
2 years ago |
|
wet
|
827bba193e
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
f5419bb354
|
缓存
|
2 years ago |
|
wanghaomei
|
5d20d63359
|
下货纸
邮件发送
|
2 years ago |
|
jianghaiqing
|
b7266ffd98
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
bd2f3a5a8e
|
修改调取规则引擎方法
|
2 years ago |
|
wanghaomei
|
af71d511bb
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
|
2 years ago |
|
wanghaomei
|
dd591ab790
|
下货纸
|
2 years ago |
|
wet
|
1e5eddd6a5
|
缓存
|
2 years ago |
|
wet
|
ab8385dc72
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
# Myshipping.Core/Const/CommonConst.cs
# Myshipping.Core/Service/Cache/ISysCacheService.cs
# Myshipping.Web.Core/Startup.cs
|
2 years ago |
|
wet
|
300124d65a
|
字典缓存
|
2 years ago |
|
wanghaomei
|
44805ec454
|
edi参数缓存
|
2 years ago |
|
wanghaomei
|
8dc390cb8a
|
公共库缓存
下货纸
|
2 years ago |
|
wet
|
0fc07ebb40
|
货运动态
|
2 years ago |
|
wet
|
316fa2cf35
|
附件类型
|
2 years ago |
|
wet
|
f54ad444d6
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
af50e045e8
|
新增字段
|
2 years ago |
|
jianghaiqing
|
ae36d4d6bd
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
jianghaiqing
|
57e186f645
|
1、新增海运订舱调取规则平台方法和报文。
2、增加配置选项。
|
2 years ago |
|
wet
|
f0bf955242
|
修改实体
|
2 years ago |
|
wet
|
79062cef2e
|
修改实体名称
|
2 years ago |
|
wet
|
f7795b6587
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
f3040ae405
|
订舱
|
2 years ago |
|
wanghaomei
|
987e0933bb
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
97bca53938
|
文件保存相关修改
|
2 years ago |
|
wet
|
e16d147416
|
日志
|
2 years ago |
|
wet
|
eae3206966
|
订舱明细空值判断
|
2 years ago |
|
wet
|
057fad08c7
|
修改命名
|
2 years ago |
|
wet
|
58baa19c9c
|
租户参数
|
2 years ago |
|
wet
|
1ab8eb257e
|
附件 备注
|
2 years ago |
|
wet
|
2c670eefaf
|
订舱备注
|
2 years ago |
|
wet
|
1235493b42
|
日志
|
2 years ago |
|
wet
|
734da08aa8
|
获取日志
|
2 years ago |
|
wet
|
67766cd1e1
|
日志
|
2 years ago |
|
wet
|
3f283ba9b6
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
b2a7be38de
|
权限
|
2 years ago |
|
wanghaomei
|
4a125ee783
|
打印模板维护
|
2 years ago |
|
wanghaomei
|
581bf7c6df
|
订舱加主单号和租户名称
|
2 years ago |
|
wet
|
695bc01b52
|
订舱
|
2 years ago |
|
wet
|
b329c27472
|
订舱
|
2 years ago |
|
wanghaomei
|
4466296ba3
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wanghaomei
|
80972e5ded
|
订舱模板维护
|
2 years ago |
|
wet
|
1ba883dc15
|
Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
|
2 years ago |
|
wet
|
0db8814a96
|
订舱
|
2 years ago |
|
wanghaomei
|
057bc9f326
|
用户自定义设置
|
2 years ago |
|
wanghaomei
|
3a5a480f75
|
订舱客户
|
2 years ago |
|
wanghaomei
|
2be8cfb8b3
|
订舱客户
订舱自定义配置
|
2 years ago |
|
wanghaomei
|
e90b2e2bca
|
apiuser
action事务
|
2 years ago |
|
wanghaomei
|
2f9a1add26
|
用户密码改为DES加密
|
2 years ago |
|
wanghaomei
|
8d55d73727
|
箱信息、多品名
|
2 years ago |
|
wanghaomei
|
b0d978be08
|
订舱主表
|
2 years ago |
|
wanghaomei
|
5c363a58c1
|
修改命名空间
|
2 years ago |
|
wanghaomei
|
fbcc5d6367
|
初始提交
|
2 years ago |