Commit Graph

713 Commits (1d852ec937304f0d1a83e83fd2f5ca7736183849)

Author SHA1 Message Date
jianghaiqing fe956673bf 修改我的订舱台账,增加任务分类查询 2 years ago
jianghaiqing bb7bd60c27 修改我的任务统计 2 years ago
jianghaiqing f6afed9eba 修改我的任务台账 2 years ago
jianghaiqing 59fc9a6f70 修改我的任务台账和统计 2 years ago
jianghaiqing df4b5eed4a 修改我的任务下的航次账单功能 2 years ago
jianghaiqing 610994fdcb 修改规则调取增加规则类型排序,优先展示ERROR 2 years ago
wet 2b6f536d97 件数合计 2 years ago
wet c5028a754a xml忽略 2 years ago
wet 9d9fe3af5a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing f58c0e8403 修改注释 2 years ago
wet 997f745efa Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet f9092e0b1d 件重尺 2 years ago
jianghaiqing 0834a6125d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 634632afba 修改我的任务 2 years ago
wet 14ff663102 订舱 2 years ago
wet d27ab7092e 订舱同步接口 2 years ago
wet 797587b7f6 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet feb1c8c011 同步数据 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
wet 7ac511ecb5 模糊查询大小写 2 years ago
wanghaomei 1f42205617 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei baa35017d7 打印文件名 2 years ago
wet 4fea1be62f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 8ea6c558d6 displayName 2 years ago
jianghaiqing 5c246fa570 修改我的任务增加发送下货纸 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 6bdade7cd8 权限名称查询 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
wanghaomei 90bce86274 打印模板下载文件名乱码 2 years ago
wanghaomei a1f84c3ead 打印模板下载问题 2 years ago
jianghaiqing 4a8832f923 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 5ae1a75c9b 新增下货纸 2 years ago
wanghaomei ef9cf13414 下载打印模板放开AllowAnonymous,解决前端保存文件乱码的bug 2 years ago
wet 35246de5fa excel样式 2 years ago
wet ad0b5984c8 大隐 2 years ago
wet 9785842e2d 打印 2 years ago
wet f3c282c09a 更改表名 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 811d45df43 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet ca0d8bbc67 ATD 2 years ago
jianghaiqing e5d2bf7b6f 合约号保存去掉不允许重复判断 2 years ago
wet 48ce4cf36d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 41926d6c0e ATD同步更新 2 years ago
jianghaiqing 8bb1bacad8 修改参数台账的更新日期显示,品名分类增加代码不能重复判断 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
jianghaiqing 45113d2b34 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing a85f7ed2da 修改品名分类删除功能 2 years ago
wet 60b28b86d3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet e8b2504faf 权限列表 2 years ago
jianghaiqing 7466dc51c5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 5b76cfd150 修改LARA PAPER 2 years ago
wet 58ed882a94 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet a2c4fc8a6b 权限 2 years ago
jianghaiqing be325a2790 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 36ea06fb08 修改LARA提单纸登记 2 years ago
wet 5204076e2a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 9431dd8f52 LARA PAPER 2 years ago
jianghaiqing 48579b8cf5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 779fbb4d41 修改约号、品名、品名分类台账查询 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
wanghaomei 1845a44888 秘钥重置 2 years ago
wet be5b1bdaa6 同步接口 2 years ago
wanghaomei 2857eaa867 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 8f0643f615 API接口授权编辑与验证 2 years ago
wet 0e616a298d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 1b59fb5a6a 船期 2 years ago
jianghaiqing 17d9163bac Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing f2c8d33523 新增LARA登记 2 years ago
wet 3379c51fcb Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet e7084683ae 包装映射 2 years ago
jianghaiqing ab861a22a7 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing d281f42091 新增提单纸页数计算 2 years ago
wanghaomei 645534fcf7 api授权接口 2 years ago
wanghaomei 15d221df26 API授权
数据同步接口
2 years ago
jianghaiqing d742209b3f 修改参数保存增加验证 2 years ago
wet 067b2ac07c 模板映射 2 years ago
jianghaiqing db823ba9d3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 121e920d9b 修改约号保存 2 years ago
wanghaomei eace5ca321 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Myshipping.Application.xml
#	Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs
2 years ago
wanghaomei ebbc43d37b API授权 2 years ago
jianghaiqing 9bf0eb98eb 修改EDI 2 years ago
jianghaiqing c451aa52aa 修改约号、品名参数 2 years ago
jianghaiqing c09f750dd0 订舱DTO,增加品名代码、品名 2 years ago
jianghaiqing aa2d7f86fe 订舱主表增加品名代码、品名字段 2 years ago
wet 0fb62cad62 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 345d85a354 模板查询条件 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
wet db58ad91e3 权限 2 years ago
wet 688cb0fc66 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet aa954a475d 租户参数 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 cf32924be1 副本件数 2 years ago
wet 05c14a5d99 副本分数 2 years ago
wet 1da389fe43 xml 2 years ago
wet 50fc06c8b0 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet e6cee7cf94 excel daochu 2 years ago
jianghaiqing 9aff478d98 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 74d7d65731 新增我的任务的完成、挂起、取消功能 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
wet 1086342c91 excel 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
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