From df1bd3860108b42aba71f693fe5f82927c9e3cb3 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 6 Jul 2026 19:28:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B5=81=E6=B0=B4=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=94=81=E5=AE=9A=E7=B1=BB=E7=9B=AE=E8=AF=AD=E4=B9=89?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/model/stock_transaction.js | 4 +-- app/service/systems/stock_store.js | 4 +-- app/service/systems/storage/report.js | 4 +++ ...60706-add-lock-to-wms-stock-transaction.js | 27 +++++++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 database/migrations/20260706-add-lock-to-wms-stock-transaction.js diff --git a/app/model/stock_transaction.js b/app/model/stock_transaction.js index 7039940..46f1508 100644 --- a/app/model/stock_transaction.js +++ b/app/model/stock_transaction.js @@ -11,9 +11,9 @@ module.exports = app => { comment: '主键ID', }, transaction_type: { - type: ENUM('INBOUND', 'OUTBOUND'), + type: ENUM('INBOUND', 'OUTBOUND', 'LOCK'), allowNull: false, - comment: '出入库类型', + comment: '出入库类型:INBOUND入库 OUTBOUND出库 LOCK锁定', }, warehouse_id: { type: BIGINT(20).UNSIGNED, diff --git a/app/service/systems/stock_store.js b/app/service/systems/stock_store.js index f96a6c8..2a712b9 100644 --- a/app/service/systems/stock_store.js +++ b/app/service/systems/stock_store.js @@ -732,9 +732,9 @@ class stockStoreService extends Service { // 写入流水(除非显式跳过) const skipLog = meta.skipTransactionLog === true; if (!skipLog && ctx.service && ctx.service.systems && ctx.service.systems.stockTransaction) { - // transaction_type 字段为 ENUM('INBOUND','OUTBOUND'),锁定/解锁属于出库流程 + // 锁定操作使用 LOCK 类型,释放操作使用 OUTBOUND await ctx.service.systems.stockTransaction.create({ - transaction_type: 'OUTBOUND', + transaction_type: isLocking ? 'LOCK' : 'OUTBOUND', warehouse_id: stockRecord.warehouse_id, store_id: stockRecord.store_id, stock_id: stockId, diff --git a/app/service/systems/storage/report.js b/app/service/systems/storage/report.js index d1ec587..338091b 100644 --- a/app/service/systems/storage/report.js +++ b/app/service/systems/storage/report.js @@ -127,6 +127,10 @@ function formatTransactionType(transactionType) { return '移库入'; } + if (normalizedType === 'LOCK') { + return '锁定'; + } + return rawType; } diff --git a/database/migrations/20260706-add-lock-to-wms-stock-transaction.js b/database/migrations/20260706-add-lock-to-wms-stock-transaction.js new file mode 100644 index 0000000..89c1f08 --- /dev/null +++ b/database/migrations/20260706-add-lock-to-wms-stock-transaction.js @@ -0,0 +1,27 @@ +'use strict'; + +/** + * 为 wms_stock_transaction.transaction_type ENUM 增加 LOCK。 + * LOCK:库存锁定流水(如分配订单锁定库存)。 + */ +module.exports = { + async up(queryInterface) { + const { sequelize } = queryInterface; + await sequelize.query(` + ALTER TABLE wms_stock_transaction + MODIFY COLUMN transaction_type ENUM( + 'INBOUND', 'OUTBOUND', 'LOCK' + ) NOT NULL COMMENT '出入库类型:INBOUND入库 OUTBOUND出库 LOCK锁定' + `); + }, + + async down(queryInterface) { + const { sequelize } = queryInterface; + await sequelize.query(` + ALTER TABLE wms_stock_transaction + MODIFY COLUMN transaction_type ENUM( + 'INBOUND', 'OUTBOUND' + ) NOT NULL COMMENT '出入库类型' + `); + }, +};