Commit Graph

631 Commits (f6c5b10058a7e60b89dadcc13ba859ac862c136d)

Author SHA1 Message Date
wet 10b525a114 excel
wanghaomei ea8e4db58d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 8c2221374b API授权启用禁用功能
wet 7b28c01dbc excel
wet 6bdade7cd8 权限名称查询
wet acf3012238 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 91b99d26ac exce
wanghaomei 83bf6d43ac 放舱提示不支持的船公司的bug
wanghaomei 90bce86274 打印模板下载文件名乱码
wanghaomei a1f84c3ead 打印模板下载问题
jianghaiqing 4a8832f923 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 5ae1a75c9b 新增下货纸
wanghaomei ef9cf13414 下载打印模板放开AllowAnonymous,解决前端保存文件乱码的bug
wet 35246de5fa excel样式
wet ad0b5984c8 大隐
wet 9785842e2d 打印
wet f3c282c09a 更改表名
wet 0ddc4fcceb Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet e15ece4bea 模板
wanghaomei 954b36e7dd 提单确认保存返回id
wanghaomei 1dd6dbf138 打印文件名称
wanghaomei 5195bbf4b1 打印文件名
wanghaomei e769b4815d 拉取打印模板bug
wanghaomei f4464c940d 拉取打印模板bug
wet 811d45df43 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet ca0d8bbc67 ATD
jianghaiqing e5d2bf7b6f 合约号保存去掉不允许重复判断
wet 48ce4cf36d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 41926d6c0e ATD同步更新
jianghaiqing 8bb1bacad8 修改参数台账的更新日期显示,品名分类增加代码不能重复判断
wet 683ee5f98c Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 92c907368f 排序
wanghaomei 912e5536fe Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 6f9e6f9bac 保存打印记录的bug
jianghaiqing 45113d2b34 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing a85f7ed2da 修改品名分类删除功能
wet 60b28b86d3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet e8b2504faf 权限列表
jianghaiqing 7466dc51c5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 5b76cfd150 修改LARA PAPER
wet 58ed882a94 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet a2c4fc8a6b 权限
jianghaiqing be325a2790 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 36ea06fb08 修改LARA提单纸登记
wet 5204076e2a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 9431dd8f52 LARA PAPER
jianghaiqing 48579b8cf5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 779fbb4d41 修改约号、品名、品名分类台账查询
wet 4e4092b78e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Myshipping.Application.xml
wanghaomei 1845a44888 秘钥重置
wet be5b1bdaa6 同步接口
wanghaomei 2857eaa867 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 8f0643f615 API接口授权编辑与验证
wet 0e616a298d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 1b59fb5a6a 船期
jianghaiqing 17d9163bac Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing f2c8d33523 新增LARA登记
wet 3379c51fcb Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet e7084683ae 包装映射
jianghaiqing ab861a22a7 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing d281f42091 新增提单纸页数计算
wanghaomei 645534fcf7 api授权接口
wanghaomei 15d221df26 API授权
数据同步接口
jianghaiqing d742209b3f 修改参数保存增加验证
wet 067b2ac07c 模板映射
jianghaiqing db823ba9d3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 121e920d9b 修改约号保存
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
wanghaomei ebbc43d37b API授权
jianghaiqing 9bf0eb98eb 修改EDI
jianghaiqing c451aa52aa 修改约号、品名参数
jianghaiqing c09f750dd0 订舱DTO,增加品名代码、品名
jianghaiqing aa2d7f86fe 订舱主表增加品名代码、品名字段
wet 0fb62cad62 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 345d85a354 模板查询条件
wanghaomei fc5a99825b Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei b915567238 region
wet db58ad91e3 权限
wet 688cb0fc66 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet aa954a475d 租户参数
jianghaiqing c3e7bc6840 修改EDI增加分单不能生成EDI判断
jianghaiqing 20ae84abde Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing dc2ac60301 修改EDI
wanghaomei 6a322f1ab1 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Myshipping.Application.xml
wanghaomei d725206e10 打印接口调整
wet cf32924be1 副本件数
wet 05c14a5d99 副本分数
wet 1da389fe43 xml
wet 50fc06c8b0 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet e6cee7cf94 excel daochu
jianghaiqing 9aff478d98 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 74d7d65731 新增我的任务的完成、挂起、取消功能
wet ff367ea1bb Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 3d95d45dd2 excel
wanghaomei 8cde73e112 打印接口统一
wet 2de926c191 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 1086342c91 excel
wanghaomei b643225e65 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 94dd9b1923 打印模块修改,增加新分类,准备废除旧版
jianghaiqing 2776e6a9ea 修改我的任务的正版下载功能
wet edfbce4e7b Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 7f82fe19f2 船期
jianghaiqing d6c7cf2342 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 7aa674e8fb 修改EDI下载
wet 2831c5483a 定时删除
jianghaiqing ab74b16e30 修改ESL的EDI生成
wet 20ad6f02e2 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 466b768847 分提单号
jianghaiqing 60db2eeb28 修改EDI枚举
jianghaiqing b09e3f4f8e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing a854e6cec7 修改EDI,增加ESL
wet 97e148bc4e 去重
wet 4c228279aa 提单号重复
wet 6eae4efc9f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 8a1cf589db 删除临时文件
jianghaiqing 986b6445fc Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 6289721fc5 修改我的任务增加正本下载
wanghaomei 158647fa8c Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 37d3ade77d 订舱打印新接口
jianghaiqing e66b5ab894 修改参数的删除功能
jianghaiqing 710afdf63c Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing f05685fec2 新增品名分类、合约号增、删、改查
wet 087a43e1de 货运动态
wet 14d0c0099f 运踪
wanghaomei 9bd70346c1 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 4757651200 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs
jianghaiqing 43b1e47b7d Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing b32c0c8f30 新增品名参数台账查询
wanghaomei 477fa6e2b8 打印模板分类
wet ab8a92db6e 公共库sort
jianghaiqing 67e282da05 完成品名参数的增、删、改,单票查询和模糊检索
jianghaiqing e2c2ae7bc6 新增参数合约号、参数品名、参数品名分类实体类
jianghaiqing 4de4118f10 修改订舱的EDI扩展字段
wet 777bc1b204 公共库排序
wet 42b24b2553 excel
wet b7d58d434c Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 9f1b491e1c excel
jianghaiqing 67c6ea7cf4 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing f35e7f3895 修改我的任务台账查询
wet 5cf7f17cb3 船期
wet cb92470059 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 1007d3b89a 权限模板删除
wanghaomei de54b12932 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 0d17968790 打印模板前期修改
wet 1a8cb1cdeb 打印模板权限
wet e7770aa659 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 25057a31ef excel模板
jianghaiqing 2deb39c434 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 3f3f3ca5a7 修改订舱EDI补充信息,增加订舱人说明、(欧盟港口、伊朗港口、KHI),南美东,巴西线木质包装情况
wet 5f47364a48 打印模板
wet b8f85fd072 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 62bdfc19cb 修改我的任务统计
wet 127977ff34 模板权限
wet 25f0da3e3e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing fb0f2ab637 修改我的任务统计
wet d20dd1f3b0 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet bf4b98f911 excel模板
jianghaiqing 530dba46da Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 30ada3bb2a 修改EDI,增加需要场站EDI的精确判断,PIL&CNTAO
wet ddb5c37729 模板权限
wet ac38b8d3c0 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 4a9a425651 打印
wanghaomei ce27afea8c 打印模板允许不修改文件
wanghaomei 0740690918 打印模板查询bug
wanghaomei 7f0ddf5c1e 打印模板主分单条件
wanghaomei ae3383436d 订舱打印模板主分单bug
wanghaomei 7bdab43027 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei a40e6c20a3 放舱信息加字段
客户信息加提单信息字段
打印服务增加放舱信息等内容
wet 04cba339c3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet aecd145321 分单
jianghaiqing 2b708197fb Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 42bca2fd6f 修改EDI的换行符
wet 8ab8bc8939 分单
wanghaomei c01c2d45b1 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wanghaomei 101ce04b18 收发通模板修改
wet 8191b10cde 权限
wet 7ff72682df Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 2bb8117935 ETD去掉时分秒
jianghaiqing 32d3f4f28a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing c45017ff70 修改EDI的生成方法,增加字段null报错问题
wet 34c41e1494 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
wet 747db48289 打印
wanghaomei d9d7f7b9dc Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Myshipping.Application.xml
wanghaomei 41830f0b63 打印模板
jianghaiqing 958fc4f440 修改EDI的提示信息
jianghaiqing 0355ab30f8 修改EDI的包装对应
wet 236e9aa50f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet 4fe47d56d9 船名映射
jianghaiqing 9b8e388440 修改我的任务统计
jianghaiqing b6f457427f Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing 2be8283970 1、增加我的任务统计
2、修改订舱EDI的包装对应
wet 47c3fd6685 运踪订阅日志
wet 77184f2c77 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
wet abf1d2f5d5 运踪调用
jianghaiqing 08490f6758 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing d849507d63 修改任务方法
wet 2dfe52abf9 打印模板权限
jianghaiqing e61cf3d8c7 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
jianghaiqing e92dc08a79 修改任务新增方法
wet a333e7f8f3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan