fix:永丰售后修复BUG,

1,物料库存获取不到ERP:重新调整触发查询逻辑
2,工序变更导致物料无法出库:配置旧工序
3,测试出库订单ERP推送,任务下发
This commit is contained in:
sunwang committed 2026-10-29 13:12:11 +08:00
1 parent b2a9a38f38
commit c76e7bb681
69 files changed
+5510 -157

No files matched your search

+166
View File
@@ -0,0 +1,166 @@
-- =============================================================
-- AGV 平库对接 · 05 SysJob + 菜单/权限 DML
-- 依据:《平库AGV方案流程(AGV自调度版).md》10.2 / 9.3
-- 说明:
-- 1) 不插 SysJob 记录,Job 会被按"每年一次"cron 注册,等于不跑;
-- 2) AgvTimeoutMonitorJob 默认暂停(Status=0),联调通过再启用;
-- AgvTaskArchiveJob 建议启用(Status=1,每日凌晨归档);
-- 3) 菜单/权限参照 sql/20260801_fix_add_sale_out_retry_permission.sql,
-- ClassName 格式:HHWMS.Web.Controllers,Controller名(不带 Area);
-- 4) 脚本可重复执行。
-- =============================================================
-- -------------------------------------------------------------
-- 1) SysJob:AGV 超时监控(默认暂停)
-- -------------------------------------------------------------
INSERT INTO `SysJob`
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
'AgvTimeoutMonitorJob', 'AgvTimeoutMonitorJob', NULL, NULL, '0 */10 * * * ?',
NULL, NULL, NULL, 0, 'AGV任务超时监控(下发后N分钟仍非终态告警)',
NOW(), 'system', NULL, NULL
WHERE NOT EXISTS (
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTimeoutMonitorJob'
);
-- -------------------------------------------------------------
-- 2) SysJob:AGV 任务归档(每日凌晨 3:30,主表保留 1 个月)
-- -------------------------------------------------------------
INSERT INTO `SysJob`
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
'AgvTaskArchiveJob', 'AgvTaskArchiveJob', NULL, NULL, '0 30 3 * * ?',
NULL, NULL, NULL, 1, 'AGV任务归档(超1个月终态任务镜像备份后主表清除)',
NOW(), 'system', NULL, NULL
WHERE NOT EXISTS (
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTaskArchiveJob'
);
-- -------------------------------------------------------------
-- 3) 菜单:AGV 任务页(Area: agv,见 AgvTaskController)
-- -------------------------------------------------------------
SET @agv_task_page_id = (
SELECT `ID` FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController'
AND (`MethodName` IS NULL OR `MethodName` = '')
ORDER BY `ShowOnMenu` DESC, `DisplayOrder`
LIMIT 1
);
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), 'AGV任务', 'AGV任务', NULL, 0, 0,
'HHWMS.Web.Controllers,AgvTaskController', '',
NULL, 1, 0, 100, 1, 1, '/agv/AgvTask/Index', NULL, NULL
WHERE @agv_task_page_id IS NULL;
SET @agv_task_page_id = (
SELECT `ID` FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController'
AND (`MethodName` IS NULL OR `MethodName` = '')
ORDER BY `ShowOnMenu` DESC, `DisplayOrder`
LIMIT 1
);
-- AGV 任务页动作权限(下发/取消/重试联动)
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), 'AGV任务下发', 'AGV任务下发', `ModuleName`, 0, 0,
`ClassName`, 'Dispatch', `Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child
WHERE child.`ParentId` = @agv_task_page_id),
1, `TenantAllowed`, '/agv/AgvTask/Dispatch', NULL, `ID`
FROM `frameworkmenus` WHERE `ID` = @agv_task_page_id
AND NOT EXISTS (SELECT 1 FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController'
AND `MethodName` = 'Dispatch');
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), 'AGV任务取消', 'AGV任务取消', `ModuleName`, 0, 0,
`ClassName`, 'Cancel', `Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child
WHERE child.`ParentId` = @agv_task_page_id),
1, `TenantAllowed`, '/agv/AgvTask/Cancel', NULL, `ID`
FROM `frameworkmenus` WHERE `ID` = @agv_task_page_id
AND NOT EXISTS (SELECT 1 FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController'
AND `MethodName` = 'Cancel');
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), 'AGV重试联动', 'AGV重试联动', `ModuleName`, 0, 0,
`ClassName`, 'RetryFinish', `Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child
WHERE child.`ParentId` = @agv_task_page_id),
1, `TenantAllowed`, '/agv/AgvTask/RetryFinish', NULL, `ID`
FROM `frameworkmenus` WHERE `ID` = @agv_task_page_id
AND NOT EXISTS (SELECT 1 FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController'
AND `MethodName` = 'RetryFinish');
-- 给已有 AGV 任务页权限的角色授予上述动作权限
INSERT INTO `functionprivileges`
(`ID`, `RoleCode`, `MenuItemId`, `Allowed`, `TenantCode`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
UUID(), page_privilege.`RoleCode`, action_menu.`ID`, 1, page_privilege.`TenantCode`,
NOW(), 'system', NULL, NULL
FROM `frameworkmenus` action_menu
JOIN `functionprivileges` page_privilege
ON page_privilege.`MenuItemId` = @agv_task_page_id AND page_privilege.`Allowed` = 1
WHERE action_menu.`ClassName` = 'HHWMS.Web.Controllers,AgvTaskController'
AND action_menu.`MethodName` IN ('Dispatch','Cancel','RetryFinish')
AND @agv_task_page_id IS NOT NULL
AND NOT EXISTS (
SELECT 1 FROM `functionprivileges` existing_privilege
WHERE existing_privilege.`RoleCode` = page_privilege.`RoleCode`
AND existing_privilege.`MenuItemId` = action_menu.`ID`
AND (existing_privilege.`TenantCode` <=> page_privilege.`TenantCode`)
);
-- -------------------------------------------------------------
-- 4) 菜单:AGV 任务场景配置页(Area: agv,见 AgvTaskSceneConfigController)
-- -------------------------------------------------------------
SET @agv_scene_config_page_id = (
SELECT `ID` FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskSceneConfigController'
AND (`MethodName` IS NULL OR `MethodName` = '')
ORDER BY `ShowOnMenu` DESC, `DisplayOrder`
LIMIT 1
);
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), 'AGV任务场景配置', 'AGV任务场景配置', NULL, 0, 0,
'HHWMS.Web.Controllers,AgvTaskSceneConfigController', '',
NULL, 1, 0, 101, 1, 1, '/agv/AgvTaskSceneConfig/Index', NULL, NULL
WHERE @agv_scene_config_page_id IS NULL;
SELECT
menu.`PageName`, menu.`MethodName`, menu.`Url`,
privilege.`RoleCode`, privilege.`Allowed`
FROM `frameworkmenus` menu
LEFT JOIN `functionprivileges` privilege ON privilege.`MenuItemId` = menu.`ID`
WHERE menu.`ClassName` IN ('HHWMS.Web.Controllers,AgvTaskController',
'HHWMS.Web.Controllers,AgvTaskSceneConfigController')
ORDER BY menu.`PageName`, menu.`MethodName`, privilege.`RoleCode`;