762 Commits (34644b53486c1dc4b85453503387e1fedc1363fb)

Author SHA1 Message Date
jianghaiqing 48f1b8fd61 修改INTTRA订舱 3 months ago
jianghaiqing b0809a1479 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing c4b5c5f6fc 增加订舱集装箱校验 3 months ago
cjy 320358c7b9 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 73a602490d 海运出口列表可视数据权限实现 3 months ago
jianghaiqing dfd4820264 修改亿通截单 3 months ago
jianghaiqing 102f618619 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 6045af7cf6 修改亿通截单 3 months ago
嵇文龙 ff0a271a64 审核任务驳回时更新驳回理由 3 months ago
jianghaiqing 9f6cfa81b3 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 05f94b4d13 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 83613772c5 修改ONE的YT截单 3 months ago
嵇文龙 ce9fb01862 工作GetNextConditionNodeId方法bug修复 3 months ago
嵇文龙 a96d8022ac 命名空间冲突解决 3 months ago
jianghaiqing 1295a6b100 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 782136f26b 修改易通截单 3 months ago
cjy d166f870cc 回写商品信息修改 3 months ago
cjy 1d2e94eb94 海运出口日志结构修改 3 months ago
cjy 313c3633d6 海运出口保存回写商品信息 3 months ago
cjy d07e0abb2e 复制单据单号重新赋值修改 3 months ago
cjy fec26482a2 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 758f2d71cd 可视数据权限调整 3 months ago
嵇文龙 a2d70cc517 批量创建关联任务存在时返回提示 3 months ago
嵇文龙 a7c0fa68de 增加用于发送邮件的任务动作 3 months ago
嵇文龙 0dbc57ca25 二次提交审核bug修复 3 months ago
嵇文龙 f2c67d6b80 撤销后审核bug 3 months ago
cjy 5ae607af2e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy ea02724b8c 数据权限修改,优化字段、列表初始化权限、指定权限范围等;获取机构用户树;海运出口复制单号处理;角色代码唯一判断修改;合约号下拉添加船公司传值 3 months ago
zhangxiaofeng 13d213faed Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 8f3025b6d4 任务台台账相关 3 months ago
jianghaiqing 13144a9ae6 修改INTTRA 3 months ago
jianghaiqing 13f9a7bcfe Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 5ea350f6d0 修改INTTRA 3 months ago
cjy 2822c8a5cc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 06e30198b8 海运出口复制单据单号重新赋值 3 months ago
嵇文龙 a0b486dae1 根据业务ID和类型获取模板所需数据 3 months ago
cjy 602ff7a527 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 5078e44e4b 提单差异修改 3 months ago
嵇文龙 b0320c3903 已使用的往来单位不更新简称 3 months ago
cjy 22b21338f5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 5dbc63b619 海运出口提单修改 3 months ago
jianghaiqing c835db87c6 修改INTTRA 3 months ago
jianghaiqing 3aa2e8f45f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing 2e7c9e4926 修改INTTRA EDI 3 months ago
嵇文龙 d9bda89dba 批量创建关联任务 3 months ago
嵇文龙 9e6fca5480 邮件模板bug修复 3 months ago
jianghaiqing 98fe643efb 修改发送订舱校验 3 months ago
cjy 0222f6a240 揽货人下拉添加来源及来源明细 3 months ago
jianghaiqing b49cc048e9 修改同步东胜功能 3 months ago
jianghaiqing 88a4bab957 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing d4b6c7872f 新增订单扩展状态表 3 months ago
cjy 246a765131 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy a59921842c 海运出口处理订单联系人添加国内发货人 3 months ago
嵇文龙 0098fd8e60 往来单位增加若干字段 3 months ago
cjy 0c3fd95f86 订单编号根据揽货人编号生成 3 months ago
jianghaiqing d6d41ec659 修改BC 3 months ago
jianghaiqing 690aa31b9d 1、新增同步东胜7功能
2、修改BC拆单转发功能
3 months ago
嵇文龙 d0a0aac21e 邮件数据获取bug 3 months ago
嵇文龙 b3005d8fdf 提交错误修复 3 months ago
zhangxiaofeng f106af5af7 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng bcb795fc18 合约管理:合约与航线改为一对多的关系 3 months ago
嵇文龙 c3de27b7b0 根据业务ID和类型获取模板所需数据 3 months ago
cjy ce575d9899 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 4efe898c50 设置货物状态修改 3 months ago
zhangxiaofeng 9ae873a954 任务转交调整 3 months ago
zhangxiaofeng d4f4d85be4 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 1176796cea BC处理流程调整 3 months ago
嵇文龙 57e274f643 邮件模板配置服务增加渲染模板内容 3 months ago
jianghaiqing 5212151b7c 修改舱位引入 3 months ago
jianghaiqing e6871845a1 1 3 months ago
jianghaiqing 5f6c66c0ff 修改舱位引入功能 3 months ago
cjy da87e104b0 提箱小票修改 3 months ago
嵇文龙 85ec4ed040 编辑邮件模板不能保存附件设置的bug 3 months ago
嵇文龙 c30a9c356e 邮件模板配置编辑bug修复 3 months ago
zhangxiaofeng 00ee9f7fd1 任务台委托编号字段名称调整 3 months ago
zhangxiaofeng 5131013463 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
zhangxiaofeng 55d80e23de 创建任务时如果接收人为空,则公共任务 3 months ago
嵇文龙 921d429663 取消任务限制必须配置接收人的判断 3 months ago
嵇文龙 ed44adf7a5 取消TransferTask的内部事务 3 months ago
嵇文龙 1ae10692a6 解除任务服务引用费用相关服务,引起autofac循环引用的问题 3 months ago
cjy 395ff4862f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy 1b41d79758 海运出口处理订单联系人删除非关联单位联系人;用户管理是否允许使用本系统字段相关修改,登录限制、用户授权数量限制等 3 months ago
嵇文龙 1a7971de73 费用/整单审核、费用修改/删除与任务台联动 3 months ago
cjy 2c47ba63ee 海运出口联系人添加手机号字段及相关修改 3 months ago
嵇文龙 fbb501e8ac 将部分动作执行的错误信息写入任务台描述 3 months ago
jianghaiqing acff0e22a1 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
jianghaiqing f1e99c8309 修改截止时间变更任务 3 months ago
cjy c30289dc28 合并代码 3 months ago
cjy 38fa586135 提箱小票及VGM链接定时任务 3 months ago
嵇文龙 f92a05efc6 邮件发送服务增加主库租户过滤器 3 months ago
cjy 9f31c36233 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 3 months ago
cjy dc91725a23 海运出口列表添加订舱状态 3 months ago
嵇文龙 3e988102e6 费用记录生成调整 3 months ago
嵇文龙 91476617ec 修复二次创建任务时,未更新任务状态的bug 3 months ago
嵇文龙 536bc8ae0e 修复重复任务判断 4 months ago
嵇文龙 0c963aa354 重复创建任务问题修复 4 months ago
嵇文龙 9bd5dac7c1 工作流撤销bug修复 4 months ago
jianghaiqing b815f26c47 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 2d29138319 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
嵇文龙 f9724d9694 创建关联任务bug修复 4 months ago
cjy aed6dcb2f0 膝盖缓存 4 months ago
jianghaiqing 4067ac5fe5 修改任务 4 months ago
嵇文龙 547bf3ae02 邮件模板增加共享 4 months ago
嵇文龙 1697824c66 任务审核批量提交与任务 4 months ago
cjy 9055417cbb Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 81600c7db2 定时任务框架部分及运踪订阅修改 4 months ago
jianghaiqing 122531e857 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 3ae47d212f 新增扣费 4 months ago
嵇文龙 a0c470b932 任务类型替换 4 months ago
嵇文龙 e8d5aa7af4 提交 4 months ago
嵇文龙 1db3a62193 工作流审核类型重命名 4 months ago
嵇文龙 408c8dbae4 冲突合并 4 months ago
嵇文龙 972d8d93a9 任务台支持全部审核类型 4 months ago
cjy d8eb24f7e9 海运出口运踪船公司映射修改 4 months ago
cjy d153cd9adc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 254e5356a3 往来单位添加所属机构名称字段 4 months ago
zhangxiaofeng 6d0bf073ac 创建任务时,保存提单号和委托编号 4 months ago
cjy 9b23876ab7 集装箱添加排序号;收发通模板接口添加往来单位收发货人信息 4 months ago
嵇文龙 4209b90845 更新费用默认人民币代码为RMB 4 months ago
cjy 57e6b9682d 放舱详情修改添加获取订单委托单位联系 4 months ago
jianghaiqing dee67a99cb 修改任务 4 months ago
嵇文龙 5dfc6d5957 自动订舱bug修复 4 months ago
嵇文龙 587ef612dc 任务日志描述修正 4 months ago
zhangxiaofeng 5730c4cfa5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng f3cd9b0d59 设置任务状态方法拓展 4 months ago
嵇文龙 bcf0902a9d 更改调用方法 4 months ago
嵇文龙 b887912827 更改任务动作执行调用 4 months ago
cjy e8defab35c 海运出口箱型箱量更新修改 4 months ago
zhangxiaofeng a7d007f96c 确保任务交互模块已授权EnsureModuleAuthorized方法添加租户Id条件 4 months ago
cjy d9909790c7 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy eb63979af0 海运出口发送放舱通知、客户收发货人类型修改 4 months ago
zhangxiaofeng d90258eb2c 租户Id取值方式调整 4 months ago
jianghaiqing 700cfe4699 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 1b34462320 修改VOLTA订舱 4 months ago
zhangxiaofeng dc3c9a7969 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng 173fc6e75d TaskService确保任务交互模块已授权Where条件调整 4 months ago
cjy cfd469154e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy c228518869 海运出口放舱通知修改 4 months ago
嵇文龙 f0bf2eab16 屏蔽审单后生成费用 4 months ago
嵇文龙 c52728c5a4 自动订舱bug修复 4 months ago
嵇文龙 2c17f3bd38 根据业务ID与类型生成费用 4 months ago
嵇文龙 282f876afc 费用模板 4 months ago
jianghaiqing 83197134a1 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 2810ba2763 修改包装映射编辑 4 months ago
cjy 012fed5808 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 53387b2202 海运出口放舱通知部分修改 4 months ago
jianghaiqing 4a2b59c145 修改MSK API 4 months ago
jianghaiqing fc9c99d59c 修改MSK API订舱,增加定时订舱 4 months ago
jianghaiqing db06c45497 修改INTTRA 4 months ago
jianghaiqing c76c47d64c Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing f1e343a301 修改INTTRA 4 months ago
嵇文龙 1d393f4e74 发送EDI失败时的参数记录 4 months ago
嵇文龙 999e2ac164 GetNextTypeAsync的现舱参数设置 4 months ago
嵇文龙 1547cb915c 获取给定任务的下一任务类型 4 months ago
嵇文龙 7f3a68b011 创建任务增加是否现舱参数值 4 months ago
嵇文龙 37bc0e01a9 触发自动订舱 4 months ago
jianghaiqing c18a3b133b 修改舱位引入 4 months ago
jianghaiqing 109229d500 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing af42341d5b 修改引入舱位 4 months ago
cjy 41b6fb665d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy b8a7c5a84b 箱型二级缓存 4 months ago
jianghaiqing 1d1fe337af Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 3dca49089a 修改舱位 4 months ago
cjy 25461ff3d3 海运出口合约号二级缓存问题 4 months ago
cjy de8e51106d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy b422d12fee 舱单修改添加删除箱信息、箱信息添加HSCode 4 months ago
jianghaiqing 2194d51a1c 修改舱位 4 months ago
jianghaiqing 1a8392b5e6 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 0c97c109a6 修改库存 4 months ago
cjy e0335104be 海运出口添加所属业务部门 4 months ago
嵇文龙 23f29736f7 往来单位审核 4 months ago
嵇文龙 64fcb2c0a8 合作伙伴提交审核 4 months ago
cjy 1a53b8ce38 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy fc753d0cf2 客户联系人添加默认标识;编辑订单关系人时处理客户联系人 4 months ago
zhangxiaofeng 364a696ecc 调整任务编排BC、BCNotify文件传输方式 4 months ago
cjy 167c603daf 按模块获取表单设置列表 4 months ago
cjy 3b550112b1 收发通模板类型改为多选 4 months ago
cjy ca8de2fad5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 3c60027793 海运出口详情添加日志、表单设置、业务联系人信息;租户端登录默认首页修改 4 months ago
嵇文龙 714a938cfd 增加提单确认、SI、截单动作 4 months ago
jianghaiqing 755a837629 修改舱位保存方法 4 months ago
jianghaiqing db710e652a 新增舱位用途枚举,及提取方法 4 months ago
cjy d300826158 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy bff6402f39 海运出口修改去除机构限制 4 months ago
嵇文龙 59dfb02025 订单已有订舱编号或提单号,订舱任务直接完成 4 months ago
cjy 3d0646efa2 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 64fcd09c1f 修改获取船公司信息 4 months ago
嵇文龙 cf44eeff99 提取DJY校验规则 4 months ago
嵇文龙 ef2c7af788 增加海运出口订单映射规则 4 months ago
嵇文龙 702525061d 修复校验规则库 4 months ago
嵇文龙 84160fbfab 生成子任务方法重命名 4 months ago
zhangxiaofeng 044dda9fb3 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng 6b0c6811b0 创建服务项目子任务调整 4 months ago
嵇文龙 76ee52976b 审批完成回调更新 4 months ago
嵇文龙 5be1acfeba Revert "审核任务需要校验订单规则"
This reverts commit 75fbdd4f4c.
4 months ago
嵇文龙 501c30d06d 审批完成回调更新自动创建下一任务 4 months ago
嵇文龙 280355ab2a 放舱结束后自动完成任务 4 months ago
嵇文龙 75fbdd4f4c 审核任务需要校验订单规则 4 months ago
cjy 9e512a1085 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 79802ef5e4 修改 4 months ago
嵇文龙 6a8f68cb2a 转发BC实现 4 months ago
zhangxiaofeng 7300e67c69 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
嵇文龙 ebea641b4b 提交1 4 months ago
cjy 90b6414a28 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy 897b424630 海运出口舱单列表修改 4 months ago
zhangxiaofeng 9d7211aeb6 合并 4 months ago
zhangxiaofeng 91af5a3241 调整BC接收执行放舱流程 4 months ago
嵇文龙 fd9df6302c 提交审核调用大简云规则库 4 months ago
jianghaiqing d7a6ca900b Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng 917aded780 任务执行调整 4 months ago
嵇文龙 259b78867e 订舱动作适配 4 months ago
嵇文龙 9b634507a5 适配获取任务类型的新方法 4 months ago
嵇文龙 7c8b0f040c 任务关联创建型返回上一版本 4 months ago
嵇文龙 182b596719 修改任务完成时获取下一任务类型的配置信息 4 months ago
cjy b4a315a8d7 舱单修改 4 months ago
cjy 825eeb4ee9 舱单编辑修改 4 months ago
jianghaiqing cecf753f87 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing 11d0b28ee3 修改INTTRA 4 months ago
cjy a05dc96c08 修改 4 months ago
cjy 06821f9ffd 舱单批量保存 4 months ago
cjy 183d6ec7bb Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy f0a1afd31a 舱单接口修改 4 months ago
zhangxiaofeng 9e87f16dcd Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng b6e6663176 修改TriggerActionAsync获取的参数名 4 months ago
cjy 2b363598aa Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy d636a84b33 海运出口编辑修改 4 months ago
嵇文龙 179dac6155 增加客户端参数 4 months ago
嵇文龙 47e7145e3e 修改任务类型默认值为WAIT_SPACE_RELEASE 4 months ago
嵇文龙 05365c636f 增加手动触发任务动作方法 4 months ago
嵇文龙 08b4d5c578 放舱通道配置增加往来单位 4 months ago
jianghaiqing f531f25670 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
jianghaiqing de22223556 修改INTTRA 4 months ago
嵇文龙 6bb4cf9b8f 增加订舱类型管理API 4 months ago
嵇文龙 cec4b05e5f 邮件模板bug修复 4 months ago
zhangxiaofeng 6ab0ea6fc0 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
zhangxiaofeng f7900df6e7 BC任务调整 4 months ago
cjy 0612271eb6 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy fe69846f1d 海运出口添加来源名称和来源明细名称 4 months ago
jianghaiqing c8d6999a9f 修改INTTRA 4 months ago
jianghaiqing 6b76beacde 修改INTTRA 4 months ago
cjy 96f938a0c9 海运出口详情修改、船公司商品下拉返回助记码 4 months ago
嵇文龙 f411cf08a8 订舱委托模板 4 months ago
cjy 52a355919e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 4 months ago
cjy bf04bca19b 海运出口 场站引入优化 4 months ago
嵇文龙 c26c2f3d40 获取所需业务数据 4 months ago
嵇文龙 3f8ba4d956 根据Id获取海运出口数据 4 months ago
嵇文龙 1d875e2cea 创建服务项目动作 4 months ago
cjy 7fbc5e49a5 运综刷新订舱记录 4 months ago
嵇文龙 f77bcee54e 内容模板建立文件夹 4 months ago
cjy 1299889e6d 海运出口修改 4 months ago