2202 Commits (4a294f7a7fad1893491aebcb3d85a76b21ad9547)

Author SHA1 Message Date
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 cfd138bffa 修改 2 months ago
cjy 614f2acb3c 打印添加释放 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 13ff64f8b3 打印模块查询问题处理 2 months ago
cjy 0a70e89391 checkapi finance添加配置 2 months ago
cjy 204fe3535f 修改 2 months ago
cjy 1fa5240f2f 海运出口修改 2 months ago
cjy 4281b9e2a6 打印模块修改 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
cjy 91827d8e43 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy f8bce14be6 打印模块修改 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
嵇文龙 c382d40a66 开票请求/冲红返回参数修改 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
cjy a7af0771b5 退舱任务审核修改 2 months ago
dengyu 05ab43fac8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu a769849a17 20240926 2 months ago
cjy 02811f006c Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 0d9b550768 退舱部分 2 months ago
cjy 47805deb7f 退舱部分修改 2 months ago
嵇文龙 6bae7e9560 根据业务编号及类型获取该票业务的币别 2 months ago
zhangxiaofeng 6262352de6 任务取消返回结果调整 2 months ago
zhangxiaofeng 8cbf6281a8 取消任务bug修复 2 months ago
zhangxiaofeng 0aeeae948e Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng 86db4bdc60 删除订单前判断是否存在关联任务 2 months ago
嵇文龙 398a164185 获取结算方式下拉 2 months ago
嵇文龙 634b88896d 发票结算的币别处理 2 months ago
嵇文龙 2a2f64b2e1 结算明细币别处理 2 months ago
嵇文龙 f2db900102 结算类重命名 2 months ago
嵇文龙 3a35708419 付费申请审核获取分页列表 2 months ago
嵇文龙 8b2a9e2533 获取待结算的付费申请分页列表 2 months ago
嵇文龙 78f57a1515 获取按票统计 2 months ago
嵇文龙 de93f8e111 发票明细计算 2 months ago
嵇文龙 6202782a5a 发票相关优化 2 months ago
嵇文龙 90d74a61d3 付费申请开户行设置 2 months ago
嵇文龙 11e1099ba7 编译错误修复 2 months ago
嵇文龙 fb79594ba9 获取申请单详情增加统计项 2 months ago
cjy 8c988914d8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy e697d01d30 租户授权mysql链接报错处理 2 months ago
zhangxiaofeng 9325d06ffa 任务完成或取消前判断当前登陆人是否为所选任务的处理人 2 months ago
cjy 241bd4b9d3 海运出口改配相关 2 months ago
zhangxiaofeng c275cf04cf 添加逻辑:是否具有指定任务列表的处理权限 2 months ago
zhangxiaofeng afba4a7647 任务台下属任务查询补充条件 2 months ago
嵇文龙 5670e50448 付费申请获取详情字段补充 2 months ago
嵇文龙 4ad106bddb 结算表重命名 2 months ago
cjy d0b36f859b Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 067a1c2a6b 海运出口添加危险品联系人及电话 2 months ago
嵇文龙 01e1a6b5a5 未结算金额 2 months ago
嵇文龙 09cacbc172 编译错误修复 2 months ago
嵇文龙 f3795672e3 付费申请GetFees补充字段 2 months ago
嵇文龙 b0ffb40a04 发票结算数据源 2 months ago
嵇文龙 5d98d15a94 GetNextConditionNodeId 2 months ago
嵇文龙 e53b6a080e 付费申请GetFees 2 months ago
嵇文龙 e432415715 获取动态节点的执行人 2 months ago
zhangxiaofeng 7ec28f5043 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng 5244e0f520 任务完成或取消时,同步个人下的任务状态 2 months ago
cjy 3108a2ddd8 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 72398d7280 退舱 2 months ago
cjy 276574b86e 退舱相关 2 months ago
zhangxiaofeng f4b028a483 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng f064de9b20 BC对比海运出口订单bug修复 2 months ago
嵇文龙 eb351dfbad 发票开票明细更新 2 months ago
嵇文龙 3e94af255f 附件名支持razor解析 2 months ago
cjy 3a80384b9e 修改 2 months ago
cjy bea0c05697 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 054a09f8df 海运退舱部分及汇率设置修改 2 months ago
dengyu 420cf517e8 20240924 2 months ago
dengyu f8bcfd6281 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu 30e425e4f2 20240924 2 months ago
嵇文龙 36057f186c 删除ApplicationDetailRelation 2 months ago
zhangxiaofeng b549b9bf50 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng bb89b21bd9 添加接口:领取任务到当前登陆人(可批量) 2 months ago
嵇文龙 070ac9d183 条件节点支持SQL语句判断 2 months ago
嵇文龙 6909573c58 新发票从发票申请中获取值 2 months ago
嵇文龙 4e2f3abce3 发票申请字段补充 2 months ago
嵇文龙 bab0002e94 自由开票bug修复 2 months ago
嵇文龙 adfef3972a 应收应付增加利润正负字段 2 months ago
嵇文龙 31bf2c3ed3 GetCurrenciesAsync方法优化 2 months ago
jianghaiqing b7f2453e2f 修改VGM 2 months ago
jianghaiqing 6bed0df48d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 41245723ec 修改VGM
VOLTA增加提单号不能大于10位的验证
2 months ago
cjy 67e62a85a1 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy d49eaa0082 获取表单设置修改 2 months ago
zhangxiaofeng 42a38dc2e9 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng e48922425d 任务台“下属”任务相关接口集成权限范围 2 months ago
嵇文龙 d7510500c0 获取申请单统计信息 2 months ago
dengyu eb29767210 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu c5324bdf51 20240923 2 months ago
jianghaiqing 2a2e4499ef 修改获取VGM发送通道选项 2 months ago
jianghaiqing 64a69a955d Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 3e44ff2eb4 新增VGM检查 2 months ago
cjy 2b399a2bcc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
嵇文龙 1b2d845b28 发票开出 2 months ago
嵇文龙 0e613ba3f5 获取发票申请详情bug处理 2 months ago
嵇文龙 e7f16d7b0a 开票币别处理 2 months ago
嵇文龙 a7b76a402c 更改发票Dto 2 months ago
嵇文龙 d2d1923195 发票申请查询bug 2 months ago
cjy 5adbb97c5c 获取机构修改 2 months ago
jianghaiqing b9b975b5ed Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 0611f14056 修改VOLTA 2 months ago
cjy 5441b21e18 打印模板修改 2 months ago
嵇文龙 dbad47b959 获取客户银行下拉接口 2 months ago
zhangxiaofeng 64bbe7b290 任务台查询Select修改 2 months ago
zhangxiaofeng 123d94e185 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng fc5ad9bdb7 任务台下属任务 2 months ago
嵇文龙 cf54eda7d5 获取发票详情 2 months ago
嵇文龙 a6332e1f18 修复若干bug 2 months ago
cjy cf34d2d113 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu c5ae5e7bc6 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
dengyu 342e5931b3 20240920初步开发完成 2 months ago
cjy 719ac059bc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 247f83f542 海运出口业务状态修改 2 months ago
jianghaiqing 032fee1d83 修改VOLTA 2 months ago
zhangxiaofeng 478549a793 BusinessStatus长度 2 months ago
zhangxiaofeng 01d177e003 补充 2 months ago
zhangxiaofeng a783ba49af Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng 6c118d52a1 货物状态更新时保存编码 2 months ago
jianghaiqing 652aa05352 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing f828c87051 修改VOLTA 2 months ago
嵇文龙 32f73b5b57 消防名称映射 2 months ago
嵇文龙 7f728c1047 增加销售方名称 2 months ago
jianghaiqing 3bbee57dbc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing aeaf76016b 修改VOLTA 2 months ago
嵇文龙 e52b195578 客户地址电话合并 2 months ago
嵇文龙 c5c33495b5 提交开票 2 months ago
cjy a914fdda3f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy b7a719313f 表单设置添加任务状态字段 2 months ago
jianghaiqing 5c9a8511c7 修改枚举 2 months ago
jianghaiqing 8b51c382ba Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 7a1764a184 修改VOLTA 2 months ago
嵇文龙 054805117a 发票增加字段 2 months ago
zhangxiaofeng f4eaf9b3ce 获取登陆人相关的任务统计信息接口:添加任务匹配判断条件 2 months ago
zhangxiaofeng 4bfb3d073b Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
zhangxiaofeng f4802ea90c 任务台台账部分字段取值逻辑调整 2 months ago
jianghaiqing e00efe4fdc Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 405f7bf73d 新增VOLTA的EDI订舱、截单
增加订单保存事务日志
2 months ago
cjy 19fa4c1b85 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy f0d80c9b2a 数据权限前端条件传值为空处理 2 months ago
嵇文龙 4f6e7ffa05 补充末次合作时间 2 months ago
cjy 65001546b5 打印修改 2 months ago
cjy bb1bd8e7d5 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 80436fc32a 数据权限修改及海运出口新增委托编号有值不生成编号 2 months ago
嵇文龙 2d7f81b3d5 去除多余命名空间 2 months ago
嵇文龙 85b90935e9 获取开票分页列表更改数据结构 2 months ago
嵇文龙 4e3738845e 海运出口任务增加撤销 2 months ago
嵇文龙 b26086022e 发票开出获取分页列表 2 months ago
zhangxiaofeng 3ba75c771d 获取服务项目下的状态列表添加排序 2 months ago
jianghaiqing 38c27a58ea Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
jianghaiqing 5cd89bd7d1 修改截单判断 2 months ago
zhangxiaofeng fbfc7fa2e3 任务创建时,设置任务创建时关联的货物状态为完成 2 months ago
jianghaiqing 0eb5807c70 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 39db6f1d1e 海运出口编码规则按开船日期取值 2 months ago
cjy 693f960b56 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago
cjy 63f695c5ef 放舱派车信息修改 2 months ago
嵇文龙 c38d45a872 任务存在提示 2 months ago
zhangxiaofeng b6517f1b9a 解决SetTaskStatus方法超时问题 2 months ago
zhangxiaofeng d94798ba1b 合并 2 months ago
zhangxiaofeng 3a29d25c37 任务台查询去掉订单软删除过滤条件 2 months ago
zhangxiaofeng 00f5934f3a 任务流水号取值方式调整 2 months ago
嵇文龙 da05ffac25 任务审核自动通过 2 months ago
嵇文龙 9910d4e0db 增加登录账号显示 2 months ago
cjy c08570602f Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 2 months ago