Commit Graph

767 Commits (4010bd6ee551e5564deff9060247cd475185e48a)

Author SHA1 Message Date
wanghaomei 01722db9f2 AllowAnonymous 2 years ago
wanghaomei e744f912ad Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei a30053505c 数据比对 2 years ago
jianghaiqing 214ab143de 修改EDI的签单方式校验 2 years ago
jianghaiqing baaaf10b1b Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 44dca913bd 修改TSL的EDI 发送,调取接口推送EDI报文 2 years ago
wanghaomei f9c3cd5890 货物状态可以不填写完成时间 2 years ago
wanghaomei 968cfdd008 台账查询bug处理 2 years ago
wanghaomei f3afa992b3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
2 years ago
wanghaomei dbc711497f 货物状态取消的bug 2 years ago
wet 677ce92734 1 2 years ago
wet 9e0b3c08f5 1 2 years ago
wet 2051c65ce3 1 2 years ago
wet 2fad550ade 1 2 years ago
wet 296058b9c6 1 2 years ago
wet 3aab632e7e 1 2 years ago
wet 3cd243dc91 1 2 years ago
wet 1085cbd1e1 1 2 years ago
wet 6def95f3f6 1 2 years ago
wet 53e6406b95 1 2 years ago
wet c973bc32ea Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet a7e43af31e 1 2 years ago
jianghaiqing fada25d486 修改TSL EDI 增加订舱编号对应和判断必填 2 years ago
wet 7e68af1e2b 1 2 years ago
wet 1e687e3325 1 2 years ago
wanghaomei b629451ec7 sort 2 years ago
wet 8b8942543a 1 2 years ago
wet 785e20e184 1 2 years ago
wet 35481d9888 1 2 years ago
wet d7c9a7c66a 1 2 years ago
wet 27bbf5af56 1 2 years ago
wet c2a770e332 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 259f58bb5d 1 2 years ago
jianghaiqing 0a6ffc8297 修改EDI必填提示 2 years ago
jianghaiqing b80d785587 修改PIL EDI增加判断如果时订舱不写商品类型名称 2 years ago
wanghaomei 1925c02b29 引入场站数据显示ctnall 2 years ago
wanghaomei 2f0ef7379c Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 3116214632 场站引入映射 2 years ago
jianghaiqing 5aefbd30f1 修改ONE EDI增加提单份数必填校验 2 years ago
wanghaomei 493eec3ad3 小票链接日志 2 years ago
wanghaomei 0b664d13d4 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei bb89acfe7d 场站映射增加船司选项 2 years ago
wet 24909a2b2b 1 2 years ago
wanghaomei dd498a5770 放舱发送 2 years ago
wanghaomei 0bb7ea5344 放舱发送 2 years ago
wanghaomei d96365699c 放舱发送 2 years ago
wanghaomei 55db99f034 入货通知发送 2 years ago
wanghaomei 6c537acb74 引入场站,增加读取配置需要云港通和陆海通账号的场站 2 years ago
jianghaiqing a5e1cd248e 修改PIL的EDI增加判断,如果运抵日期为空,开船日期不为空,将开船日期对应为预抵日期 2 years ago
wet cdbfa0d677 1 2 years ago
wanghaomei dd8093011c 放舱加手机信息 2 years ago
wet c4c02a26a8 1 2 years ago
wanghaomei 3d2b209f2c vgm 箱型' 2 years ago
wanghaomei 3e582baff3 vgm直发报错问题 2 years ago
wet d1b3a65168 1 2 years ago
wet 2381beee31 1 2 years ago
wet 683f16e44a 1 2 years ago
wet 6aa3b9823e 1 2 years ago
wet a7907eb935 1 2 years ago
wet f5738c4836 1 2 years ago
wanghaomei a6c91543d8 获取场站数据青岛港账号密码 2 years ago
wet 35a19b12e1 1 2 years ago
jianghaiqing 139a771d89 修改订舱EDI的签单方式映射 2 years ago
jianghaiqing 45fc70ad9f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 51a581414b 修改订舱的EDI,增加签单方式映射 2 years ago
wanghaomei 2aa30a657e vgm箱型 2 years ago
wet e2a387d796 1 2 years ago
wet e9cda80bf7 11 2 years ago
wet 0186702530 1 2 years ago
wet bc62b49dee 1 2 years ago
wet a2da089b10 1 2 years ago
wet 871eb05b61 1 2 years ago
wet cd4b84adb8 1 2 years ago
wet c41a02ebf4 1 2 years ago
wet 064b6ed67d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet ec8e8317b7 1 2 years ago
wanghaomei f7ee747e00 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 6aae9fe153 删除废除代码 2 years ago
wet 973a53fe04 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 6868d66b48 1 2 years ago
wanghaomei 92215f1228 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 189c6aa2ba VGM发送取网站账号配置 2 years ago
wet 40b9dde714 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet b52d7fc85a 1 2 years ago
wanghaomei 69936e4520 获取场站数据时校验场站填写 2 years ago
jianghaiqing 1ff9bad2da Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 449db95ea9 修改下货纸比对 2 years ago
wet bbfb509817 1 2 years ago
wet 7ba4b91a45 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 009d2d7d78 11 2 years ago
jianghaiqing 8d381a8e82 修改PIL EDI修改截单的商品分类名称改为从下拉获取 2 years ago
wet a614cab968 1 2 years ago
whm 914692b227 vgm 2 years ago
whm 032e27001d vgm 2 years ago
whm 58730d4aa6 vgm增加大简云通道 2 years ago
jianghaiqing e277105098 增加下货纸比对字段,并增加忽略更新 2 years ago
wet 0807086592 11 2 years ago
wet 70576883f0 1 2 years ago
wet f8f2e1483a 1 2 years ago
wet 6fb04b9dee 1 2 years ago
wet 21a50d734b 1 2 years ago
wet 16f2ff8aed Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet b20f36106f 1 2 years ago
jianghaiqing 5f264602e6 修改ESL EDI 去掉订舱编号的填写 修改EDI扩展去掉bookingId可为空,增加数据表索引bookingId+IsDeleted惟一 2 years ago
wet 8d7e85ea8b 111 2 years ago
wet 2625d56356 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet c26a09e62d 11 2 years ago
jianghaiqing 3c1fa1e213 修改EDI 增加订舱包装和集装箱包装必须一致校验 2 years ago
jianghaiqing 98fe03430d 修改EDI ESL 2 years ago
jianghaiqing 7cf25928de 修改EDI发送FTP方法,如果为指定端口,默认为21端口,FTP服务IP如果默认是21端口不用指定端口 2 years ago
wet f64f37b185 111 2 years ago
jianghaiqing fcdfeadf9f 修改EDI发送,增加截单附件类型 2 years ago
whm 7ca66a8ccb 精确打印文件名 2 years ago
wet 99da78f02e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 6ddcbf1c51 11 2 years ago
jianghaiqing 6695f265c4 修改EDI,调整航次号的对应,所有船公司航次都取内部航次 2 years ago
jianghaiqing ca23a1a459 修改EDI PIL太平默认对应的航次取订舱的内部航次 2 years ago
jianghaiqing ee33d42795 修改EDI,修改港口映射检索方式,如果Edi code对应多条,只要其中一条有EDI code就默认适用这个目的港对应 2 years ago
wet 07c45d2725 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 9303bf73ea 1 2 years ago
whm ce652b0bb0 打印文件只带提单号 2 years ago
wet cf6b8b4f87 同步接口 2 years ago
wet 6b57152410 1 2 years ago
wet 31b9ba2204 1 2 years ago
wet 5a5e2debf0 111 2 years ago
wet 61fb0f9578 1 2 years ago
wet 656a0bfd25 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 90503c42a5 1 2 years ago
wanghaomei 464af5d99e 打印预览不能下载问题 2 years ago
wanghaomei e6cc57f3ac 预览pdf日志 2 years ago
wanghaomei 493d604cbd 预览pdf日志 2 years ago
wet f52551a9eb 11 2 years ago
wet 842bd7427c 1 2 years ago
wet 213e3fe358 1 2 years ago
wet 7f1aaa306d 1 2 years ago
wet a32e29fcd7 订舱接口修改 2 years ago
wet 98e30955fa 加载初始化 2 years ago
wet bcd0773865 1 2 years ago
wet cd34fa91fe 1 2 years ago
wet 8ca08514df 货物状态 2 years ago
wet 13828dd5c5 货物动态 2 years ago
wet 0a1f536dc6 备注 2 years ago
wet 608671235a 批量删除 2 years ago
wet a83e717b53 批量操作 2 years ago
jianghaiqing 1695c596a2 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet c20dbd3b25 同步订舱 2 years ago
jianghaiqing 10124bde64 修改EDI 去掉 PIL关于场站EDI的判断 2 years ago
wet e7194d4f7c 删除接口 2 years ago
wet 3fd5601277 首次查询标识 2 years ago
wet a39c11ab23 查询 2 years ago
wet 4edb266d21 中文字符 2 years ago
wet 4ffe57b485 服务项目 2 years ago
wet 11350bf075 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 83803524b3 查询 2 years ago
jianghaiqing da1c46cb8e 修改FTP配置,增加发货方代码,修改EDI 2 years ago
wet da7d9a860b 服务项目 2 years ago
wet d6a0dc52dd Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 5acaae4493 查询标识 2 years ago
jianghaiqing 8e4e9d355c 修改EDI 2 years ago
jianghaiqing 9db2a55cde 新增FTP帮助类 2 years ago
jianghaiqing 6b502bf430 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 228575f205 修改EDI 增加港口对应 2 years ago
wet 73479c83c3 新增ep号 2 years ago
wet aa232a3d6d 接口优化 2 years ago
wet 8f11de034b 接口优化 2 years ago
wet f6f36e2353 优化 2 years ago
wet f6d7013bfb 接口优化 2 years ago
wet 4fd0cdbb1d 客户id 2 years ago
wet a14e914d34 客户id 2 years ago
wet c391373335 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet fbbc727460 客户id 2 years ago
jianghaiqing b0b206cb31 修改EDI 增加日志记录功能 2 years ago
jianghaiqing 1b0a3ea01d 修改EDI YT 2 years ago
jianghaiqing 9c86f85ea9 修改EDI 2 years ago
jianghaiqing b39fb0f85d 修改EDI 2 years ago
jianghaiqing c931dd8fcf 修改EDI发送FTP、邮件的请求API地址没配置时增加提醒 2 years ago
jianghaiqing 5c99e8c092 修改EDI发送邮件功能 2 years ago
jianghaiqing e5d6d4068d 修改EDI 2 years ago
jianghaiqing efb2e86d83 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 3d0c15fc8e 修改EDI 2 years ago
wanghaomei 5e7259fca3 放舱vgm不支持的船司提示问题 2 years ago
wet 5a453903a7 保存服务项目 2 years ago
wet e5bb069e20 服务项目 2 years ago
wet f6c5b10058 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 2d565d55ef 服务项目 2 years ago
jianghaiqing 3451819765 修改订舱EDI 增加邮件上传功能 2 years ago
wet 8a03945837 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet fcd716392e 新增save 2 years ago
jianghaiqing 5f09dfd877 修改EDI的发送方法 2 years ago
jianghaiqing 4ef20fa5a5 修改FTP 访问 2 years ago
wet db5a21e2b1 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 7bd3e4d9ea 修改日志 2 years ago
jianghaiqing c9da0ae2dc 修改EDI帮助类,增加运输条款的EDI对应 2 years ago
jianghaiqing 917481566e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 1159806842 修改OpEName的判断 2 years ago
wet fc48daa98e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet b9fe9b57e3 查询条件 2 years ago
jianghaiqing 209626d4fa Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing fd8776d022 修改EDI的提示信息 2 years ago
wet cbaa0bbbef xuehuaid 2 years ago
jianghaiqing a4590efc2c 修改付费方式映射调取 2 years ago
wet 42a697a037 bookingno 2 years ago
jianghaiqing 813f5c5843 修改 YML批注
修改SI的备注取值
2 years ago
jianghaiqing 07b02f1610 订舱EDI扩展表增加新字段“第一层包装皮重” 2 years ago
wet d49a59a468 集装箱信息 2 years ago
wet e675d495ef 新增查询条件 2 years ago
wet ec169fb992 合川修改 2 years ago
wet 4cc27ebe8d 查询条件 2 years ago
jianghaiqing 86a25c7819 我的任务-发送SI 2 years ago
wet b2559d629c 修改忽略租户名称 2 years ago
wet 0d8c7e2e24 运踪订阅 2 years ago
wet 72e98f4d52 打印 2 years ago
wet 74ac6bb2c0 模板 2 years ago
wet b2ab4772eb 模板导入 2 years ago
wet 670c863b9f 分单信息edi 2 years ago
wet ff5b2e9657 获取列表字段 2 years ago
wet 9341fc7a01 excel导入 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
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 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