完善出库操作页面,适配成品出库接口

This commit is contained in:
mtf committed 2026-08-03 09:22:32 +08:00
1 parent d8febf4f05
commit 80d1b201b0
9 files changed
+2582 -11

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ HAVING COUNT(*) > 1;
SELECT `ContainerCode`, COUNT(*) AS DuplicateCount
FROM `TaskHeader`
WHERE `ContainerCode` IS NOT NULL AND `ContainerCode` <> ''
WHERE `ContainerCode` IS NOT NULL
GROUP BY `ContainerCode`
HAVING COUNT(*) > 1;
@@ -0,0 +1,139 @@
/*
ERP事项二:注册成品发货页面按钮权限
执行范围:仅成品库数据库。
包含:获取ERP发货通知单、分配/下发,以及分配窗口内部使用的查询、保存、取消和下发接口。
脚本可重复执行。
*/
SET @shipment_page_id = (
SELECT `ID`
FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,ShipmentHeader'
AND (`MethodName` IS NULL OR `MethodName` = '')
ORDER BY `ShowOnMenu` DESC, `DisplayOrder`
LIMIT 1
);
/* 获取ERP发货通知单 */
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), '获取ERP发货通知单', '获取ERP发货通知单', `ModuleName`, 0, 0,
`ClassName`, 'GetShipmentDetails', `Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1
FROM `frameworkmenus` child WHERE child.`ParentId` = @shipment_page_id),
1, `TenantAllowed`, '/shipment/ShipmentHeader/GetShipmentDetails', NULL, `ID`
FROM `frameworkmenus`
WHERE `ID` = @shipment_page_id
AND NOT EXISTS (
SELECT 1 FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,ShipmentHeader'
AND `MethodName` = 'GetShipmentDetails'
);
/* 分配/下发 */
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), '分配/下发', '分配/下发', `ModuleName`, 0, 0,
`ClassName`, 'Allocate', `Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1
FROM `frameworkmenus` child WHERE child.`ParentId` = @shipment_page_id),
1, `TenantAllowed`, '/shipment/ShipmentHeader/Allocate', NULL, `ID`
FROM `frameworkmenus`
WHERE `ID` = @shipment_page_id
AND NOT EXISTS (
SELECT 1 FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,ShipmentHeader'
AND `MethodName` = 'Allocate'
);
UPDATE `frameworkmenus`
SET `PageName` = CASE `MethodName`
WHEN 'GetShipmentDetails' THEN '获取ERP发货通知单'
WHEN 'Allocate' THEN '分配/下发'
ELSE `PageName` END,
`ActionName` = CASE `MethodName`
WHEN 'GetShipmentDetails' THEN '获取ERP发货通知单'
WHEN 'Allocate' THEN '分配/下发'
ELSE `ActionName` END,
`Url` = CASE `MethodName`
WHEN 'GetShipmentDetails' THEN '/shipment/ShipmentHeader/GetShipmentDetails'
WHEN 'Allocate' THEN '/shipment/ShipmentHeader/Allocate'
ELSE `Url` END
WHERE `ClassName` = 'HHWMS.Web.Controllers,ShipmentHeader'
AND `MethodName` IN ('GetShipmentDetails', 'Allocate');
/* 分配窗口内部接口;不在菜单和按钮中显示,只用于授权请求。 */
INSERT INTO `frameworkmenus`
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
SELECT
UUID(), action_def.`PageName`, action_def.`PageName`, page_menu.`ModuleName`, 0, 0,
page_menu.`ClassName`, action_def.`MethodName`, page_menu.`Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1
FROM `frameworkmenus` child WHERE child.`ParentId` = @shipment_page_id),
1, page_menu.`TenantAllowed`, action_def.`Url`, NULL, page_menu.`ID`
FROM `frameworkmenus` page_menu
JOIN (
SELECT '加载ERP发货分配数据' AS `PageName`, 'GetAllocationData' AS `MethodName`,
'/shipment/ShipmentHeader/GetAllocationData' AS `Url`
UNION ALL SELECT '查询成品可分配库存', 'GetAvailableInventories',
'/shipment/ShipmentHeader/GetAvailableInventories'
UNION ALL SELECT '保存成品库存分配', 'AllocateInventories',
'/shipment/ShipmentHeader/AllocateInventories'
UNION ALL SELECT '取消成品库存分配', 'CancelAllocation',
'/shipment/ShipmentHeader/CancelAllocation'
UNION ALL SELECT '取消成品待下发任务', 'CancelPendingTask',
'/shipment/ShipmentHeader/CancelPendingTask'
UNION ALL SELECT '下发成品出库任务', 'DispatchPendingTask',
'/shipment/ShipmentHeader/DispatchPendingTask'
) action_def
WHERE page_menu.`ID` = @shipment_page_id
AND NOT EXISTS (
SELECT 1 FROM `frameworkmenus` existing_menu
WHERE existing_menu.`ClassName` = 'HHWMS.Web.Controllers,ShipmentHeader'
AND existing_menu.`MethodName` = action_def.`MethodName`
);
/* 给已有出库单页面权限的角色增加两个按钮权限。 */
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 `functionprivileges` page_privilege
JOIN `frameworkmenus` action_menu
ON action_menu.`ClassName` = 'HHWMS.Web.Controllers,ShipmentHeader'
AND action_menu.`MethodName` IN (
'GetShipmentDetails', 'Allocate', 'GetAllocationData',
'GetAvailableInventories', 'AllocateInventories', 'CancelAllocation',
'CancelPendingTask', 'DispatchPendingTask'
)
WHERE page_privilege.`MenuItemId` = @shipment_page_id
AND page_privilege.`Allowed` = 1
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,ShipmentHeader'
AND menu.`MethodName` IN (
'GetShipmentDetails', 'Allocate', 'GetAllocationData',
'GetAvailableInventories', 'AllocateInventories', 'CancelAllocation',
'CancelPendingTask', 'DispatchPendingTask'
)
ORDER BY menu.`MethodName`, privilege.`RoleCode`;
@@ -0,0 +1,103 @@
/*
ERP事项二:注册“补传ERP成品出库”页面功能权限
执行范围:仅成品库数据库。
脚本可重复执行。
*/
SET @inventory_transaction_page_id = (
SELECT `ID`
FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
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(),
'补传ERP成品出库',
'补传ERP成品出库',
`ModuleName`,
0,
0,
`ClassName`,
'RetryAddSaleOut',
`Domain`,
0,
0,
(
SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1
FROM `frameworkmenus` child
WHERE child.`ParentId` = @inventory_transaction_page_id
),
1,
`TenantAllowed`,
'/inventory/InventoryTransaction/RetryAddSaleOut',
NULL,
`ID`
FROM `frameworkmenus`
WHERE `ID` = @inventory_transaction_page_id
AND NOT EXISTS (
SELECT 1
FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
AND `MethodName` = 'RetryAddSaleOut'
);
UPDATE `frameworkmenus`
SET `PageName` = '补传ERP成品出库',
`ActionName` = '补传ERP成品出库',
`Url` = '/inventory/InventoryTransaction/RetryAddSaleOut'
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
AND `MethodName` = 'RetryAddSaleOut';
SET @retry_add_sale_out_menu_id = (
SELECT `ID`
FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
AND `MethodName` = 'RetryAddSaleOut'
LIMIT 1
);
/* 只给原本已有“库存交易”页面权限的角色增加补传权限。 */
INSERT INTO `functionprivileges`
(`ID`, `RoleCode`, `MenuItemId`, `Allowed`, `TenantCode`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
UUID(),
page_privilege.`RoleCode`,
@retry_add_sale_out_menu_id,
1,
page_privilege.`TenantCode`,
NOW(),
'system',
NULL,
NULL
FROM `functionprivileges` page_privilege
WHERE page_privilege.`MenuItemId` = @inventory_transaction_page_id
AND page_privilege.`Allowed` = 1
AND @retry_add_sale_out_menu_id IS NOT NULL
AND NOT EXISTS (
SELECT 1
FROM `functionprivileges` existing_privilege
WHERE existing_privilege.`RoleCode` = page_privilege.`RoleCode`
AND existing_privilege.`MenuItemId` = @retry_add_sale_out_menu_id
AND (existing_privilege.`TenantCode` <=> page_privilege.`TenantCode`)
);
SELECT
menu.`ID`,
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,InventoryTransaction'
AND menu.`MethodName` = 'RetryAddSaleOut'
ORDER BY privilege.`RoleCode`;