Commit Graph

730 Commits (6994e795cffb796818137dd0ef9ce0e115e39f1a)

Author SHA1 Message Date
wet ec169fb992 合川修改 2 years ago
wanghaomei c925c491c9 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 62f3de554a 打印模板权限设置,支持多个用户同时设置 2 years ago
wet 75b5e57854 同步分单 2 years ago
wet 4cc27ebe8d 查询条件 2 years ago
wet 3fa158df78 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 9cf4c35844 我的任务-LARA导出 2 years ago
jianghaiqing 65e3fbff00 我的任务-LARA纸 2 years ago
wet fda1494692 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet c0b0089239 同步接口 2 years ago
jianghaiqing b28f238f1c 我的任务-LARA纸 2 years ago
jianghaiqing a88f179923 我的任务-LARA纸 2 years ago
jianghaiqing b73c0cdef5 我的任务-LRAR纸 2 years ago
jianghaiqing df83b6fe56 我的任务-修改任务创建任务 2 years ago
jianghaiqing 07688b25de Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing 9e5b61e0fa 我的任务-取消换船 2 years ago
wet 48621433b5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 44d71223e0 客户资料 2 years ago
jianghaiqing 4573b9aaca 我的任务-BC比对 2 years ago
jianghaiqing 9261b62d62 我的任务-BC比对 2 years ago
jianghaiqing 6ff1b48229 我的任务-VGM比对 2 years ago
jianghaiqing b7880fa0e7 我的任务-修改VGM 2 years ago
jianghaiqing c4016e3cc9 我的任务-LARA纸增加计算参数 2 years ago
jianghaiqing a6480ff6b5 我的任务-修改LARA纸 2 years ago
jianghaiqing 253f226e62 我的任务-新增LARA纸计算页数 2 years ago
jianghaiqing fe71a9cb6a 我的任务-修改注释 2 years ago
jianghaiqing 86a25c7819 我的任务-发送SI 2 years ago
jianghaiqing f0b9ba8dde 我的任务-新增BC重新比对 2 years ago
wet 80a41ba627 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet eeb2587284 同步 2 years ago
jianghaiqing 48cfc93ed1 我的任务-修改保存SI,解决日期转换问题 2 years ago
jianghaiqing 6ff5e7b7e9 我的任务-换船 2 years ago
jianghaiqing 6bd123c64c 我的任务-换船查询 2 years ago
jianghaiqing 327404095a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing c4e4da73f1 我的任务-修改换船/放弃换船 2 years ago
wet 256e0f32d4 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet b2559d629c 修改忽略租户名称 2 years ago
jianghaiqing 23aa63ff64 我的任务-修改换船通知/取消换船通知 2 years ago
jianghaiqing 5f235fef63 我的任务-修改VGM保存 2 years ago
jianghaiqing 3fba428988 我的任务-修改SI保存 2 years ago
jianghaiqing 63cf04434a 我的任务-修改注释 2 years ago
jianghaiqing 881df3dced 修改VGM比较 2 years ago
jianghaiqing d8101c1233 我的任务-修改SI保存方法 2 years ago
jianghaiqing 0606c4dfb8 修改SI比较 2 years ago
jianghaiqing f5755a4cf0 修改SI与订舱数据比较 2 years ago
jianghaiqing eb88d749b2 修改我的任务注释 2 years ago
jianghaiqing 5e143dea73 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing ddf73c2315 修改我的任务,查询我的SI 2 years ago
wet 0d8c7e2e24 运踪订阅 2 years ago
wet 72e98f4d52 打印 2 years ago
wet 74ac6bb2c0 模板 2 years ago
wet 4b80a74d96 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet b2ab4772eb 模板导入 2 years ago
jianghaiqing dbef8b5306 修改我的任务的批量下载 2 years ago
jianghaiqing c38c3679fd 增加我的人的LARA登记记录 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
jianghaiqing 07ba425b5a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 45d10c95c7 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 9341fc7a01 excel导入 2 years ago
jianghaiqing f41e30abbd 修改我的任务,单票账单查询 2 years ago
jianghaiqing 4a1578eb9a 修改我的任务的单票账单功能 2 years ago
jianghaiqing ecc3373b39 修改状态字段 2 years ago
jianghaiqing e4b5aac573 修改我的任务台账,增加状态查询 2 years ago
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