b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,198 Commits 4 Branches 0 Tags
3acd1afd66ca3cf246f6326f0e15b7dc71f87f52
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
b2894lxlx 54908de0f3 Merge remote-tracking branch 'websoft/dev' 2026-11-04 23:58:02 +08:00
b2894lxlxandCursor d496e42a0d ✨ 补充仓储大类金蝶分录拆分测试与字典SQL 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 23:47:01 +08:00
b2894lxlxandCursor 07cffd29ab ✨ 客商评分双模式与金蝶公司代码改回组织维护 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 23:46:19 +08:00
b2894lxlxandCursor 3100fd046c ✨ 金蝶公司代码改由业务部门配置独立维护 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 22:15:47 +08:00
b2894lxlx b488fa1a54 !11 收款结算单列表 + 金蝶+合同文档整合+ 新增仓储大类字典 
Merge pull request !11 from mindless/feature/20261103-bfi-warehouse-material
 2026-11-04 13:17:10 +00:00
b2894lxlxandCursor d1562ebb6b ✨ 合并金蝶冲销状态回写，拆分独立定时任务并支持分批 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 16:52:23 +08:00
b2894lxlxandCursor e3372d3fbc ✨ 合并收款认领合规推送，金蝶实际付款后再同步履约 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 16:44:46 +08:00
b2894lxlx e40703fc26 !8 付款特批+履约计划履约记录(付款+开票+收票+收款)+金蝶编码取A901-1供应商接口返回的number 
Merge pull request !8 from mindless/feature/20261027-hcs-bif-all
 2026-11-04 08:33:15 +00:00
b2894lxlxandCursor 69f9c9af7f ✨ 组织树独立权限、平台公司回写、合同计费客商角色与查看菜单补齐 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 03:15:42 +08:00
b2894lxlxandCursor a0e30d5834 ✨ 用户编辑支持数据管理权限多选组织并与角色权限并集 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 03:14:44 +08:00
b2894lxlxandCursor fd3ca7496d ✨ 新增业务部门配置并按平台公司生成合同号与金蝶部门码 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 21:10:45 +08:00
b2894lxlxandCursor 91dddd0e02 ✨ 合同支持甲乙丙多方客商及分客商计费 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 16:46:31 +08:00
b2894lxlxandCursor 0b2348f8fc ⚡ OA人员同步改为按工号匹配本地用户 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 16:44:06 +08:00
b2894lxlxandCursor 4d88f8913b 🐛 修复已撤回项目再提交被编辑校验拦住 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 14:28:05 +08:00
b2894lxlxandCursor 318b4f7f9a ✨ 客商档案营业执照OCR改接第三方businessLicense接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 13:31:32 +08:00
b2894lxlxandCursor 50c693e56b ✨ 新增HCS push-config接口暴露immediate-enabled开关 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 16:34:46 +08:00
b2894lxlxandCursor e93d50c27b ✨ 身份证OCR改接ShenFenZheng，回填有效期与长期有效 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 11:47:20 +08:00
b2894lxlxandCursor fc1dcb84cc 🐛 运单列表按账号项目收口，避免查看其他账号数据 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 22:44:02 +08:00
b2894lxlxandCursor 717f50a52c 🐛 业务部门可见合同与业务数据，并补齐异常处置单测依赖 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 16:22:52 +08:00
b2894lxlx b5c26609ea Merge remote-tracking branch 'websoft/dev' 
Co-authored-by: Cursor <cursoragent@cursor.com>

# Conflicts:
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java
 2026-10-29 14:07:28 +08:00
b2894lxlxandCursor ef05534114 🐛 修复项目部门可见性、费用项翻倍与配载合同匹配 
业务部门变更后本部门可查项目；清洗 freightJson 误写入的费用项并修正预结算合计；配载承运商按客户合同乙方匹配。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 14:05:07 +08:00
b2894lxlxandCursor 4b9e117c9e ✨ 新增合同变更独立单据与MK审批回写 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 18:34:09 +08:00
b2894lxlxandCursor 41a86fe335 ✨ 新增项目变更独立单据与MK审批回写 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 16:45:37 +08:00
b2894lxlxandCursor adf782401a 🐛 合并 websoft/dev：改路线重推站名并回退进行中运单配载准入 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 16:23:57 +08:00
b2894lxlx 73cb00cfac !7 fix: 更新字典sql 
Merge pull request !7 from mindless/feature/fix-sql
 2026-10-27 07:05:29 +00:00
b2894lxlx 3450799c2a !6 fix: 项目+合同对接合同系统 
Merge pull request !6 from mindless/feature/hcs-api-p0
 2026-10-27 06:24:01 +00:00
b2894lxlx 035a8500cc !5 金蝶测试问题修复 
Merge pull request !5 from mindless/feature/20261019-bfi-all
 2026-10-27 06:23:34 +00:00
b2894lxlxandCursor 8737c4b5f9 ✨ 角色菜单数据权限替代用户级组织/客商权限 
将后台数据权限迁移到角色×菜单配置，运行时按 menuCode 解析；组织树取最宽合并；停用用户侧组织与客商授权过滤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 04:05:01 +08:00
b2894lxlx 18065d6ae4 Merge remote-tracking branch 'gitee/uat' 
# Conflicts:
#	blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java
 2026-10-26 17:46:05 +08:00
b2894lxlx 7e009ac7c3 Merge remote-tracking branch 'websoft/dev' 2026-10-26 16:09:25 +08:00
b2894lxlx 8a10ffeed6 Merge remote-tracking branch 'websoft/dev' 2026-10-26 13:49:08 +08:00
b2894lxlxandCursor 81648fc659 ✨ 开票合计反算、配载承运商乙方交集与临时合同结算校验 
开票按合计金额/税率反算不含税单价（6位小数）；配载按子单客户合同甲方匹配后取承运商乙方交集；临时合同过期不可结算，并修正合同变更编号唯一校验。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 10:50:55 +08:00
b2894lxlx 6a4b9cf012 Merge remote-tracking branch 'websoft/dev' 2026-10-26 10:12:11 +08:00
b2894lxlxandCursor 488940d9c4 🐛 OA人员同步在部门匹配失败时仍清理历史脏部门关系 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 09:53:27 +08:00
b2894lxlxandCursor 3b5507ab2e 🔀 合并 websoft/dev，解决所属组织与数据权限冲突 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-25 20:37:21 +08:00
b2894lxlxandCursor 20f8b1d8ec 🐛 补齐调度端状态测试的数据权限构造参数 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-25 00:02:12 +08:00
b2894lxlxandCursor 9c0a870e5c 🔀 合并 websoft/dev，解决待回单状态与汇票可选冲突 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-24 14:50:05 +08:00
b2894lxlxandCursor 49c149c675 ✨ 评分量化减分累计与最高扣分限制，并修复运输对账与结算调整单等问题 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 04:28:19 +08:00
b2894lxlxandCursor dea72691de ✨ 进行中配载可编辑、汇票可选放开限制，并补充业务部门与待确认回单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 15:40:59 +08:00
b2894lxlxandCursor 73c8f6665e ✨ 客商档案表单重构并补充实缴资本、营业期限起日与已使用额度 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 12:56:48 +08:00
b2894lxlxandCursor 83b2144407 ✨ 小程序用户支持组织与数据权限，调度端按项目业务部门收口运单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 10:59:21 +08:00
b2894lxlxandCursor 167cea020c ✨ 结算单支持业务模式与运输方式，并修复组织合同流水号空值 
预结算/正式结算主表新增业务模式、运输方式及列表导出字典翻译；组织合同初始流水号未填时不落-1，OA同步保留本地合同配置。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 16:41:59 +08:00
b2894lxlxandCursor 89bfeddb12 ✨ OA人员无登录名时按工号入库，全量同步对齐当前部门 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 15:37:09 +08:00
b2894lxlxandCursor 0208d6612a 🐛 OA部门同步名称改用departmentmark，名称不一致时强制更新 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 15:37:09 +08:00
b2894lxlxandCursor 604ae47b4f ✨ 导入运单支持未结算整批删除并调整结算单导入模板 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 15:37:09 +08:00
b2894lxlxandCursor 939569e623 🐛 修复进度预付驳回重提，并校正结算费用与运输计划组织 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 15:37:09 +08:00
b2894lxlxandCursor 1b69d2b792 🐛 修复车辆长期有效、结算导入与调度端轨迹鉴权 
车辆勾选长期有效不再强校验有效期；结算导入模板去掉结算金额并自动合计，取消运费合计勾稽；调度端所属组织为空不拦截，并新增仅登录态的 manage/track。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 15:37:09 +08:00
b2894lxlxandCursor 2ef110d5e4 🐛 OA部门同步名称改用departmentmark，名称不一致时强制更新 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 13:57:39 +08:00
b2894lxlxandCursor 417d8ff9e1 🐛 OA部门同步名称改用departmentmark，名称不一致时强制更新 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 13:57:37 +08:00
b2894lxlx 46f79fce3a Merge remote-tracking branch 'gitee/uat' into dev 2026-10-21 12:02:12 +08:00
b2894lxlx d3e6668881 Merge remote-tracking branch 'gitee/master' into dev 2026-10-21 12:01:35 +08:00
b2894lxlx 4342b917e5 🔀 合并 dev 到 uat 2026-10-21 11:52:16 +08:00
b2894lxlxandCursor c31e5f98ed ✨ 人员同步按OA登录名更新或新增 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 11:51:13 +08:00
b2894lxlxandCursor 777102485c ✨ 组织机构支持合同初始流水号 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 11:51:13 +08:00
b2894lxlxandCursor ccb68b0853 ✨ 导入运单支持未结算整批删除并调整结算单导入模板 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 14:43:51 +08:00
b2894lxlx 5a651562d3 Merge remote-tracking branch 'websoft/dev' 2026-10-20 12:52:47 +08:00
b2894lxlxandCursor 87222f2e8c 🐛 修复进度预付驳回重提，并校正结算费用与运输计划组织 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 01:50:55 +08:00
b2894lxlxandCursor 766100a55c 🐛 修复车辆长期有效、结算导入与调度端轨迹鉴权 
车辆勾选长期有效不再强校验有效期；结算导入模板去掉结算金额并自动合计，取消运费合计勾稽；调度端所属组织为空不拦截，并新增仅登录态的 manage/track。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 23:28:50 +08:00
b2894lxlx 58c9462502 Merge remote-tracking branch 'websoft/dev' 2026-10-19 22:37:23 +08:00
b2894lxlxandCursor fce582e80b 🐛 修复收款流水继续认领与付款可付口径，并改用OA登录名提交流程 
收款流水部分认领预填关联结算单并修正认领完成判定；正式结算尾款扣减预付占用；预付驳回重提纠正结算引用；临时额度取消强制项目额度校验；用户增加OA登录名供MK流程使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 17:12:22 +08:00
b2894lxlx 68a5d581f3 !4 fix: 结算调整单重推拦截报错补充具体结算单号 
Merge pull request !4 from mindless/feature/20261016-settlement-adjustment-kingdee
 2026-10-19 06:58:25 +00:00
b2894lxlxandCursor c5d5687999 ✨ 完善付款申请多结算行、结算导入与计费方式回填 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 12:06:49 +08:00
b2894lxlxandCursor 74bc8c844d 🐛 修复单据号取号忽略逻辑删除，并优化OA人员组织绑定 
人员同步改为绑定已有组织并归并旁路存量；付款/开票/结算/对账等取号按最大流水含已删数据；运单导入数量单位改读计量单位主数据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-18 22:20:17 +08:00
b2894lxlxandCursor ddaa6f2c45 ✨ 完善导入结算单模板校验、草稿明细与历史运单选择 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-18 20:35:28 +08:00
b2894lxlxandCursor 583bab1a4f ✨ 结算付款与汇票校验优化，完善变更记录与菜单拆分 
付款可付款占用、汇票仅可选未到期收票、正式结算计费方式与金蝶同步、导入运单删除校验，并补充结算菜单与变更明细 SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-18 05:12:27 +08:00
b2894lxlxandCursor ce57f62c25 🐛 修复变更审批通过后无法再次发起项目变更 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 17:03:25 +08:00
b2894lxlxandCursor e98feab2d9 ✨ 项目变更支持保存业务部门与平台公司 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 17:01:26 +08:00
b2894lxlxandCursor 3ff90eb19d 🐛 修复OA公司与部门主键撞号导致下级部门挂错父级 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 16:22:37 +08:00
b2894lxlxandCursor 0bcb355079 🐛 修复MK公开页审批回写，并支持OA部门按公司oaId轮询同步 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 15:35:20 +08:00
b2894lxlxandCursor be0491d86a 🐛 暂时取消运单完成时的组织校验 
历史运单 deptId 为 -1 或与当前组织不一致时，批量完成会被跳过。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 11:29:01 +08:00
b2894lxlxandCursor 6f73e3fbf9 🐛 修复应付承运商、汇票占用、一单多货结算与运输对账完成校验 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 08:31:33 +08:00
b2894lxlxandCursor c168bf276a Merge remote-tracking branch 'gitee/master' 
付款申请预付联动冲突按拉下来的版本处理：金蝶生成即回显预结算预付信息，并保留多结算单保存逻辑。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 16:12:46 +08:00
b2894lxlx a37579081a !3 金蝶组织编码、收款流水多次认领、收款流水认领 
Merge pull request !3 from mindless/feature/payment-apply-bfi-sync
 2026-10-16 08:03:57 +00:00
b2894lxlxandCursor cfa77cbba3 ✨ 新增结算规则定时生成，并支持付款申请多结算单与导入停用费用项提示 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 16:03:23 +08:00
b2894lxlx 22425708a8 Merge remote-tracking branch 'websoft/dev' 2026-10-16 11:47:52 +08:00
b2894lxlxandCursor 93a6555293 ✨ 新增项目预付核销，并修复平台公司多选、常用线路组织过滤与登录 IP 连坐锁 
结算附件支持项目预付核销并扣减可付款金额；加固项目平台公司多选字段扩容脚本；常用线路新增归属组织与列表筛选对齐；登录失败仅按账号锁定，取消 IP 级连坐。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 02:01:58 +08:00
b2894lxlx 0657cfe69f !2 金蝶解锁回调以及客商审核通过推送金蝶失败被吞异常，以及补充文档 
Merge pull request !2 from mindless/feature/payment-apply-bfi-sync
 2026-10-15 16:58:41 +00:00
b2894lxlxandCursor d7bf82b159 ✨ 新增导入结算单，并修复运单超管组织过滤与计量单位软删恢复 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 00:56:54 +08:00
b2894lxlxandCursor 0518bf94bf ✨ 组织同步收敛为双顶级与二级公司白名单 
集团顶级改为 id=1/广西现代物流集团有限公司，仅同步 OA 公司 2、135 及其子公司与部门，并同步客商固定所属组织名称。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 12:47:11 +08:00
b2894lxlx 7654690d7c !1 tms对接金蝶 
Merge pull request !1 from mindless/feature/payment-apply-bfi-sync
 2026-10-14 09:27:06 +00:00
b2894lxlxandCursor b791401620 🐛 扩容用户手机号字段并规范化 OA 多号码同步 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 15:15:53 +08:00
b2894lxlxandCursor dee392eb48 🐛 修复 IAM 同步 dept_id 超长与手机号明文解密失败 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 15:13:19 +08:00
b2894lxlxandCursor 6f4812db75 ✨ 项目申请平台公司多选，运单导入承运商筛选与复制草稿优化 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 12:59:31 +08:00
b2894lxlxandCursor 19c5bc64f1 🐛 应收应付变更记录同一次提交共用调整时间 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 10:58:42 +08:00
b2894lxlxandCursor 5bd7c8d755 ✨ 机构OA同步支持双顶级与GWWL分段编码规则 
固定集团锚点 id=135/GWWL 与独立外部组织顶级并存；公司/部门编码按上级直拼三位数字生成，并修正类型与孤儿清理逻辑。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 10:44:38 +08:00
b2894lxlxandCursor fe78152515 🐛 MinIO 客户端支持 /oss 路径前缀并固定 region，修复合并分片失败 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 00:50:27 +08:00
b2894lxlxandCursor 64b4ad99fc 🐛 外网预签名固定 MinIO region，避免 GetBucketLocation 解析到 HTML 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 22:36:14 +08:00
b2894lxlxandCursor 7c7fe2e1c1 🐛 修复 MinIO endpoint 含 path 导致 blade-transport 启动失败 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 22:14:50 +08:00
b2894lxlxandCursor a7bf2588b6 🐛 凭证管理接口兼容未去前缀的 blade-transport 路径 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 21:39:53 +08:00
b2894lxlxandCursor f606850814 🐛 修复凭证分片上传 Mixed Content，支持服务端代传兜底 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 20:44:09 +08:00
b2894lxlxandCursor 44b4ae2d74 🐛 修复车辆未填外廓尺寸时详情显示 -1 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 12:55:15 +08:00
b2894lxlxandCursor e0da79d745 🐛 修复 MinIO 预签名走外网 HTTPS，并过滤无效应收应付变更记录 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 12:44:39 +08:00
b2894lxlxandCursor ea1829cd75 🐛 修复小程序令牌严格校验 401，并开放调度端打卡接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 14:47:17 +08:00
b2894lxlxandCursor c3edca04a5 ⚡ 小程序密码/短信登录按 User-Type=mp 走 blade_mp_user 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 14:22:33 +08:00
b2894lxlxandCursor d8b10377f0 🐛 补齐 DriverWaybillServiceImpl 单测对 IMpUserClient 的构造注入 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 13:59:00 +08:00
b2894lxlxandCursor 17ede93a04 ✨ 新增小程序用户后台管理接口与菜单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 13:49:08 +08:00
b2894lxlxandCursor e19c3b100a ✨ 小程序用户独立为 blade_mp_user，并兼容司机/车辆 OCR 宽松日期 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 13:02:08 +08:00
b2894lxlx 42ca5ee7bc Merge remote-tracking branch 'websoft/dev' 
# Conflicts:
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
 2026-10-12 10:39:38 +08:00
b2894lxlx a2e9e020b1 mk调试 2026-10-11 23:55:02 +08:00
b2894lxlxandCursor 68fede2caf 🐛 完善港口码头/铁路导入失败原因与软删除恢复，并修复运单导入列表筛选 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 16:20:21 +08:00