feat(order): wms_order_b2b 表模型与迁移内容(order_delivery 附属表)
- app/model/order_b2b.js:ctx.model.OrderB2b,order_id 关联 wms_order_delivery 分表 id,uk_order_id 唯一,warehouse_id/store_id 维度隔离,软删除 - order_stockout.js 回滚 hasOne(OrderStockoutB2b) 关联 - 迁移内容改为 wms_order_b2b + delivery_order_code 快照 - 开发库已执行核验 14 列;生产库待随发布执行
This commit is contained in:
parent
2e42d47302
commit
ee7f08b192
131
app/model/order_b2b.js
Normal file
131
app/model/order_b2b.js
Normal file
@ -0,0 +1,131 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* B2B 订单作业明细表 Model。
|
||||
*
|
||||
* 对应数据库表 `wms_order_b2b`,与发货单(订单)分表 wms_order_delivery_% 一对一
|
||||
* (order_id 关联分表 id),记录 B2B 订单的提货作业信息:
|
||||
* 总箱数、提货车牌、备货备注、备货用时、是否提货等。
|
||||
*
|
||||
* 不分表(不按仓库分表),通过 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 OrderB2b = app.model.define('wms_order_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_delivery 分表 id',
|
||||
},
|
||||
warehouse_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '仓库ID',
|
||||
},
|
||||
store_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '货主ID',
|
||||
},
|
||||
delivery_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_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_delivery_order_code',
|
||||
fields: [ 'delivery_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' ],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
return OrderB2b;
|
||||
};
|
||||
@ -284,7 +284,7 @@ module.exports = app => {
|
||||
* - 关联出库明细表
|
||||
*/
|
||||
OrderStockout.associate = function() {
|
||||
const { OrderStockout, Store, OrderStockoutItems, OrderStockoutB2b } = app.model;
|
||||
const { OrderStockout, Store, OrderStockoutItems } = app.model;
|
||||
|
||||
// 关联仓库
|
||||
OrderStockout.belongsTo(Store, {
|
||||
@ -303,12 +303,6 @@ module.exports = app => {
|
||||
foreignKey: 'order_id',
|
||||
as: 'items',
|
||||
});
|
||||
|
||||
// 关联 B2B 出库作业明细(一对一)
|
||||
OrderStockout.hasOne(OrderStockoutB2b, {
|
||||
foreignKey: 'order_id',
|
||||
as: 'b2bWork',
|
||||
});
|
||||
};
|
||||
|
||||
// ---------- 状态机辅助方法 ----------
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 创建 B2B 出库作业明细表 wms_order_stockout_b2b。
|
||||
* 创建 B2B 订单作业明细表 wms_order_b2b。
|
||||
*
|
||||
* 与出库单主表 wms_order_stockout 一对一(order_id 关联主表 id,uk_order_id 唯一),
|
||||
* 与发货单(订单)主表 wms_order_delivery 分表一对一(order_id 关联分表 id,uk_order_id 唯一),
|
||||
* 不分表(单表全量),通过 warehouse_id/store_id 做数据隔离与检索维度,
|
||||
* 类似 wms_order_express(运单号表)的落表方式。
|
||||
*
|
||||
* 字段:
|
||||
* order_id 出库单ID(关联 wms_order_stockout.id,唯一)
|
||||
* order_id 订单ID(关联 wms_order_delivery 分表 id,唯一)
|
||||
* warehouse_id / store_id 仓库/货主维度
|
||||
* stockout_order_code 出库单号快照(便于按单号检索)
|
||||
* delivery_order_code 发货单号快照(便于按单号检索)
|
||||
* total_box_count 总箱数
|
||||
* pickup_plate_number 提货车牌
|
||||
* prep_remark 备货备注
|
||||
@ -21,11 +21,11 @@
|
||||
*
|
||||
* 索引:
|
||||
* uk_order_id(order_id 唯一)
|
||||
* idx_warehouse_id / idx_store_id / idx_stockout_order_code
|
||||
* idx_warehouse_id / idx_store_id / idx_delivery_order_code
|
||||
* idx_pickup_plate_number / idx_is_picked_up / idx_deleted_at
|
||||
*/
|
||||
|
||||
const TABLE_NAME = 'wms_order_stockout_b2b';
|
||||
const TABLE_NAME = 'wms_order_b2b';
|
||||
|
||||
module.exports = {
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
@ -42,7 +42,7 @@ module.exports = {
|
||||
order_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '出库单ID,关联 wms_order_stockout.id',
|
||||
comment: '订单ID,关联 wms_order_delivery 分表 id',
|
||||
},
|
||||
warehouse_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
@ -54,10 +54,10 @@ module.exports = {
|
||||
allowNull: true,
|
||||
comment: '货主ID',
|
||||
},
|
||||
stockout_order_code: {
|
||||
delivery_order_code: {
|
||||
type: STRING(50),
|
||||
allowNull: true,
|
||||
comment: '出库单号快照',
|
||||
comment: '发货单号快照',
|
||||
},
|
||||
total_box_count: {
|
||||
type: INTEGER(11),
|
||||
@ -100,7 +100,7 @@ module.exports = {
|
||||
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, [ 'delivery_order_code' ], { name: 'idx_delivery_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' });
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user