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

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

View File

@ -10,6 +10,24 @@
line-height: 1.3;
white-space: nowrap;
word-break: keep-all;
overflow: hidden;
text-overflow: ellipsis;
}
/* 普通入库字段较少:固定表格布局、完整换行,避免横向拖动。 */
#receiptin .receipt-wrap-table .arco-table-td .arco-table-cell,
#receiptin .receipt-wrap-table .arco-table-td .arco-table-cell-wrap-value {
white-space: normal;
word-break: normal;
overflow-wrap: anywhere;
overflow: visible;
text-overflow: clip;
}
#receiptin .receipt-wrap-table .arco-table-th .arco-table-cell,
#receiptin .receipt-wrap-table .arco-table-th .arco-table-cell-wrap-value,
#receiptin .receipt-wrap-table .arco-table-td:last-child .arco-table-cell {
white-space: nowrap;
}
</style>
<div id="receiptin">
@ -96,7 +114,9 @@
当前托盘来自ERP发货任务。请逐条填写实际出库数量(可以为0),确认后系统一次完成库存扣减、释放分配并回传ERP。
</a-alert>
<a-table class="shipment-compact-table" size="small" :scroll="{ x: 1600 }"
<a-table class="shipment-compact-table" :class="{ 'receipt-wrap-table': !isShipment }"
size="small" table-layout-fixed
:scroll="isShipment ? { x: 1580 } : undefined"
:data="bindList" :columns="displayColumns" :pagination="false"
:row-key="record => isShipment ? record.TaskDetailId : record.Id">
<template #operations="{ record }">
@ -191,38 +211,42 @@
{
title: 'Id',
dataIndex: 'Id',
width: 80
width: 65
},
{
title: '容器编码',
dataIndex: 'ContainerCode',
width: 100
width: 105
},
{
title: '物料编码',
dataIndex: 'MaterialCode',
width: 120,
width: 105,
},
{
title: '图号',
dataIndex: 'MaterialName',
width: 120,
width: 100,
},
{
title: '物料型号',
dataIndex: 'MaterialSpec',
width: 120,
},
{
title: '部件名称',
dataIndex: 'Batch',
width: 110,
},
{
title: '客户订单',
dataIndex: 'SourceCode',
width: 120,
},
{
title: '公司',
dataIndex: 'CompanyCode',
width: 120,
},
{
title: 'ERP发货单',
@ -251,7 +275,8 @@
{
title: '当前库存',
dataIndex: 'Qty',
slotName: 'Qty'
slotName: 'Qty',
width: 90
},
{
title: '实际出库',
@ -263,7 +288,7 @@
{
title: '操作',
slotName: 'operations',
width: 120
width: 105
}
],
formData: {

View File

@ -672,6 +672,7 @@ namespace HHWMS.Web.Controllers
const int pageSize = 100;
var page = 1;
var total = 0;
var fetchedCount = 0;
do
{
var request = new LoadDispatchRequest
@ -696,10 +697,11 @@ namespace HHWMS.Web.Controllers
total = apiResult.Data.Count;
if (apiResult.Data.Data != null)
{
items.AddRange(apiResult.Data.Data.Where(x => x.BReturnFlag == 0));
fetchedCount += apiResult.Data.Data.Count;
items.AddRange(apiResult.Data.Data.Where(x => !x.BReturnFlag));
}
page++;
} while (items.Count < total && page <= 100);
} while (fetchedCount < total && page <= 100);
if (!items.Any())
{

View File

@ -21,7 +21,7 @@ namespace HHWMS.Web.Models
{
public string DLCode { get; set; }
public int BReturnFlag { get; set; }
public bool BReturnFlag { get; set; }
public DateTime? CreateDate { get; set; }

View File

@ -0,0 +1,527 @@
# 成品库、线边库上线说明(2026-08-01)
## 一、上线范围
本次说明覆盖 2026-07-17 以后完成的四项功能:
1. ERP 领料出库回传(线边库)。
2. ERP 查看库存接口增加“公司是否为空、订单号是否为空”筛选(线边库、成品库)。
3. ERP 成品发货通知单联动、分配及实际出库回传(成品库)。
4. 线边库未开始入库任务取消,并联动 WCS 释放占用。
发布程序时保留线上各自的 `appsettings.json`,不要用开发环境配置覆盖。线边 WMS 的 `default` 必须指向线边数据库,成品 WMS 的 `default` 必须指向成品数据库;`WareHouse=xb/cp` 只筛选 `ZoneId`,不会切换数据库。
当前成品发货功能还有两处已完成但尚未提交的兼容修复,发布前必须一并提交、编译:ERP 返回字段 `BReturnFlag` 按布尔值解析;分页按 ERP 实际返回条数推进,避免过滤退货行后重复请求。`test-data`、`tools/erp-mock` 和本地 `appsettings.json` 不进入生产发布包。
## 二、SQL 执行清单
所有变更脚本均可重复执行。执行前备份两个 WMS 数据库,并确认当前连接的数据库名称。
| 需求 | 线边库数据库 | 成品库数据库 |
| --- | --- | --- |
| ERP 领料出库回传 | 执行 `sql/20260717_add_other_out.sql`、`sql/20260717_add_other_out_job.sql`、`sql/20260718_fix_add_other_out_retry_permission.sql` | 执行 `sql/20260717_add_other_out.sql`,用于同步共用实体字段 |
| ERP 查看库存接口优化 | 无写入 SQL;可执行只读脚本 `sql/20260717_inventory_empty_filters_verify.sql` | 无写入 SQL;可执行同一只读脚本 |
| ERP 成品发货联动 | 执行 `sql/20260717_add_sale_out.sql`,用于同步共用实体字段 | 依次执行 `sql/20260717_add_sale_out.sql`、`sql/20260717_add_sale_out_cp.sql`、`sql/20260717_add_sale_out_job.sql`、`sql/20260801_fix_add_sale_out_retry_permission.sql`、`sql/20260801_fix_add_sale_out_page_permissions.sql` |
| 线边入库任务取消 | 无写入 SQL;上线前后可执行只读脚本 `sql/20260718_cancel_xb_inbound_task_verify.sql` | 不执行 |
注意:执行成品库 `20260717_add_sale_out_cp.sql` 时,脚本开头两条重复检查必须均无返回行;如果 `DLsID` 或活动任务的 `ContainerCode` 有重复,先停止并处理重复数据,再创建唯一索引。
### 2.1 线边库集中执行 SQL
连接线边 WMS 的 `default` 数据库后,依次执行以下四段。
```sql
-- A. 共用字段:ERP回传状态
SET @column_exists = (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'InventoryTransaction'
AND COLUMN_NAME = 'UploadErpFlag'
);
SET @ddl = IF(
@column_exists = 0,
'ALTER TABLE `InventoryTransaction` ADD COLUMN `UploadErpFlag` INT NULL COMMENT ''ERP回传状态:0失败,1成功''',
'SELECT ''InventoryTransaction.UploadErpFlag already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- B. 共用字段:ERP发货通知单明细ID
SET @column_exists = (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'ShipmentDetail'
AND COLUMN_NAME = 'DLsID'
);
SET @ddl = IF(
@column_exists = 0,
'ALTER TABLE `ShipmentDetail` ADD COLUMN `DLsID` BIGINT NULL COMMENT ''ERP发货通知单表体明细ID''',
'SELECT ''ShipmentDetail.DLsID already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- C. 领料出库失败自动补传Job,默认暂停
INSERT INTO `SysJob`
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
'AddOtherOutJob', 'AddOtherOutJob', NULL, NULL, '0 */1 * * * ?',
NULL, NULL, NULL, 0, 'ERP领料出库失败自动补传',
NOW(), 'system', NULL, NULL
WHERE NOT EXISTS (
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AddOtherOutJob'
);
-- D. 注册“补传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`, 'RetryAddOtherOut', `Domain`, 0, 0,
(SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1
FROM `frameworkmenus` child
WHERE child.`ParentId` = @inventory_transaction_page_id),
1, `TenantAllowed`, '/inventory/InventoryTransaction/RetryAddOtherOut', 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` = 'RetryAddOtherOut'
);
UPDATE `frameworkmenus`
SET `PageName` = '补传ERP领料出库',
`ActionName` = '补传ERP领料出库',
`Url` = '/inventory/InventoryTransaction/RetryAddOtherOut'
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
AND `MethodName` = 'RetryAddOtherOut';
SET @retry_menu_id = (
SELECT `ID` FROM `frameworkmenus`
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
AND `MethodName` = 'RetryAddOtherOut'
LIMIT 1
);
INSERT INTO `functionprivileges`
(`ID`, `RoleCode`, `MenuItemId`, `Allowed`, `TenantCode`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT UUID(), p.`RoleCode`, @retry_menu_id, 1, p.`TenantCode`,
NOW(), 'system', NULL, NULL
FROM `functionprivileges` p
WHERE p.`MenuItemId` = @inventory_transaction_page_id
AND p.`Allowed` = 1
AND @retry_menu_id IS NOT NULL
AND NOT EXISTS (
SELECT 1 FROM `functionprivileges` e
WHERE e.`RoleCode` = p.`RoleCode`
AND e.`MenuItemId` = @retry_menu_id
AND (e.`TenantCode` <=> p.`TenantCode`)
);
```
### 2.2 成品库集中执行 SQL
连接成品 WMS 的 `default` 数据库后执行。字段、检查和索引应先执行;F 段页面按钮权限应在新程序发布后执行。
```sql
-- F. 新程序发布后执行:注册“获取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
);
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(), p.`RoleCode`, action_menu.`ID`, 1, p.`TenantCode`,
NOW(), 'system', NULL, NULL
FROM `functionprivileges` p
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 p.`MenuItemId` = @shipment_page_id
AND p.`Allowed` = 1
AND NOT EXISTS (
SELECT 1 FROM `functionprivileges` e
WHERE e.`RoleCode` = p.`RoleCode`
AND e.`MenuItemId` = action_menu.`ID`
AND (e.`TenantCode` <=> p.`TenantCode`)
);
```
#### 2.2.1 字段、重复检查、索引、Job及补传权限
连接成品 WMS 的 `default` 数据库后执行。正确顺序是:先执行 A 段增加两个可空字段,再执行 B 段重复检查;B 段两条查询均无返回行,才能继续执行 C 至 E。
```sql
-- B. 上线前重复数据检查:先执行下方A段增加字段,再执行本段;两条查询都必须无返回行
SELECT `DLsID`, COUNT(*) AS DuplicateCount
FROM `ShipmentDetail`
WHERE `DLsID` IS NOT NULL
GROUP BY `DLsID`
HAVING COUNT(*) > 1;
SELECT `ContainerCode`, COUNT(*) AS DuplicateCount
FROM `TaskHeader`
WHERE `ContainerCode` IS NOT NULL
GROUP BY `ContainerCode`
HAVING COUNT(*) > 1;
```
先执行下面的 A 段字段准备;然后执行上面的 B 段检查。确认 B 段两条查询都无返回行后,再继续执行 C 至 E。
```sql
-- A. 两个共用可空字段(本代码块先执行这一段)
SET @column_exists = (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'InventoryTransaction'
AND COLUMN_NAME = 'UploadErpFlag'
);
SET @ddl = IF(
@column_exists = 0,
'ALTER TABLE `InventoryTransaction` ADD COLUMN `UploadErpFlag` INT NULL COMMENT ''ERP回传状态:0失败,1成功''',
'SELECT ''InventoryTransaction.UploadErpFlag already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
SET @column_exists = (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'ShipmentDetail'
AND COLUMN_NAME = 'DLsID'
);
SET @ddl = IF(
@column_exists = 0,
'ALTER TABLE `ShipmentDetail` ADD COLUMN `DLsID` BIGINT NULL COMMENT ''ERP发货通知单表体明细ID''',
'SELECT ''ShipmentDetail.DLsID already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- C. 成品库唯一索引
SET @index_exists = (
SELECT COUNT(*) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'ShipmentDetail'
AND INDEX_NAME = 'IX_ShipmentDetail_DLsID'
);
SET @ddl = IF(
@index_exists = 0,
'CREATE UNIQUE INDEX `IX_ShipmentDetail_DLsID` ON `ShipmentDetail` (`DLsID`)',
'SELECT ''IX_ShipmentDetail_DLsID already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
SET @index_exists = (
SELECT COUNT(*) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'TaskHeader'
AND INDEX_NAME = 'IX_TaskHeader_ContainerCode'
);
SET @ddl = IF(
@index_exists = 0,
'CREATE UNIQUE INDEX `IX_TaskHeader_ContainerCode` ON `TaskHeader` (`ContainerCode`)',
'SELECT ''IX_TaskHeader_ContainerCode already exists'' AS Message'
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- D. 成品出库失败自动补传Job,默认暂停
INSERT INTO `SysJob`
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
SELECT
'AddSaleOutJob', 'AddSaleOutJob', NULL, NULL, '0 */1 * * * ?',
NULL, NULL, NULL, 0, 'ERP成品出库失败自动补传',
NOW(), 'system', NULL, NULL
WHERE NOT EXISTS (
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AddSaleOutJob'
);
-- E. 注册“补传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_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(), p.`RoleCode`, @retry_menu_id, 1, p.`TenantCode`,
NOW(), 'system', NULL, NULL
FROM `functionprivileges` p
WHERE p.`MenuItemId` = @inventory_transaction_page_id
AND p.`Allowed` = 1
AND @retry_menu_id IS NOT NULL
AND NOT EXISTS (
SELECT 1 FROM `functionprivileges` e
WHERE e.`RoleCode` = p.`RoleCode`
AND e.`MenuItemId` = @retry_menu_id
AND (e.`TenantCode` <=> p.`TenantCode`)
);
```
### 2.3 无写入变更事项
ERP 查看库存接口优化、线边入库任务取消均不需要写入 SQL。它们对应的核查 SQL 已保留在本仓库:
- 两库库存空值基线:`sql/20260717_inventory_empty_filters_verify.sql`。
- 线边取消任务前后核查:`sql/20260718_cancel_xb_inbound_task_verify.sql`。
SQL 执行后可统一复查:
```sql
-- 两个数据库都应返回 UploadErpFlag、DLsID
SHOW COLUMNS FROM `InventoryTransaction` LIKE 'UploadErpFlag';
SHOW COLUMNS FROM `ShipmentDetail` LIKE 'DLsID';
-- 仅线边库:领料出库补传任务默认保持暂停(Status=0)
SELECT `JobName`, `CronExpression`, `Status`
FROM `SysJob`
WHERE `JobName` = 'AddOtherOutJob';
-- 仅成品库:唯一索引及补传任务
SHOW INDEX FROM `ShipmentDetail` WHERE `Key_name` = 'IX_ShipmentDetail_DLsID';
SHOW INDEX FROM `TaskHeader` WHERE `Key_name` = 'IX_TaskHeader_ContainerCode';
SELECT `JobName`, `CronExpression`, `Status`
FROM `SysJob`
WHERE `JobName` = 'AddSaleOutJob';
-- 仅线边库:按钮及角色权限
SELECT m.`PageName`, m.`MethodName`, m.`Url`, p.`RoleCode`, p.`Allowed`
FROM `frameworkmenus` m
LEFT JOIN `functionprivileges` p ON p.`MenuItemId` = m.`ID`
WHERE m.`MethodName` = 'RetryAddOtherOut';
-- 仅成品库:按钮及角色权限
SELECT m.`PageName`, m.`MethodName`, m.`Url`, p.`RoleCode`, p.`Allowed`
FROM `frameworkmenus` m
LEFT JOIN `functionprivileges` p ON p.`MenuItemId` = m.`ID`
WHERE m.`MethodName` = 'RetryAddSaleOut';
-- 仅成品库:拉取ERP单及分配按钮权限
SELECT m.`PageName`, m.`MethodName`, m.`Url`, p.`RoleCode`, p.`Allowed`
FROM `frameworkmenus` m
LEFT JOIN `functionprivileges` p ON p.`MenuItemId` = m.`ID`
WHERE m.`ClassName` = 'HHWMS.Web.Controllers,ShipmentHeader'
AND m.`MethodName` IN (
'GetShipmentDetails', 'Allocate', 'GetAllocationData',
'GetAvailableInventories', 'AllocateInventories', 'CancelAllocation',
'CancelPendingTask', 'DispatchPendingTask'
)
ORDER BY m.`MethodName`, p.`RoleCode`;
```
两个自动补传 Job 默认均为暂停。先完成真实 ERP 单笔测试,再决定是否启用,避免上线后批量补传历史失败记录。
## 三、主要更新内容与线上复查
### 1. ERP 领料出库回传(线边库)
出库任务完成后不再调用 `FinishIn`,改调 ERP `AddOtherOut`;每次回传生成新的 `CK` 单号。回传失败仍完成原 WCS/WMS 出库流程,并在库存交易记录中保留失败状态,可由页面按钮或 `AddOtherOutJob` 补传。
线上复查:
1. 完成一笔线边领料出库,确认库存正常扣减。
2. 在库存交易中确认记录为 `Type=out`、`BillType=AddOtherOut`;成功时 `UploadErpFlag=1`。
3. 用一笔可控失败数据确认“补传ERP领料出库”按钮可见,补传失败有日志,成功后状态更新。
### 2. ERP 查看库存接口优化(线边库、成品库)
接口仍为 `POST /api/Inventory/Search`。新增两个可选参数:`CompanyIsEmpty` 对应库存的公司字段 `CompanyCode`,`OrderIsEmpty` 对应页面客户单号保存到的 `SourceCode`。参数不传时保持旧查询行为;`true` 查询空值,`false` 查询非空值。
必须分别调用两套程序:
```text
<线边WMS地址>/api/Inventory/Search WareHouse=xb
<成品WMS地址>/api/Inventory/Search WareHouse=cp
```
复查请求示例:
```json
{
"WareHouse": "cp",
"CompanyIsEmpty": false,
"OrderIsEmpty": false,
"Page": 1,
"Limit": 20
}
```
线上复查:先不传两个新参数记录总数,再分别用 `true`、`false` 查询;返回行的 `Company`、`SourceCode` 应与筛选条件一致。若线边 URL 传 `cp` 或成品 URL 传 `xb` 查不到数据,属于当前双程序、双数据库架构的正常结果,不能依赖该参数跨库查询。
### 3. ERP 成品发货联动(成品库)
出库单页面可按 ERP 发货通知单号拉取数据;只导入非退货明细。人员选择库存并填写分配数量、选择出库口后下发整托任务;托盘到站后由人员填写每条明细的实际出库数量,系统按实际数量扣库存、释放分配并调用 ERP `AddSaleOut`。失败记录可在库存交易页面或 `AddSaleOutJob` 补传。
线上复查:
1. 用一张 ERP 发货通知单拉取,确认退货行不导入、重复拉取不产生重复明细。
2. 同一库存先分配一部分、再追加分配,确认不再出现实体重复跟踪报错;超出剩余需求时错误提示位于最上层。
3. 确认库存选择窗口、出库口下拉均可正常操作,并能选择六个成品出库口之一。
4. WCS 将托盘置为到站后,在成品出入库操作页填写小于分配量的实际数量;确认只扣实际数量,而不是扣完整分配数量。
5. 确认 `ShipmentDetail.CompletedQty`(已出库数量)、`DividedQty`(仍占用的分配数量)与库存数量同步更新,并在库存交易中生成 `BillType=AddSaleOut` 的回传记录。
### 4. 线边未开始入库任务取消(线边 WMS + 线边 WCS)
任务列表增加取消入口。对于已经下发的任务,WMS 先调用 WCS `TaskCancel`;WCS 仅删除“任务创建、尚未开始”的任务。WCS 找不到任务时按成功返回;任务已经开始时拒绝取消。新建或待下发任务无需调用 WCS;校验通过后,WMS 删除入库任务并恢复托盘、库位及零库存占用状态。
线上复查:
1. 选一笔尚未开始的线边入库任务取消,确认 WCS 任务删除、WMS 任务删除,目标库位和托盘均解除锁定。
2. 选一笔 WCS 已不存在但 WMS 仍存在的未开始任务,确认可以正常取消并恢复 WMS 占用。
3. 选一笔 WCS 已开始任务,确认取消被拒绝,WMS 任务、库存、托盘和库位均不发生变化。
4. 取消前后执行只读脚本 `20260718_cancel_xb_inbound_task_verify.sql`,并把脚本中的 `@TaskNo` 替换为实测任务号,成功后 `RemainingTaskCount` 应为 0。
## 四、上线顺序
1. 备份线边库、成品库数据库,记录两套程序现有 `appsettings.json`。
2. 按上表先执行两库共用字段 SQL,再执行线边专用、成品专用 SQL。
3. 发布 WMS 到线边、成品两套程序,但保留各自线上配置;同时发布线边 WCS 的两个取消任务提交。
4. 重启程序,先保持两个补传 Job 暂停,按第三节各做一笔复查。
5. ERP、库存、WCS 状态均一致后再开放正式操作;是否启用自动补传 Job 单独确认。

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;

View File

@ -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`;

View File

@ -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`;

File diff suppressed because it is too large Load Diff

89
tools/erp-mock/server.cjs Normal file
View File

@ -0,0 +1,89 @@
const http = require('http');
const fs = require('fs');
const path = require('path');
const port = Number(process.env.ERP_MOCK_PORT || 4523);
const fixturePath = process.env.ERP_MOCK_DATA
|| path.resolve(__dirname, '../../test-data/erp/load-dispatch-response.json');
function sendJson(response, statusCode, value) {
response.writeHead(statusCode, { 'Content-Type': 'application/json; charset=utf-8' });
response.end(JSON.stringify(value));
}
function readBody(request) {
return new Promise((resolve, reject) => {
let body = '';
request.setEncoding('utf8');
request.on('data', chunk => { body += chunk; });
request.on('end', () => {
try {
resolve(body ? JSON.parse(body) : {});
} catch (error) {
reject(error);
}
});
request.on('error', reject);
});
}
const server = http.createServer(async (request, response) => {
const requestPath = new URL(request.url, `http://${request.headers.host}`).pathname;
if (request.method === 'GET' && requestPath === '/health') {
return sendJson(response, 200, { status: 'ok', fixturePath });
}
if (request.method !== 'POST' || !requestPath.toLowerCase().endsWith('/loaddispatch')) {
return sendJson(response, 404, { code: 404, msg: 'Not Found', count: 0, data: [] });
}
try {
const body = await readBody(request);
const fixture = JSON.parse(fs.readFileSync(fixturePath, 'utf8'));
let rows = Array.isArray(fixture.data) ? fixture.data : [];
const exactFilters = [
['DLCode', 'DLCode'],
['InvCode', 'InvCode'],
['CusCode', 'CusCode']
];
for (const [requestName, rowName] of exactFilters) {
const value = String(body[requestName] ?? '').trim();
if (value) rows = rows.filter(row => String(row[rowName] ?? '') === value);
}
const containsFilters = [
['InvName', 'InvName'],
['CusName', 'CusName'],
['InvDefine1', 'InvDefine1'],
['InvDefine4', 'InvDefine4']
];
for (const [requestName, rowName] of containsFilters) {
const value = String(body[requestName] ?? '').trim().toLowerCase();
if (value) {
rows = rows.filter(row => String(row[rowName] ?? '').toLowerCase().includes(value));
}
}
const count = rows.length;
const size = Math.max(1, Number(body.Size) || 100);
const page = Math.max(1, Number(body.Page) || 1);
rows = rows.slice((page - 1) * size, page * size);
console.log(`${new Date().toISOString()} LoadDispatch DLCode=${body.DLCode || ''} page=${page} size=${size} count=${count}`);
return sendJson(response, 200, {
data: rows,
count,
code: Number(fixture.code) || 0,
msg: fixture.msg || ''
});
} catch (error) {
console.error(error);
return sendJson(response, 500, { data: [], count: 0, code: 500, msg: error.message });
}
});
server.listen(port, '127.0.0.1', () => {
console.log(`ERP mock listening on http://127.0.0.1:${port}`);
console.log(`Fixture: ${fixturePath}`);
});