Commit Graph

998 Commits (bc273fe1804656c556d9f133e74079170bae72ce)

Author SHA1 Message Date
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 03e224e837 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 69936e4520 获取场站数据时校验场站填写 2 years ago
jianghaiqing 336858c0a4 修改下货纸比对 2 years ago
wanghaomei 5bcf815dc1 订舱是否占舱、业务来源 2 years ago
jianghaiqing 812c17cc9b 修改下货纸比对 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
wet de405c5d96 1 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
jianghaiqing 17eb420f92 修改EDI PIL增加商品代码 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
wanghaomei 5e1ed518cd Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
2 years ago
wanghaomei bba672b30a 航线 2 years ago
wet 432cac8932 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 025122b899 中午校验 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 a7f5b4c2a9 客户id 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 9433d26e4d 修改EDI 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
jianghaiqing a63093832f 修改WY EDI 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
wanghaomei 4143b07198 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei e6ec3a2699 编号注释 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
wanghaomei cf068f8da5 编号字段注释修改 2 years ago
jianghaiqing 813f5c5843 修改 YML批注
修改SI的备注取值
2 years ago
jianghaiqing ea631a389a 修改EDI 2 years ago
jianghaiqing 07b02f1610 订舱EDI扩展表增加新字段“第一层包装皮重” 2 years ago
jianghaiqing 6d070833ad Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing bb0b82e48c 修改EDI 2 years ago
wet d49a59a468 集装箱信息 2 years ago
wet 0081f6f4cc Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet e675d495ef 新增查询条件 2 years ago
jianghaiqing b342bb3394 修改EDI 增加EDI对应 2 years ago
wet 4d304e2fae 仓库字段添加 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 67f1abdf8b Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
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
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 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 ead536c4ec 修改请求方法参数 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 7df5128c35 放舱链接 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 ca6ac450ca 货运动态 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
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 300124d65a 字典缓存 2 years ago
wanghaomei 8dc390cb8a 公共库缓存
下货纸
2 years ago
wet 0fc07ebb40 货运动态 2 years ago
wet 316fa2cf35 附件类型 2 years ago
wet af50e045e8 新增字段 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 b2a7be38de 权限 2 years ago
wet 695bc01b52 订舱 2 years ago
wet b329c27472 订舱 2 years ago
wet 0db8814a96 订舱 2 years ago
wanghaomei 2be8cfb8b3 订舱客户
订舱自定义配置
2 years ago
wanghaomei e90b2e2bca apiuser
action事务
2 years ago
wanghaomei 2f9a1add26 用户密码改为DES加密 2 years ago
wanghaomei b0d978be08 订舱主表 2 years ago