2109 Commits (25194a86a39fc2b305d943b5319a1ba592bc91d5)

Author SHA1 Message Date
dengyu c57eaef663 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
dengyu 74c660263b 下线操作需要审批 1 month ago
cjy 724666ec46 根据类型获取往来单位下拉及业务信息列表 修改 -去除clientList 1 month ago
cjy c4857e3eaf Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy 574bd2d263 根据类型获取往来单位下拉及业务信息列表 修改 1 month ago
嵇文龙 ee43cfdab9 导入代码 1 month ago
嵇文龙 5c5df78378 客户相关导入优化 1 month ago
嵇文龙 123b85fbce 往来单位属性增加 1 month ago
嵇文龙 d406969f67 自由结算bug修复 1 month ago
jianghaiqing db33a4e498 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
jianghaiqing 3f66026f07 修改舱位 1 month ago
douhandong 8810453dbd Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
douhandong e9b78eecbf 银行流水,进项发票 1 month ago
cjy 7e7df62599 获取当前机构银行信息 1 month ago
cjy 6a8f804162 管理端添加账号限制admin登录 1 month ago
cjy 428cc664d1 获取往来单位下拉集合列表修改 1 month ago
cjy bfe4150725 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy 66c0bb40a9 GetMultiClientList接口优化 1 month ago
dengyu c381417c08 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
dengyu c9271eab55 20241017 1 month ago
cjy 8d884e8b54 指导价、底价改为空值 1 month ago
cjy aaa5eb7108 客户数据权限修改 1 month ago
douhandong 345479d530 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
douhandong ad7aebc406 增加quartz 1 month ago
嵇文龙 2f4beb3906 自由结算返回明细列表 1 month ago
嵇文龙 84974b3591 导入客户属性标识 1 month ago
嵇文龙 d4e20b69c6 结算详情增加字段 1 month ago
zhangxiaofeng 2eb87db281 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
zhangxiaofeng cab736a314 任务台台账编号查询:1.支持任务流水号 2.改为模糊查询 1 month ago
cjy 0fa1d1dabd Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy 590bf2c21f 费用模板修改 1 month ago
嵇文龙 839a10cc52 结算增加机构银行ID 1 month ago
douhandong 10edf0066e 拉取进项发票 1 month ago
cjy aaee83a538 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy 6f6c6a2cdc 干系人数据可视权限问题 1 month ago
jianghaiqing 2c2a5705d4 修改ONE 截单报文 1 month ago
jianghaiqing 8b4806bc07 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
jianghaiqing b9d0162385 修改ONE 截单 1 month ago
嵇文龙 4ede0ec867 优化自由批量结算单据的定位 1 month ago
嵇文龙 3235975094 按业务自由结算 1 month ago
嵇文龙 2f46487d08 自由结算-根据业务编号及类型获取该票业务的币别 1 month ago
嵇文龙 4669040d84 自由结算 1 month ago
zhangxiaofeng efd9f0194d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
zhangxiaofeng 2444e381cc 如果任务类型为退舱确认,当任务完成时需要发送Cargoo 1 month ago
cjy f52e763708 根据单位获取数量箱型信息添加TEU计算 1 month ago
嵇文龙 99ead8613f 邮箱发送 1 month ago
zhangxiaofeng 5641134650 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
zhangxiaofeng f876345960 任务台流水号生成功能添加锁防止重复 1 month ago
zhangxiaofeng 0825b125e5 任务基础表:添加拓展字段插入及供查询功能 1 month ago
cjy 72834f3a18 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy 7048b7736d 海运出口编辑提单号重复判断排除改配和退单情形;改配退舱修改 1 month ago
dengyu faf61ea613 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
dengyu c54715ddac 20241015 修改基本完成 1 month ago
嵇文龙 ee9f528486 自定义邮件发送 1 month ago
jianghaiqing b5fb878673 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
jianghaiqing 7f31dcf1b5 修改cargoo 1 month ago
dengyu d2edf31a56 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy ea2939dab1 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy 696bbb6d94 单票复制海运出库单票复制修改 1 month ago
dengyu e47267d513 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
dengyu 8396422ff2 1 1 month ago
嵇文龙 5c74b7e683 去除新增客户银行的重复性校验 1 month ago
嵇文龙 9f38d372f7 发票代码API 1 month ago
dengyu 13a4cfae8d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
dengyu 1492a754e3 20241014 1 month ago
cjy afd4cb60b1 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy 49fcd467c5 创建退舱确认任务 1 month ago
嵇文龙 4e45092074 针对费用审核的特殊处理 1 month ago
dengyu 449baf2dfd 20241014 批量模板导入 增加逻辑:识别为待上线的,必须选成上线或下线才能确认执行
单程租入改为不允许录入还箱信息
1 month ago
cjy 0728712199 修改 1 month ago
cjy 580484febb 删除修改 1 month ago
cjy 7bc6495785 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
cjy e465dacee9 改配修改 1 month ago
嵇文龙 3cd2aaafe0 传入 1 month ago
嵇文龙 c942cf0817 WSL报表固定正文内容 1 month ago
嵇文龙 ab26a231b3 用户邮箱导入 1 month ago
jianghaiqing b4b65f9717 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
jianghaiqing ba33316187 修改cargoo 1 month ago
嵇文龙 d7d76c8431 根据业务获取流程操作历史 1 month ago
嵇文龙 d94c0578c1 导入客户时默认为委托单位 1 month ago
jianghaiqing 22d717368b Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 1 month ago
jianghaiqing 3f369cfa96 修改CARGOO 1 month ago
cjy 7136f2df86 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy b76d02fb92 可视权限范围修改 2 months ago
嵇文龙 a24afd50c5 WSL报表 2 months ago
嵇文龙 c1126ffe74 生成WSL报表 2 months ago
嵇文龙 d15cf21d9b 设置任务状态针对费用类型做特殊处理 2 months ago
jianghaiqing bf5d0f5b4f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing b6648c103b 修改CARGOO 2 months ago
douhandong 65c368891b Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng 496f491c78 舱位引入编号支持模糊查询 2 months ago
douhandong abbc2d9477 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
douhandong 801676b93a 增加进项发票获取详情,调整进项发票目录位置 2 months ago
cjy 84f3655d82 业务单据复制-返回前端 2 months ago
douhandong 0cf585e913 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 07f401b767 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing ce3936ecdb 修改cargoo 2 months ago
douhandong ff170abbb4 增加获取进项发票列表接口 2 months ago
zhangxiaofeng d95e0eb1e4 舱位引入接口参数及返回调整 2 months ago
cjy 11a38b6e22 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy fbd69d3ad8 改配退舱入池逻辑修改 2 months ago
嵇文龙 fd5658e20e 确定是否为最后审批人 2 months ago
zhangxiaofeng b2b8f7c633 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng cf66e332d7 SetTaskStatusWithBsno接口添加userIdList筛选参数;InitTaskJob方法在创建指定任务时判断接收人是否重复 2 months ago
cjy fc5ef6762e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy bf1c96db2d 退舱入池接口 2 months ago
嵇文龙 ace1d26afd 创建客户干系人并提交审核 2 months ago
嵇文龙 00c5659409 费用审核相关设置任务状态 2 months ago
cjy cc7249f3f3 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 4c4a596af6 退舱改配修改 2 months ago
jianghaiqing 1c343dc937 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing cb4ab83338 修改CARGOO 2 months ago
cjy cef6aecef8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 31071e4a14 修改 2 months ago
嵇文龙 e90e2c5997 自动费用模板后台任务 2 months ago
嵇文龙 6a9e2de59c 海运出口详情增加整票费用审核状态 2 months ago
cjy cb6bda2f12 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 62ac63e1f7 改配修改 2 months ago
嵇文龙 af8512c383 检查客户信息是否重复 2 months ago
嵇文龙 2a68b0b06b 自动费用模板 2 months ago
cjy 9356cd96b3 改配修改 2 months ago
jianghaiqing 2f6a637222 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 44f64d1f7b 修改CARGOO 2 months ago
嵇文龙 4b5a39305e 增加往来单位干系人数据 2 months ago
嵇文龙 5d11966440 往来单位数据导入 2 months ago
cjy 8f5757854f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 1b3dce9bb6 服务项目联动更新主单VGM\舱单、报关、派车状态 2 months ago
jianghaiqing 405a57122a 修改cargoo 2 months ago
jianghaiqing 52837d3e1c 修改BC任务,增加HPL任务相关字段 2 months ago
jianghaiqing d852e35701 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 5830c2d6b0 修改 订舱完触发状态标记 2 months ago
cjy 814536a06e 退舱改配修改 2 months ago
cjy 20511ea0b2 获取改配订单状态 2 months ago
cjy bc48eda1ed 修改 2 months ago
cjy 17db7a1756 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 94184f2a47 改配退舱修改 2 months ago
嵇文龙 eb8c3df393 整票审核列表优化 2 months ago
嵇文龙 3c1e0b45bc 整票审核bug修复 2 months ago
cjy 85bcd1229f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy f97df5c93c 退舱改配列表及详情 2 months ago
jianghaiqing 7a2b777dce 修改舱位生成订舱 2 months ago
jianghaiqing 04bc566fdd Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 234c05758d 修改舱位生成订单,没有卸货港问题 2 months ago
cjy 9b860b60e6 获取改配订单状态修改 2 months ago
cjy c1321a93a0 修改 2 months ago
cjy 0e26e82474 改配判断修改;单分单时,后续主单件重尺更新时,分单自动更新,多票分单时不更新 2 months ago
嵇文龙 1c18921194 费用统计bug修复 2 months ago
嵇文龙 23783f9ba9 运维API(用于执行脚本) 2 months ago
cjy 212ebe780c Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 81264069bc 海运出口改配相关 2 months ago
嵇文龙 735289a568 往来单位干系人API 2 months ago
嵇文龙 8607e61ea3 邮件收件人增加国内发货人 2 months ago
jianghaiqing d1d65ac3e4 修改VOLTA 2 months ago
jianghaiqing 9006dbbe18 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 27d5083360 修改VOLTA 2 months ago
嵇文龙 5086f4a0ce 往来单位干系人审核 2 months ago
jianghaiqing ede507d6bb Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 6cb057c370 修改MSK API 订舱查询船期问题 2 months ago
嵇文龙 1b38fb3b5d 邮件模板删除附件 2 months ago
嵇文龙 8dc7ab5295 自动费用模板导入 2 months ago
cjy 19570f7fe9 更新主单货物状态时判断更新IsVGM IsBooking 2 months ago
cjy 74b169b330 海运出口添加IsVGM字段 2 months ago
cjy 0a79b8b3c8 对账列表批量删除修改 2 months ago
cjy 35fdd42849 海运出口提单信息添加AgentName字段 2 months ago
cjy eb63f7afb5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 44ce57d41f 对账列表批量删除 2 months ago
嵇文龙 0f8c02e103 自动费用模板费用类别数据类型修改 2 months ago
cjy 9ae00984c3 租户模块权限检测修改 2 months ago
cjy 628f257865 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 11864c1167 二级缓存修改及海运出口商品回写修改 2 months ago
嵇文龙 8768a74d26 结算代码合并 2 months ago
嵇文龙 a88e6ecef5 自动费用模板修改 2 months ago
嵇文龙 0a70ff0734 发票开出结构变更 2 months ago
嵇文龙 805f64912a 获取待结算的发票列表 2 months ago
嵇文龙 f9bf4b0a39 开票明细bug 2 months ago
嵇文龙 6e04af6a5b 还原发票申请状态 2 months ago
嵇文龙 ed5922c1e8 结算金额分配bug修复 2 months ago
嵇文龙 2b8f5ded7c 删除结算时还原申请单状态 2 months ago
嵇文龙 fad6e81e4a 发票结算详情 2 months ago
嵇文龙 3e14752753 获取发票结算详情 2 months ago
嵇文龙 7d3d52e00e 获取申请单费用明细的原始币别 2 months ago
嵇文龙 f70314c4e9 获取申请单原始币别 2 months ago
嵇文龙 4133ab0bd3 提交保存费用申请单 2 months ago
嵇文龙 0f5ff79719 仅保留新增费用明细 2 months ago
嵇文龙 cd02b873e1 更新结算金额 2 months ago
嵇文龙 b4de19d1dc 往来单位固定费用重复检测 2 months ago
嵇文龙 5ea451c0a6 根据业务ID与类型生成费用 2 months ago
jianghaiqing 75cc919a9c 修改VOLTA增加约号必填 2 months ago
jianghaiqing ba8970663f 新增cargoo 请求DTO 2 months ago
jianghaiqing 8202ddc4b9 新增cargoo API帮助类 2 months ago
jianghaiqing c352ade8f3 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 1269735ffc 打印模版列表修改 2 months ago
cjy b2af5e7b66 海运出口复制部分 2 months ago
cjy 32d1964c30 根据类型获取往来单位下拉列表 添加排序 2 months ago
cjy df21062a8c Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 14a80dafc6 费用下拉按编码排序 2 months ago
zhangxiaofeng a5866a3946 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng 343934615d 创建订舱任务时,当订舱编号或提单号不为空而自动完成任务时,将原因更新到任务上 2 months ago
zhangxiaofeng 30067b24f0 任务状态更新:取出所有状态与目标状态不一致的关系数据,进行更新 2 months ago
cjy 204fe3535f 修改 2 months ago
cjy 1fa5240f2f 海运出口修改 2 months ago
cjy b28c083651 根据类型获取往来单位下拉及业务信息列表修改 2 months ago
cjy 9474b09316 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 459751ce6c 导入昭阳港口信息 2 months ago
dengyu 1d07748dd4 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu eb739c9146 20240929_邓羽临时修改 结算部分 get、保存、获取币别 2 months ago
cjy 444f596465 修改 2 months ago
cjy b5baa19ae7 提单修改 2 months ago
jianghaiqing 4ca1b66d97 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu 33e69fb7df Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu fcd09074a6 20240929 2 months ago
jianghaiqing df6dbb910f 修改舱位生成订舱 2 months ago
cjy 9eb0c1cf7d 海运出口拆出生成海运订单接口 2 months ago
zhangxiaofeng 2a7cb676c8 支持审核的任务类型排除非工作流创建的任务 2 months ago
jianghaiqing ba7bda5478 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing b4df120039 修改订单保存,增加日志 2 months ago
zhangxiaofeng 1f08f1db07 任务台查询权限控制部分优化 2 months ago
zhangxiaofeng 6a37a77100 解决任务台筛选功能bug 2 months ago
zhangxiaofeng e2f91c2b62 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng 142fe8e8c4 去掉TaskFlowModule的BusinessStatusCode字段 2 months ago
cjy 8692b2ba11 获取任务类型列表 2 months ago
cjy f81d6818b8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy a6e31cea1b 自动推送货物状态 2 months ago
zhangxiaofeng 30e2478480 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng 6a7e9ad2f9 通过任务台创建,而非通过工作流创建的任务类型,需手动调用函数来创建驳回任务,且重新提交时不创建工作流 2 months ago
cjy 33a0c76a8b 添加退舱确认任务 2 months ago
cjy dd1ce2e56d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 45b6abd015 数据可视权限修改 2 months ago
嵇文龙 83e614622f 获取待结算的发票列表 2 months ago
嵇文龙 c8714c8654 默认结算金额 2 months ago
嵇文龙 cd1de89a5b 获取待结算的申请分页列表 2 months ago
嵇文龙 33f8b469a4 提交结算单支持部分结算 2 months ago
嵇文龙 e5e7a99976 发票详情 2 months ago
嵇文龙 f5d574b442 获取发票结算单详情 2 months ago
嵇文龙 54a7b8eccf 获取结算单分页列表 2 months ago
嵇文龙 58f8c465ce 费用申请提交结算单 2 months ago
嵇文龙 d74920e3f4 发票结算提交bug修复 2 months ago
cjy ca3b27fbca 打印模板修改 2 months ago
cjy c72a14768d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy f2a93a501f 发起退舱修改 2 months ago
zhangxiaofeng 8576b8e0ca Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy f1c1884beb Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 348e8c4bfd 退舱工作流审核修改 2 months ago
zhangxiaofeng c552aaf6f4 任务转交时设置任务个人或公共属性 2 months ago
嵇文龙 8ffbf59f3a 发票结算API 2 months ago
嵇文龙 d787ed51eb 修改注释 2 months ago
嵇文龙 7e3a430718 开票api对接完善 2 months ago
嵇文龙 c360501c38 获取待结算的发票列表 2 months ago
cjy d37d276d46 修改 2 months ago
cjy abce4264a0 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago