Commit Graph

571 Commits (af837fea9d2976c9ae61038daf2526db32ba63d8)

Author SHA1 Message Date
wanghaomei e14e6d7796 货物状态配置 2 years ago
wet c60343f3ba 服务项目 2 years ago
wet 94c1787ed3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 608671235a 批量删除 2 years ago
wanghaomei 845afa71cb codeport中航线字段 2 years ago
wet a83e717b53 批量操作 2 years ago
wet cf45a93cbb 查询时间 2 years ago
wet 025122b899 中午校验 2 years ago
wanghaomei 4cccc9085b 目的港,增加航线数据返回 2 years ago
wanghaomei 88f12b7143 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei f1115d92e4 租户航线 2 years ago
wet dbe74c5cea 控制中文 2 years ago
wet a39c11ab23 查询 2 years ago
wet 4edb266d21 中文字符 2 years ago
wet 4ffe57b485 服务项目 2 years ago
jianghaiqing da045a7270 修改EDI配置 2 years ago
jianghaiqing da1c46cb8e 修改FTP配置,增加发货方代码,修改EDI 2 years ago
wet 692350b594 服务项目 2 years ago
wet da7d9a860b 服务项目 2 years ago
wet 5acaae4493 查询标识 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
wanghaomei 7bab906c84 下货纸问题 2 years ago
wanghaomei 92792075e9 字典相同值不允许保存的问题 2 years ago
wanghaomei 519e1c91de 自定义配置批量拉取接口 2 years ago
wanghaomei cd517ec6fa 发送方别名 2 years ago
jianghaiqing e5d6d4068d 修改EDI 2 years ago
wanghaomei 9a5681151c EDI设置修改 2 years ago
wet 4633181eb1 映射 2 years ago
wet 42a697a037 bookingno 2 years ago
wet cd44ff1c80 新增过滤重复 2 years ago
wet 8fa7222ffe 船代新加字段 2 years ago
wet bbd6e6fe32 场站 2 years ago
wet d0de4aeefa 用户导出 2 years ago
wet 34b90d418c 公共库修改 2 years ago
wet ec169fb992 合川修改 2 years ago
wet b2559d629c 修改忽略租户名称 2 years ago
wet ff5b2e9657 获取列表字段 2 years ago
wet 9341fc7a01 excel导入 2 years ago
wet eee388369e 用户 2 years ago
wet 0b55e216cf 获取用户 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 6bdade7cd8 权限名称查询 2 years ago
wet 91b99d26ac exce 2 years ago
wanghaomei ef9cf13414 下载打印模板放开AllowAnonymous,解决前端保存文件乱码的bug 2 years ago
wet 35246de5fa excel样式 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 a2c4fc8a6b 权限 2 years ago
wet 05ffeb287c 船期 2 years ago
wet ac2f353aca Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Application/Myshipping.Application.xml
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
wanghaomei 2857eaa867 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 8f0643f615 API接口授权编辑与验证 2 years ago
wet 1b59fb5a6a 船期 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
wanghaomei 645534fcf7 api授权接口 2 years ago
wanghaomei 15d221df26 API授权
数据同步接口
2 years ago
wanghaomei 880025aa16 API授权接口 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
wet df5ba79d84 公共库 2 years ago
wet 345d85a354 模板查询条件 2 years ago
wet e14221da23 船期 2 years ago
wet 1889c75f88 公司参数 2 years ago
wet aa954a475d 租户参数 2 years ago
wet a863bc80b0 公共库返回条数 2 years ago
wet c301401e25 公共库返回数据 2 years ago
wet 1086342c91 excel 2 years ago
wet 7f82fe19f2 船期 2 years ago
wet 2831c5483a 定时删除 2 years ago
wet 8a1cf589db 删除临时文件 2 years ago
wet ab8a92db6e 公共库sort 2 years ago
wet 777bc1b204 公共库排序 2 years ago
wet 42b24b2553 excel 2 years ago
wet 5572feb867 excel 2 years ago
wet 9f1b491e1c excel 2 years ago
wet 5cf7f17cb3 船期 2 years ago
wanghaomei ae3383436d 订舱打印模板主分单bug 2 years ago
wanghaomei a40e6c20a3 放舱信息加字段
客户信息加提单信息字段
打印服务增加放舱信息等内容
2 years ago
wet 8191b10cde 权限 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 2dfe52abf9 打印模板权限 2 years ago
wet e42c6bcf40 权限 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 d21f914865 客户详情加操作、单证等字段 2 years ago
wet ed83427593 批量调用运踪 2 years ago
wet 9b2742e749 公司默认值 2 years ago
wet 14ec1d1086 船期手工维护模块 2 years ago
wet 47b9e7d095 船期 2 years ago
wet 1e8cbf1703 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 6d0964f325 船期信息 2 years ago
wanghaomei d55a553ddc 客户模块,增加操作、单证、销售、客服等字段 2 years ago
wanghaomei 3a3bd62893 打印文件名称格式 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 aa02095c50 公共接口编辑 2 years ago
wet 580b22a78e 1 2 years ago
wet c4d8d06e92 取消缓存 2 years ago
wet b8af649560 权限 2 years ago
jianghaiqing 289ba48e2c 修改航线的查询问题 2 years ago
wet c881f9b90c 权限 2 years ago
jianghaiqing 1d9c10043b 修改国家的查询方法。 2 years ago
jianghaiqing 239e9a7210 修改基础数据国家保存方法 2 years ago
wet 8057d19b88 权限 2 years ago
wet 7c6339c2e2 权限 2 years ago
wet efb6dd3943 排序 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 aa50af6a1d 公共库 2 years ago
wet 72aae2e2e3 1 2 years ago
wet a9b2685d4e 公共接口 2 years ago
wet b05edcffba webaccountconfig 修改 2 years ago
wanghaomei c91972a1c4 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei cb15519151 租户公司统一维护客户信息,根据权限范围查看 2 years ago
wet 388b13cb48 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet cceee85b96 更改用户信息登录 2 years ago
wanghaomei 4846349d4a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 78cdd52ab4 租户网站账号维护
订舱状态分类
2 years ago
jianghaiqing f523aea66b Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
jianghaiqing ba22cfae08 修改基础数据增加国家的处理
箱型增加分类字段(大小箱)
修改调取规则增加大小箱对应和卸货港的国家对应
2 years ago
wet ebf7212f53 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 0dff128323 下拉 列表 2 years ago
wanghaomei 99485b7327 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 10097d00d9 客户关键字查询 2 years ago
jianghaiqing 30fe2ebcb7 修改基础数据接口,增加航线和航线与港口的关系的新增、查询 2 years ago
wet 0c67668cc0 包装排序 2 years ago
jianghaiqing f790521b20 修改表名 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
jianghaiqing b99e945c97 新增航线基础、航线和港口对应关系基础数据
修改订舱的规则校验,通过卸货港匹配航线信息。
2 years ago
wet a1851f53a1 公共库去重 2 years ago
wet 86c5157abe 公共库去重 2 years ago
wet 5fb5b518fb 定时任务 2 years ago
wet 9feef13592 定时任务 2 years ago
wet 77881c8d3f 定时任务 2 years ago
wet 1866559ed0 定时删除临时文件 2 years ago
wanghaomei c267b4eaa6 临时文件配置 2 years ago
wet e7da66b958 缓存处理 2 years ago
wet 4727b73dc5 缓存 2 years ago
wet 95e3a3ff01 EDI缓存 2 years ago
wet 65448b127b 清除打印日志 2 years ago
wet 5f08c4c574 公共类关键字 2 years ago
wet 444ac6000a Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet bafb4e6f3c 返回业务id 2 years ago
wanghaomei 4799a24047 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 8b0e221506 EDI参数设置问题 2 years ago
wet b72ea8f6d3 获取租户下的所有用户 2 years ago
wanghaomei 36f33b983f 邮箱设置、网站账号权限问题 2 years ago
wanghaomei 6643043c7e 字典权限问题 2 years ago
wanghaomei 57e66259a2 字典前端问题 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
wanghaomei 13e07d73a5 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 45f81cf835 EDI参数设置修改 2 years ago
wet 3db77474bf 缓存方式变更 2 years ago
wanghaomei 68eb2101a1 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Web.Core/Startup.cs
2 years ago
wanghaomei 60cfa69c75 启动缓存 2 years ago
wet c742938501 系统缓存 2 years ago
wet df66ffc6bd noaction 2 years ago
wet 8b89be29e6 模块 2 years ago
wanghaomei 2e3db1b997 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei d32d8b5212 公共库-模块 2 years ago
wet 6de547d462 公共库提示 2 years ago
wanghaomei 4d9914a377 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei a1e273e1e0 订舱状态 2 years ago
wet 8fed094cd9 船名缓存 2 years ago
wet 9d69412ebb 租户名称 2 years ago
wet b094f6ce12 租户名称修改 2 years ago
wanghaomei f7ee65c3cb 重新修改被还原的文件
样单
2 years ago
wet 0c2a5cb181 缓存 2 years ago
wet e7b1f69176 缓存 2 years ago
wanghaomei 99a81757ca Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 311b926074 邮箱查询 2 years ago
wanghaomei 9f94e152af Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei d8c4d2e6cd 下货纸异步
放舱发送
2 years ago
wet 96c1df079e Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 0077ccd74b 实体更改 2 years ago
wanghaomei 2c2a198681 放舱发送 2 years ago
wanghaomei 1fea7bb844 订舱关系人 2 years ago
wet 1309b0b142 条件更改 2 years ago
wet 2c8b92d4fb 租户参数查询条件更改 2 years ago
wet ba25ef47e7 参数大类 2 years ago
wet 654cd9769e 参数 2 years ago
wet 74ac6b4019 租户参数 2 years ago
wet 8eca47f20a 租户参数 2 years ago
wet 5bb65e3489 租户参数 2 years ago
wet 2560729dd8 查询条件 2 years ago
wet 602334a8ca 公共库 2 years ago
wet f82f7e476c Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 4189119ae6 大简云用户id 2 years ago
wanghaomei 5958834dc9 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 996c979382 提箱小票 2 years ago
wet 62fc3491b0 mappingyard 2 years ago
wet 7b72d327ab 缓存 2 years ago
wet 1e3a240754 缓存 2 years ago
wanghaomei 92af417367 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 3646699481 提箱小票 2 years ago
wet b389573d8b 场站映射 2 years ago
wanghaomei 83540877bd ErrorCode 2 years ago
wanghaomei 3ca6171f7d 提箱小票 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 fd7e0c1682 缓存 2 years ago
wet 544c32a97f 公共类 2 years ago
wet 33b26cd540 公共类缓存 2 years ago
wanghaomei 2cc36f4e0f 钉钉群配置 2 years ago
wanghaomei a53a6fd1ad 网站账号修改 2 years ago
wanghaomei 695e351520 冲突合并 2 years ago
wanghaomei b8e62b295a 订舱打印模板
打印模板测试
2 years ago
wet 8e77f46364 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet ae5c81b4d6 货运动态 2 years ago
wanghaomei 7d853e8496 打印模板修改 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
wet 4f8bde9e55 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 43289cd1d9 缓存 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 89f3875f62 缓存 2 years ago
wet 1e5eddd6a5 缓存 2 years ago
wet ab8385dc72 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan
# Conflicts:
#	Myshipping.Core/Const/CommonConst.cs
#	Myshipping.Core/Service/Cache/ISysCacheService.cs
#	Myshipping.Web.Core/Startup.cs
2 years ago
wet 300124d65a 字典缓存 2 years ago
wanghaomei 44805ec454 edi参数缓存 2 years ago
wanghaomei 8dc390cb8a 公共库缓存
下货纸
2 years ago
wet 7ff49dfc52 添加实体 2 years ago
wet 79062cef2e 修改实体名称 2 years ago
wet f3040ae405 订舱 2 years ago
wet 27aebce05b 租户参数 2 years ago
wanghaomei 2a71357808 网站账号维护 2 years ago
wet fc32f81fe6 修改命名 2 years ago
wet 057fad08c7 修改命名 2 years ago
wet 58baa19c9c 租户参数 2 years ago
wanghaomei 07ed013cc7 用户自定义配置修改 2 years ago
wet 3f283ba9b6 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet b2a7be38de 权限 2 years ago
wanghaomei 4a125ee783 打印模板维护 2 years ago
wanghaomei 581bf7c6df 订舱加主单号和租户名称 2 years ago
wet 695bc01b52 订舱 2 years ago
wet b329c27472 订舱 2 years ago
wanghaomei 4466296ba3 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wanghaomei 80972e5ded 订舱模板维护 2 years ago
wet 1ba883dc15 Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan 2 years ago
wet 0db8814a96 订舱 2 years ago
wanghaomei 79f84f0ea0 客户信息
EDI参数设置
2 years ago
wanghaomei 057bc9f326 用户自定义设置 2 years ago
wanghaomei f334652fdf 后台任务
用户同步测试
2 years ago
wanghaomei 2be8cfb8b3 订舱客户
订舱自定义配置
2 years ago
wanghaomei e0e6723453 console log 2 years ago
wanghaomei ca3942947c commondb 2 years ago
wanghaomei e90b2e2bca apiuser
action事务
2 years ago
wanghaomei 2f9a1add26 用户密码改为DES加密 2 years ago
wanghaomei 853c12fd80 公共库 2 years ago
wanghaomei af0558c550 公共库 2 years ago
wet ff37cc0ed3 获取登录用户信息添加公司信息 2 years ago
wanghaomei a7781de2e9 数据库配置修改 2 years ago
wanghaomei 5c363a58c1 修改命名空间 2 years ago
wanghaomei fbcc5d6367 初始提交 2 years ago