From 55a6a484dc0b4139dbb3cd92a26232973194b740 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 8 Oct 2026 21:54:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(stockout):=20=E6=96=B0=E5=A2=9E=20B2B=20?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BD=9C=E4=B8=9A=E6=98=8E=E7=BB=86=E5=89=AF?= =?UTF-8?q?=E8=A1=A8=20wms=5Forder=5Fstockout=5Fb2b?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 与出库单主表 wms_order_stockout 一对一(order_id 关联主表 id,uk_order_id 唯一), 不分表(类似 wms_order_express 运单号表),warehouse_id/store_id 维度隔离 - 字段:总箱数 total_box_count、提货车牌 pickup_plate_number、备货备注 prep_remark、 备货用时 prep_duration_seconds(秒)、是否提货 is_picked_up(Y/N)、提货时间 picked_up_at、 出库单号快照 stockout_order_code + created_at/updated_at/deleted_at - 索引:uk_order_id、idx_warehouse_id、idx_store_id、idx_stockout_order_code、 idx_pickup_plate_number、idx_is_picked_up、idx_deleted_at - 关联:OrderStockout.hasOne(OrderStockoutB2b, as='b2bWork') - 迁移 20261008193000 已在开发库(127.0.0.1:3307)执行并核验 14 列+8 索引; 生产库待随发布执行 --- app/model/order_stockout.js | 8 +- app/model/order_stockout_b2b.js | 144 ++++++++++++++++++ ...008193000-create-wms-order-stockout-b2b.js | 113 ++++++++++++++ 3 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 app/model/order_stockout_b2b.js create mode 100644 database/migrations/20261008193000-create-wms-order-stockout-b2b.js diff --git a/app/model/order_stockout.js b/app/model/order_stockout.js index 66f6c17..3a34de5 100644 --- a/app/model/order_stockout.js +++ b/app/model/order_stockout.js @@ -284,7 +284,7 @@ module.exports = app => { * - 关联出库明细表 */ OrderStockout.associate = function() { - const { OrderStockout, Store, OrderStockoutItems } = app.model; + const { OrderStockout, Store, OrderStockoutItems, OrderStockoutB2b } = app.model; // 关联仓库 OrderStockout.belongsTo(Store, { @@ -303,6 +303,12 @@ module.exports = app => { foreignKey: 'order_id', as: 'items', }); + + // 关联 B2B 出库作业明细(一对一) + OrderStockout.hasOne(OrderStockoutB2b, { + foreignKey: 'order_id', + as: 'b2bWork', + }); }; // ---------- 状态机辅助方法 ---------- diff --git a/app/model/order_stockout_b2b.js b/app/model/order_stockout_b2b.js new file mode 100644 index 0000000..34e1fe0 --- /dev/null +++ b/app/model/order_stockout_b2b.js @@ -0,0 +1,144 @@ +'use strict'; + +/** + * B2B 出库作业明细表 Model。 + * + * 对应数据库表 `wms_order_stockout_b2b`,与出库单主表 `wms_order_stockout` 一对一 + * (order_id 关联 wms_order_stockout.id),记录 B2B 出库单(order_type=B2BCK)的 + * 提货作业信息:总箱数、提货车牌、备货备注、备货用时、是否提货等。 + * + * 与主表一致不分表(不按仓库分表),通过 warehouse_id/store_id 维度隔离, + * 落表方式类似 wms_order_express(运单号表)。 + * @param {import('egg').Application} app - Egg 应用实例 + */ +module.exports = app => { + const { STRING, INTEGER, BIGINT, ENUM, DATE } = app.Sequelize; + + const OrderStockoutB2b = app.model.define('wms_order_stockout_b2b', { + id: { + type: BIGINT(20).UNSIGNED, + primaryKey: true, + autoIncrement: true, + allowNull: false, + comment: '主键ID', + }, + order_id: { + type: BIGINT(20).UNSIGNED, + allowNull: false, + comment: '出库单ID,关联 wms_order_stockout.id', + }, + warehouse_id: { + type: BIGINT(20).UNSIGNED, + allowNull: false, + comment: '仓库ID', + }, + store_id: { + type: BIGINT(20).UNSIGNED, + allowNull: true, + comment: '货主ID', + }, + stockout_order_code: { + type: STRING(50), + allowNull: true, + comment: '出库单号快照', + }, + total_box_count: { + type: INTEGER(11), + allowNull: false, + defaultValue: 0, + comment: '总箱数', + }, + pickup_plate_number: { + type: STRING(20), + allowNull: true, + comment: '提货车牌', + }, + prep_remark: { + type: STRING(500), + allowNull: true, + comment: '备货备注', + }, + prep_duration_seconds: { + type: INTEGER(11), + allowNull: false, + defaultValue: 0, + comment: '备货用时(秒)', + }, + is_picked_up: { + type: ENUM('Y', 'N'), + allowNull: false, + defaultValue: 'N', + comment: '是否提货:Y=已提货 N=未提货', + }, + picked_up_at: { + type: DATE, + allowNull: true, + comment: '提货时间', + }, + created_at: { + type: DATE, + allowNull: false, + comment: '创建时间', + }, + updated_at: { + type: DATE, + allowNull: false, + comment: '更新时间', + }, + deleted_at: { + type: DATE, + allowNull: true, + comment: '软删除时间', + }, + }, { + tableName: 'wms_order_stockout_b2b', + comment: 'B2B出库作业明细表', + timestamps: false, + indexes: [ + { + name: 'uk_order_id', + unique: true, + fields: [ 'order_id' ], + }, + { + name: 'idx_warehouse_id', + fields: [ 'warehouse_id' ], + }, + { + name: 'idx_store_id', + fields: [ 'store_id' ], + }, + { + name: 'idx_stockout_order_code', + fields: [ 'stockout_order_code' ], + }, + { + name: 'idx_pickup_plate_number', + fields: [ 'pickup_plate_number' ], + }, + { + name: 'idx_is_picked_up', + fields: [ 'is_picked_up' ], + }, + { + name: 'idx_deleted_at', + fields: [ 'deleted_at' ], + }, + ], + }); + + /** + * 关联关系定义。 + * - 关联出库单主表 + */ + OrderStockoutB2b.associate = function() { + const { OrderStockout, OrderStockoutB2b } = app.model; + + OrderStockoutB2b.belongsTo(OrderStockout, { + foreignKey: 'order_id', + as: 'stockout', + }); + }; + + return OrderStockoutB2b; +}; diff --git a/database/migrations/20261008193000-create-wms-order-stockout-b2b.js b/database/migrations/20261008193000-create-wms-order-stockout-b2b.js new file mode 100644 index 0000000..ee52b25 --- /dev/null +++ b/database/migrations/20261008193000-create-wms-order-stockout-b2b.js @@ -0,0 +1,113 @@ +'use strict'; + +/** + * 创建 B2B 出库作业明细表 wms_order_stockout_b2b。 + * + * 与出库单主表 wms_order_stockout 一对一(order_id 关联主表 id,uk_order_id 唯一), + * 不分表(单表全量),通过 warehouse_id/store_id 做数据隔离与检索维度, + * 类似 wms_order_express(运单号表)的落表方式。 + * + * 字段: + * order_id 出库单ID(关联 wms_order_stockout.id,唯一) + * warehouse_id / store_id 仓库/货主维度 + * stockout_order_code 出库单号快照(便于按单号检索) + * total_box_count 总箱数 + * pickup_plate_number 提货车牌 + * prep_remark 备货备注 + * prep_duration_seconds 备货用时(秒) + * is_picked_up 是否提货(Y/N) + * picked_up_at 提货时间 + * created_at / updated_at / deleted_at 审计与软删除 + * + * 索引: + * uk_order_id(order_id 唯一) + * idx_warehouse_id / idx_store_id / idx_stockout_order_code + * idx_pickup_plate_number / idx_is_picked_up / idx_deleted_at + */ + +const TABLE_NAME = 'wms_order_stockout_b2b'; + +module.exports = { + // eslint-disable-next-line no-unused-vars + async up(queryInterface, Sequelize) { + const { BIGINT, STRING, INTEGER, ENUM, DATE } = Sequelize; + await queryInterface.createTable(TABLE_NAME, { + id: { + type: BIGINT(20).UNSIGNED, + primaryKey: true, + autoIncrement: true, + allowNull: false, + comment: '主键ID', + }, + order_id: { + type: BIGINT(20).UNSIGNED, + allowNull: false, + comment: '出库单ID,关联 wms_order_stockout.id', + }, + warehouse_id: { + type: BIGINT(20).UNSIGNED, + allowNull: false, + comment: '仓库ID', + }, + store_id: { + type: BIGINT(20).UNSIGNED, + allowNull: true, + comment: '货主ID', + }, + stockout_order_code: { + type: STRING(50), + allowNull: true, + comment: '出库单号快照', + }, + total_box_count: { + type: INTEGER(11), + allowNull: false, + defaultValue: 0, + comment: '总箱数', + }, + pickup_plate_number: { + type: STRING(20), + allowNull: true, + comment: '提货车牌', + }, + prep_remark: { + type: STRING(500), + allowNull: true, + comment: '备货备注', + }, + prep_duration_seconds: { + type: INTEGER(11), + allowNull: false, + defaultValue: 0, + comment: '备货用时(秒)', + }, + is_picked_up: { + type: ENUM('Y', 'N'), + allowNull: false, + defaultValue: 'N', + comment: '是否提货:Y=已提货 N=未提货', + }, + picked_up_at: { + type: DATE, + allowNull: true, + comment: '提货时间', + }, + created_at: { type: DATE, allowNull: false, comment: '创建时间' }, + updated_at: { type: DATE, allowNull: false, comment: '更新时间' }, + deleted_at: { type: DATE, allowNull: true, comment: '软删除时间' }, + }); + + await queryInterface.addIndex(TABLE_NAME, [ 'order_id' ], { unique: true, name: 'uk_order_id' }); + await queryInterface.addIndex(TABLE_NAME, [ 'warehouse_id' ], { name: 'idx_warehouse_id' }); + await queryInterface.addIndex(TABLE_NAME, [ 'store_id' ], { name: 'idx_store_id' }); + await queryInterface.addIndex(TABLE_NAME, [ 'stockout_order_code' ], { name: 'idx_stockout_order_code' }); + await queryInterface.addIndex(TABLE_NAME, [ 'pickup_plate_number' ], { name: 'idx_pickup_plate_number' }); + await queryInterface.addIndex(TABLE_NAME, [ 'is_picked_up' ], { name: 'idx_is_picked_up' }); + await queryInterface.addIndex(TABLE_NAME, [ 'deleted_at' ], { name: 'idx_deleted_at' }); + }, + + // eslint-disable-next-line no-unused-vars + async down(queryInterface, Sequelize) { + await queryInterface.dropTable(TABLE_NAME); + }, +};