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

+66
View File
@@ -0,0 +1,66 @@
-- =============================================================
-- AGV 平库对接 · 01 AgvTask 独立任务表 + 归档镜像表
-- 依据:《平库AGV方案流程(AGV自调度版).md》10.2 生产 DDL
-- 执行范围:AGV 平库所在数据库(默认连接 wms_yongfeng_cp)
-- 说明:
-- 1) 独立表方案(v2),不复用 TaskHeader/TaskDetail,立库零改动;
-- 2) AgvTask 主表只保留 1 个月以内任务,超期终态先镜像备份到
-- AgvTaskHistory,再从主表物理删除(见 9.6);
-- 3) 脚本可重复执行(IF NOT EXISTS 兜底)。
-- =============================================================
-- 1) AgvTask 独立任务表
CREATE TABLE IF NOT EXISTS AgvTask (
ID INT NOT NULL AUTO_INCREMENT,
TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号(=上游sourceCode或自生成AGV+日期+序号)',
SourceCode VARCHAR(50) NULL COMMENT '上游任务号(去重键)',
SourceSystem VARCHAR(20) NULL COMMENT '上游来源系统标识',
AgvTaskType SMALLINT NULL COMMENT 'AGV业务类型(AgvTaskTypeEnum 1~6)',
FromLocation VARCHAR(64) NOT NULL COMMENT '起点库位编码(AGV点位)',
ToLocation VARCHAR(64) NOT NULL COMMENT '终点库位编码(AGV点位)',
FromFloor INT NULL COMMENT '起点楼层(方案乙确认后删)',
ToFloor INT NULL COMMENT '终点楼层(方案乙确认后删)',
ContainerCode VARCHAR(50) NOT NULL COMMENT '容器号(不给则生成LS临时容器)',
Priority INT NULL DEFAULT 0 COMMENT '优先级(数值越大越优先)',
AgvStatus SMALLINT NULL DEFAULT 0 COMMENT 'AGV任务状态(AgvTaskStatusEnum)',
AgvCarNo VARCHAR(20) NULL COMMENT 'AGV小车编号(回调回传,展示用)',
ErrorMsg VARCHAR(255) NULL COMMENT '失败/异常/取消原因',
BillType VARCHAR(20) NULL COMMENT '流水类型(AgvBillTypeEnum:In_AGV/Out_AGV/Move_AGV)',
Details LONGTEXT NULL COMMENT '物料明细(JSON,SKU,非强制)',
CreateBy VARCHAR(50) NULL,
CreateTime DATETIME NULL,
UpdateBy VARCHAR(50) NULL,
UpdateTime DATETIME NULL,
PRIMARY KEY (ID),
UNIQUE INDEX UX_AgvTask_TaskNo (TaskNo),
UNIQUE INDEX UX_AgvTask_Source (SourceCode, SourceSystem),
INDEX IX_AgvTask_Status (AgvStatus)
) COMMENT='AGV平库任务(独立表)';
-- 2) AgvTaskHistory 归档镜像表(字段镜像 AgvTask,追加归档时间)
CREATE TABLE IF NOT EXISTS AgvTaskHistory (
ID INT NOT NULL AUTO_INCREMENT,
TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号',
SourceCode VARCHAR(50) NULL COMMENT '上游任务号(去重键)',
SourceSystem VARCHAR(20) NULL COMMENT '上游来源系统标识',
AgvTaskType SMALLINT NULL COMMENT 'AGV业务类型(AgvTaskTypeEnum 1~6)',
FromLocation VARCHAR(64) NULL COMMENT '起点库位编码',
ToLocation VARCHAR(64) NULL COMMENT '终点库位编码',
FromFloor INT NULL COMMENT '起点楼层',
ToFloor INT NULL COMMENT '终点楼层',
ContainerCode VARCHAR(50) NULL COMMENT '容器号',
Priority INT NULL DEFAULT 0 COMMENT '优先级',
AgvStatus SMALLINT NULL COMMENT '归档前任务状态',
AgvCarNo VARCHAR(20) NULL COMMENT 'AGV小车编号',
ErrorMsg VARCHAR(255) NULL COMMENT '失败/异常/取消原因',
BillType VARCHAR(20) NULL COMMENT '流水类型(AgvBillTypeEnum)',
Details LONGTEXT NULL COMMENT '物料明细(JSON,SKU)',
ArchivedAt DATETIME NULL COMMENT '归档时间',
CreateBy VARCHAR(50) NULL,
CreateTime DATETIME NULL,
UpdateBy VARCHAR(50) NULL,
UpdateTime DATETIME NULL,
PRIMARY KEY (ID),
INDEX IX_AgvTaskHistory_TaskNo (TaskNo),
INDEX IX_AgvTaskHistory_CreateTime (CreateTime)
) COMMENT='AGV任务归档镜像(超1个月终态任务备份于此)';
+31
View File
@@ -0,0 +1,31 @@
-- =============================================================
-- AGV 平库对接 · 02 LocationZone 新增楼层字段
-- 依据:《平库AGV方案流程(AGV自调度版).md》5.3 / 10.2
-- 说明:
-- 1) Floor 用于 AGV 任务 FromFloor/ToFloor 取值与跨楼层方向校验;
-- 2) 若采用 Location.Floor 替代方案,则改为在 Location 上加列;
-- 3) 方案乙(AGV 自判楼层)确认后本脚本可废弃(见 15.7);
-- 4) 脚本可重复执行。
-- =============================================================
-- 新增楼层字段
SET @col_exists = (
SELECT COUNT(1)
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'LocationZone'
AND COLUMN_NAME = 'Floor'
);
SET @ddl = IF(
@col_exists = 0,
'ALTER TABLE LocationZone ADD COLUMN Floor INT NULL COMMENT ''库区所在楼层''',
'SELECT 1'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- 提示:现场需按实际楼层为各库区补充 Floor 值(示例,请按现场调整)
-- UPDATE LocationZone SET Floor = 1 WHERE ZoneCode = 'CP'; -- 成品库
-- UPDATE LocationZone SET Floor = 1 WHERE ZoneCode = 'XB'; -- 线边库
+60
View File
@@ -0,0 +1,60 @@
-- =============================================================
-- AGV 平库对接 · 03 AgvTaskLog 状态与报文日志表 + 归档镜像表
-- 依据:《平库AGV方案流程(AGV自调度版).md》9.6 / 10.2
-- 说明:
-- 1) 每次状态变更/关键动作写一条,页面展示状态时间线;
-- 2) OrderId 为 AGV 返回运单号(与 TaskNo 一致,原值留痕);
-- 3) AgvTaskLog 保留 >= 6 个月,超期先镜像备份到 AgvTaskLogHistory,
-- 再从主表物理删除;
-- 4) 脚本可重复执行。
-- =============================================================
-- 1) AgvTaskLog 新表(实体必须声明 public new int ID,否则 EF 会用 BasePoco 的 Guid 主键)
CREATE TABLE IF NOT EXISTS AgvTaskLog (
ID INT NOT NULL AUTO_INCREMENT,
TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号',
OrderId VARCHAR(50) NULL COMMENT 'AGV返回运单号(原值留痕,与TaskNo一致)',
FromStatus SMALLINT NULL COMMENT '变更前状态',
ToStatus SMALLINT NULL COMMENT '变更后状态',
Event VARCHAR(30) NULL COMMENT '回调事件',
Direction VARCHAR(10) NULL COMMENT 'down=下发 up=回调',
EventTime DATETIME NULL COMMENT '事件发生时间',
SourceIp VARCHAR(50) NULL COMMENT '来源IP',
DurationMs INT NULL COMMENT '耗时(毫秒)',
RequestJson TEXT NULL COMMENT '请求报文',
ResponseJson TEXT NULL COMMENT '响应报文',
Operator VARCHAR(50) NULL COMMENT '操作人(AGV回调记AGV)',
Remark VARCHAR(500) NULL COMMENT '备注/异常信息',
CreateBy VARCHAR(50) NULL,
CreateTime DATETIME NULL,
UpdateBy VARCHAR(50) NULL,
UpdateTime DATETIME NULL,
PRIMARY KEY (ID),
INDEX IX_AgvTaskLog_TaskNo (TaskNo, CreateTime),
INDEX IX_AgvTaskLog_OrderId (OrderId)
) COMMENT='AGV任务状态与报文日志';
-- 2) AgvTaskLogHistory 归档镜像表(字段镜像 AgvTaskLog,追加归档时间)
CREATE TABLE IF NOT EXISTS AgvTaskLogHistory (
ID INT NOT NULL AUTO_INCREMENT,
TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号',
OrderId VARCHAR(50) NULL COMMENT 'AGV返回运单号',
FromStatus SMALLINT NULL COMMENT '变更前状态',
ToStatus SMALLINT NULL COMMENT '变更后状态',
Event VARCHAR(30) NULL COMMENT '回调事件',
Direction VARCHAR(10) NULL COMMENT 'down=下发 up=回调',
EventTime DATETIME NULL COMMENT '事件发生时间',
SourceIp VARCHAR(50) NULL COMMENT '来源IP',
DurationMs INT NULL COMMENT '耗时(毫秒)',
RequestJson TEXT NULL COMMENT '请求报文',
ResponseJson TEXT NULL COMMENT '响应报文',
Operator VARCHAR(50) NULL COMMENT '操作人(AGV回调记AGV)',
Remark VARCHAR(500) NULL COMMENT '备注/异常信息',
ArchivedAt DATETIME NULL COMMENT '归档时间',
CreateBy VARCHAR(50) NULL,
CreateTime DATETIME NULL,
UpdateBy VARCHAR(50) NULL,
UpdateTime DATETIME NULL,
PRIMARY KEY (ID),
INDEX IX_AgvTaskLogHistory_TaskNo (TaskNo, CreateTime)
) COMMENT='AGV任务日志归档镜像(超6个月日志备份于此)';
+40
View File
@@ -0,0 +1,40 @@
-- =============================================================
-- AGV 平库对接 · 04 AgvTaskSceneConfig 任务场景配置表 + 初始数据
-- 依据:《平库AGV方案流程(AGV自调度版).md》5.6 / 10.2
-- 说明:
-- 1) 映射"客户(甲方/MES)下发的字符串任务类型 -> AGV 场景";
-- 2) SourceTaskType 为映射主键,WMS 不写死任何场景号,
-- 现场调整场景只改本表,不改代码;
-- 3) SceneId/SceneName 需按厂商(仙工)实际场景配置填写,
-- 下述初始数据为占位值,实施时以现场为准更新;
-- 4) 脚本可重复执行(INSERT IGNORE)。
-- =============================================================
CREATE TABLE IF NOT EXISTS AgvTaskSceneConfig (
ID INT NOT NULL AUTO_INCREMENT,
SourceTaskType VARCHAR(50) NOT NULL COMMENT '上游字符串任务类型(映射主键)',
AgvTaskType SMALLINT NOT NULL COMMENT '内部业务类型(AgvTaskTypeEnum 1~6, 必填)',
SceneId VARCHAR(64) NOT NULL COMMENT 'AGV场景ID',
SceneName VARCHAR(64) NULL COMMENT 'AGV场景名称',
BinTaskLoad VARCHAR(32) NOT NULL DEFAULT 'Load' COMMENT '取货动作名',
BinTaskUnload VARCHAR(32) NOT NULL DEFAULT 'Unload' COMMENT '放货动作名',
Remark VARCHAR(255) NULL COMMENT '备注',
CreateBy VARCHAR(50) NULL,
CreateTime DATETIME NULL,
UpdateBy VARCHAR(50) NULL,
UpdateTime DATETIME NULL,
PRIMARY KEY (ID),
UNIQUE INDEX UX_AgvTaskSceneConfig_Source (SourceTaskType)
) COMMENT='AGV任务场景配置';
-- 六类业务初始数据(SceneId 为占位值,现场按厂商配置更新)
INSERT IGNORE INTO AgvTaskSceneConfig
(SourceTaskType, AgvTaskType, SceneId, SceneName, BinTaskLoad, BinTaskUnload, Remark,
CreateTime, CreateBy)
VALUES
('RAW_IN', 1, 'SCENE_RAW_IN', '原材料入库', 'Load', 'Unload', '1F月台->货架区', NOW(), 'system'),
('EMPTY_TRAY_REQ', 2, 'SCENE_EMPTY_TRAY_REQ', '原料空托需求', 'Load', 'Unload', '空托区/货架区->月台缓存区', NOW(), 'system'),
('RAW_FULL_OUT', 3, 'SCENE_RAW_FULL_OUT', '原料满托出库', 'Load', 'Unload', '货架区->混料上料点(同楼层点到点)', NOW(), 'system'),
('MIX_BUCKET_UP', 4, 'SCENE_MIX_BUCKET_UP', '混料满桶上线', 'Load', 'Unload', '1F除湿房缓存区->2F需求工位', NOW(), 'system'),
('EMPTY_BUCKET_DOWN',5, 'SCENE_EMPTY_BUCKET_DOWN','空桶缓存', 'Load', 'Unload', '2F平台工位->1F除湿房缓存区', NOW(), 'system'),
('AUX_MAT_IN', 6, 'SCENE_AUX_MAT_IN', '辅材缓存', 'Load', 'Unload', '1F月台缓存区->2F辅材缓存区', NOW(), 'system');
+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`;
+80
View File
@@ -0,0 +1,80 @@
-- =============================================================
-- AGV 平库对接 · 06 AgvTaskLog 日志页 菜单/权限 DML
-- 说明:
-- 1) 日志页为只读(列表+搜索+详情),对应 AgvTaskLogController;
-- 2) 菜单/权限参照 05_agv_dml_menu.sql 的 SceneConfig 插入方式;
-- 3) 脚本可重复执行。
-- =============================================================
-- -------------------------------------------------------------
-- 1) 菜单:AGV 任务日志页(Area: agv,见 AgvTaskLogController)
-- -------------------------------------------------------------
SET @agv_tasklog_page_id = (
SELECT `ID` FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController'
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,AgvTaskLogController', '',
NULL, 1, 0, 102, 1, 1, '/agv/AgvTaskLog/Index', NULL, NULL
WHERE @agv_tasklog_page_id IS NULL;
SET @agv_tasklog_page_id = (
SELECT `ID` FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController'
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日志详情', `ModuleName`, 0, 0,
`ClassName`, 'Details', `Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child
WHERE child.`ParentId` = @agv_tasklog_page_id),
1, `TenantAllowed`, '/agv/AgvTaskLog/Details', NULL, `ID`
FROM `frameworkmenus` WHERE `ID` = @agv_tasklog_page_id
AND NOT EXISTS (SELECT 1 FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController'
AND `MethodName` = 'Details');
-- 给已有日志页权限的角色授予详情权限
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_tasklog_page_id AND page_privilege.`Allowed` = 1
WHERE action_menu.`ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController'
AND action_menu.`MethodName` = 'Details'
AND @agv_tasklog_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`)
);
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` = 'HHWMS.Web.Controllers,AgvTaskLogController'
ORDER BY menu.`PageName`, menu.`MethodName`, privilege.`RoleCode`;
+62
View File
@@ -0,0 +1,62 @@
-- =============================================================
-- AGV 平库对接 · 07 定时下发/自动重试 Job 注册 + 库位状态兜底修复
-- 依据:本次新增/调整功能
-- 说明:
-- 1) 补充 AgvTaskDispatchJob / AgvTaskRetryFinishJob 的 SysJob 注册;
-- 2) 修复历史库位 ContainerStatus 为 NULL 的数据(首页统计空键异常);
-- 3) 脚本可重复执行。
-- =============================================================
-- -------------------------------------------------------------
-- 1) SysJob:AGV 定时下发(扫描新建/异常任务自动下发)
-- 建议 Cron:*/5 * * * * ?(每 5 秒);已存在则跳过
-- -------------------------------------------------------------
INSERT INTO `SysJob`
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
'AgvTaskDispatchJob', 'AgvTaskDispatchJob', NULL, NULL, '*/5 * * * * ?',
NULL, NULL, NULL, 1, 'AGV定时下发(扫描新建/异常任务自动下发)',
NOW(), 'system', NULL, NULL
WHERE NOT EXISTS (
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTaskDispatchJob'
);
-- -------------------------------------------------------------
-- 2) SysJob:AGV 完成联动自动重试(扫描 99 状态自动重试联动)
-- 建议 Cron:0 */5 * * * ?(每 5 分钟);已存在则跳过
-- -------------------------------------------------------------
INSERT INTO `SysJob`
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
'AgvTaskRetryFinishJob', 'AgvTaskRetryFinishJob', NULL, NULL, '0 */5 * * * ?',
NULL, NULL, NULL, 1, 'AGV完成联动自动重试(扫描99状态自动重试ERP报工/库存)',
NOW(), 'system', NULL, NULL
WHERE NOT EXISTS (
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTaskRetryFinishJob'
);
-- -------------------------------------------------------------
-- 3) 修复历史库位 ContainerStatus 为 NULL 的数据
-- 新库位实体默认赋值为 空仓位(empty),但历史数据可能为 NULL
-- NULL 会导致首页库位统计接口抛空键异常
-- -------------------------------------------------------------
UPDATE `Location`
SET `ContainerStatus` = 'empty'
WHERE `ContainerStatus` IS NULL
OR `ContainerStatus` = '';
-- -------------------------------------------------------------
-- 4) 只读核查:确认 Job 注册情况与库位状态分布
-- -------------------------------------------------------------
SELECT `JobName`, `CronExpression`, `Status`, `Remark`
FROM `SysJob`
WHERE `JobName` IN ('AgvTaskDispatchJob', 'AgvTaskRetryFinishJob', 'AgvTaskArchiveJob')
ORDER BY `JobName`;
SELECT `ContainerStatus`, COUNT(1) AS `数量`
FROM `Location`
GROUP BY `ContainerStatus`;
+57
View File
@@ -0,0 +1,57 @@
-- =============================================================
-- AGV 平库对接 · 99 只读核查脚本
-- 依据:《平库AGV方案流程(AGV自调度版).md》10.2 / 6.2 / 9.6
-- 说明:只读查询,上线前后核对任务状态、锁、流水一致性。
-- =============================================================
-- 1) AGV 任务按状态分布(0新建/5已下发/10执行中/90异常/95取消/99联动失败/100完成)
SELECT `AgvStatus`, COUNT(1) AS `任务数`
FROM `AgvTask`
GROUP BY `AgvStatus`
ORDER BY `AgvStatus`;
-- 2) 超期未归档的终态任务(主表保留1个月,应被 AgvTaskArchiveJob 清走)
SELECT `TaskNo`, `AgvStatus`, `CreateTime`
FROM `AgvTask`
WHERE `AgvStatus` IN (99, 95, 100)
AND `CreateTime` < DATE_SUB(NOW(), INTERVAL 1 MONTH)
ORDER BY `CreateTime`;
-- 3) 下发后长时间未到终态的任务(疑似卡死,供超时监控核对)
SELECT `TaskNo`, `AgvStatus`, `FromLocation`, `ToLocation`, `CreateTime`
FROM `AgvTask`
WHERE `AgvStatus` NOT IN (99, 95, 100)
AND `CreateTime` < DATE_SUB(NOW(), INTERVAL 1 DAY)
ORDER BY `CreateTime`;
-- 4) 归档镜像表与主表是否重复(归档后主表应无同 TaskNo 记录)
SELECT h.`TaskNo`
FROM `AgvTaskHistory` h
JOIN `AgvTask` t ON t.`TaskNo` = h.`TaskNo`
LIMIT 10;
-- 5) 容器锁与库位锁残留(任务完成/取消后应全部释放)
SELECT c.`Code` AS `容器`, c.`LocationCode`, c.`IsLock`
FROM `Container` c
WHERE c.`IsLock` <> 0;
SELECT l.`Code` AS `库位`, l.`Status`, l.`ContainerCode`
FROM `Location` l
WHERE l.`Status` <> 0;
-- 6) 场景配置未覆盖的上游类型(应无,若有说明接单会被拒绝)
SELECT `SourceTaskType`, `AgvTaskType`, `SceneId`, `SceneName`
FROM `AgvTaskSceneConfig`
ORDER BY `AgvTaskType`;
-- 7) 完成联动失败任务积压(应被 AgvTaskRetryFinishJob 逐步处理到完成100)
SELECT `TaskNo`, `AgvStatus`, `ErrorMsg`, `CreateTime`
FROM `AgvTask`
WHERE `AgvStatus` = 99
ORDER BY `CreateTime`;
-- 8) SysJob 注册情况
SELECT `JobName`, `Status`, `CronExpression`, `Remark`
FROM `SysJob`
WHERE `JobName` LIKE 'Agv%'
ORDER BY `JobName`;
+24
View File
@@ -0,0 +1,24 @@
-- =============================================================
-- AGV 平库对接 · SQL 执行顺序说明
-- 说明:按编号顺序执行,每个脚本均可重复执行(幂等)
-- 执行范围:AGV 平库所在数据库(默认连接 wms_yongfeng_cp)
-- =============================================================
-- 【执行顺序】
--
-- 01_agv_task_table.sql —— AgvTask 主表 + AgvTaskHistory 归档镜像表
-- 02_agv_locationzone_floor.sql —— LocationZone 新增 Floor 楼层字段
-- 03_agv_tasklog.sql —— AgvTaskLog 日志表 + AgvTaskLogHistory 归档镜像表
-- 04_agv_scene_config.sql —— AgvTaskSceneConfig 场景配置表 + 初始数据
-- 05_agv_dml_menu.sql —— SysJob(归档/超时监控)+ AGV任务页/场景配置页菜单权限
-- 06_agv_tasklog_menu.sql —— AGV 任务日志页菜单权限
-- 07_agv_dispatch_retryjob.sql —— SysJob(定时下发/完成联动自动重试)+ 库位 ContainerStatus 兜底修复
-- 99_agv_verify.sql —— 只读核查(上线前后核对)
--
-- 【注意事项】
--
-- 1. 全部脚本可重复执行,现场误重复执行无影响
-- 2. 02 执行后需人工更新库区楼层:UPDATE LocationZone SET Floor = ? WHERE ZoneCode = ?
-- 3. 04 中的 SceneId/SceneName 为占位值,需按仙工实际场景配置更新
-- 4. 07 执行后需在【系统管理→定时任务】页面确认 Job 状态为启用
-- 5. 99 为只读核查,不修改数据