use_status 重命名为 warehouse_use_status,新增 store_use_status;仓库/货主侧独立控制签约使用状态,unbind 按身份分派字段
This commit is contained in:
parent
41ef9b40de
commit
76c52fa268
@ -554,10 +554,17 @@ module.exports = app => {
|
|||||||
}));
|
}));
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
use_status: {
|
warehouse_use_status: {
|
||||||
type: INTEGER(1),
|
type: INTEGER(1),
|
||||||
allowNull: false,
|
allowNull: false,
|
||||||
comment: '使用状态,0-不可用,1-可用(SKU可见,货主可见,即使解约了)',
|
defaultValue: 1,
|
||||||
|
comment: '仓库侧使用状态:0-不可用,1-可用',
|
||||||
|
},
|
||||||
|
store_use_status: {
|
||||||
|
type: INTEGER(1),
|
||||||
|
allowNull: false,
|
||||||
|
defaultValue: 1,
|
||||||
|
comment: '货主侧使用状态:0-不可用,1-可用',
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
tableName: 'wms_store_warehouse',
|
tableName: 'wms_store_warehouse',
|
||||||
@ -727,11 +734,11 @@ module.exports = app => {
|
|||||||
const {
|
const {
|
||||||
warehouseId,
|
warehouseId,
|
||||||
storeId,
|
storeId,
|
||||||
useStatus = 1,
|
warehouseUseStatus = 1,
|
||||||
} = options;
|
} = options;
|
||||||
|
|
||||||
const where = {
|
const where = {
|
||||||
use_status: useStatus,
|
warehouse_use_status: warehouseUseStatus,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (warehouseId !== undefined && warehouseId !== null) {
|
if (warehouseId !== undefined && warehouseId !== null) {
|
||||||
@ -751,7 +758,7 @@ module.exports = app => {
|
|||||||
warehouseId,
|
warehouseId,
|
||||||
storeId,
|
storeId,
|
||||||
required = false,
|
required = false,
|
||||||
useStatus = 1,
|
warehouseUseStatus = 1,
|
||||||
attributes = [ 'store_id', 'store_remask' ],
|
attributes = [ 'store_id', 'store_remask' ],
|
||||||
} = options;
|
} = options;
|
||||||
|
|
||||||
@ -762,7 +769,7 @@ module.exports = app => {
|
|||||||
where: this.buildScopedWhere({
|
where: this.buildScopedWhere({
|
||||||
warehouseId,
|
warehouseId,
|
||||||
storeId,
|
storeId,
|
||||||
useStatus,
|
warehouseUseStatus,
|
||||||
}),
|
}),
|
||||||
required,
|
required,
|
||||||
};
|
};
|
||||||
|
|||||||
@ -3684,7 +3684,7 @@ class WaveService extends OrderBaseService {
|
|||||||
attributes: [ 'store_id' ],
|
attributes: [ 'store_id' ],
|
||||||
where: {
|
where: {
|
||||||
warehouse_id: normalizedWarehouseId,
|
warehouse_id: normalizedWarehouseId,
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
},
|
},
|
||||||
raw: true,
|
raw: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@ -785,7 +785,7 @@ class DeliveryOrderService extends Service {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据货主仓库策略解析订单步骤。
|
* 根据货主仓库策略解析订单步骤。
|
||||||
* 若货主与仓库之间不存在已启用已签约的记录(auth_status=2, use_status=1),则抛出错误拒绝创建。
|
* 若货主与仓库之间不存在已启用已签约的记录(auth_status=2, warehouse_use_status=1),则抛出错误拒绝创建。
|
||||||
*
|
*
|
||||||
* @param {Object} info 当前仓库与货主上下文,需包含 storeId 和 warehouseId。
|
* @param {Object} info 当前仓库与货主上下文,需包含 storeId 和 warehouseId。
|
||||||
* @param {Object|null} transaction 数据库事务。
|
* @param {Object|null} transaction 数据库事务。
|
||||||
@ -806,7 +806,7 @@ class DeliveryOrderService extends Service {
|
|||||||
store_id: storeId,
|
store_id: storeId,
|
||||||
warehouse_id: warehouseId,
|
warehouse_id: warehouseId,
|
||||||
auth_status: 2,
|
auth_status: 2,
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
},
|
},
|
||||||
attributes: [ 'id' ],
|
attributes: [ 'id' ],
|
||||||
transaction,
|
transaction,
|
||||||
|
|||||||
@ -714,7 +714,7 @@ class PickSystemService extends Service {
|
|||||||
store_id: currentStoreId,
|
store_id: currentStoreId,
|
||||||
warehouse_id: normalizedWarehouseId,
|
warehouse_id: normalizedWarehouseId,
|
||||||
},
|
},
|
||||||
attributes: [ 'id', 'store_id', 'warehouse_id', 'store_remask', 'warehouse_remask', 'auth_status', 'use_status' ],
|
attributes: [ 'id', 'store_id', 'warehouse_id', 'store_remask', 'warehouse_remask', 'auth_status', 'warehouse_use_status', 'store_use_status' ],
|
||||||
raw: true,
|
raw: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -326,9 +326,9 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
where.auth_status = authStatus;
|
where.auth_status = authStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
const useStatus = this.normalizeStatusFlag(data.use_status, 'use_status', null);
|
const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', null);
|
||||||
if (useStatus !== null) {
|
if (useStatus !== null) {
|
||||||
where.use_status = useStatus;
|
where.warehouse_use_status = useStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
return where;
|
return where;
|
||||||
@ -421,7 +421,8 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
reviewed_by: item.reviewed_by ? Number(item.reviewed_by) : null,
|
reviewed_by: item.reviewed_by ? Number(item.reviewed_by) : null,
|
||||||
ended_by: item.ended_by ? Number(item.ended_by) : null,
|
ended_by: item.ended_by ? Number(item.ended_by) : null,
|
||||||
remask: currentIsWarehouse ? (item.store_remask || '') : (item.warehouse_remask || ''),
|
remask: currentIsWarehouse ? (item.store_remask || '') : (item.warehouse_remask || ''),
|
||||||
use_status: Number(item.use_status || 0),
|
warehouse_use_status: Number(item.warehouse_use_status || 0),
|
||||||
|
store_use_status: Number(item.store_use_status || 0),
|
||||||
is_auth_valid: isAuthValid,
|
is_auth_valid: isAuthValid,
|
||||||
remaining_days: remainingDays,
|
remaining_days: remainingDays,
|
||||||
};
|
};
|
||||||
@ -542,7 +543,8 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
applied_by: Number(payload.initiated_by || 0) || accountId,
|
applied_by: Number(payload.initiated_by || 0) || accountId,
|
||||||
reviewed_by: accountId,
|
reviewed_by: accountId,
|
||||||
ended_by: null,
|
ended_by: null,
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
|
store_use_status: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (payload.store_remask !== undefined) {
|
if (payload.store_remask !== undefined) {
|
||||||
@ -682,11 +684,12 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
try {
|
try {
|
||||||
const currentSubject = await this.getCurrentSubject();
|
const currentSubject = await this.getCurrentSubject();
|
||||||
const relation = await this.findScopedRelation(data, currentSubject, transaction);
|
const relation = await this.findScopedRelation(data, currentSubject, transaction);
|
||||||
const nextUseStatus = this.normalizeStatusFlag(data.use_status, 'use_status', 0);
|
const nextUseStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', 0);
|
||||||
|
const patch = currentSubject.isWarehouse
|
||||||
|
? { warehouse_use_status: nextUseStatus }
|
||||||
|
: { store_use_status: nextUseStatus };
|
||||||
|
|
||||||
await relation.update({
|
await relation.update(patch, { transaction });
|
||||||
use_status: nextUseStatus,
|
|
||||||
}, { transaction });
|
|
||||||
|
|
||||||
const result = await ctx.model.StoreWarehouse.findByPk(relation.id, {
|
const result = await ctx.model.StoreWarehouse.findByPk(relation.id, {
|
||||||
include: this.getRelationIncludes(),
|
include: this.getRelationIncludes(),
|
||||||
|
|||||||
@ -566,9 +566,9 @@ class stockStoreService extends Service {
|
|||||||
store_id: normalizedStoreId,
|
store_id: normalizedStoreId,
|
||||||
warehouse_id: normalizedWarehouseId,
|
warehouse_id: normalizedWarehouseId,
|
||||||
auth_status: 2,
|
auth_status: 2,
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
},
|
},
|
||||||
attributes: [ 'id', 'policy_config', 'auth_status', 'use_status' ],
|
attributes: [ 'id', 'policy_config', 'auth_status', 'warehouse_use_status', 'store_use_status' ],
|
||||||
raw: true,
|
raw: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -630,9 +630,9 @@ class stockStoreService extends Service {
|
|||||||
store_id: storeId,
|
store_id: storeId,
|
||||||
warehouse_id: warehouseId,
|
warehouse_id: warehouseId,
|
||||||
auth_status: 2,
|
auth_status: 2,
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
},
|
},
|
||||||
attributes: [ 'id', 'policy_config', 'auth_status', 'use_status' ],
|
attributes: [ 'id', 'policy_config', 'auth_status', 'warehouse_use_status', 'store_use_status' ],
|
||||||
transaction,
|
transaction,
|
||||||
raw: true,
|
raw: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1437,7 +1437,7 @@ class InventoryService extends Service {
|
|||||||
|
|
||||||
// ────────── 3. 检查货主配置:是否允许收货单快捷入库 ──────────
|
// ────────── 3. 检查货主配置:是否允许收货单快捷入库 ──────────
|
||||||
const storeWarehouse = await ctx.model.StoreWarehouse.findOne({
|
const storeWarehouse = await ctx.model.StoreWarehouse.findOne({
|
||||||
where: { store_id: storeId, warehouse_id: warehouseId, use_status: 1 },
|
where: { store_id: storeId, warehouse_id: warehouseId, warehouse_use_status: 1 },
|
||||||
attributes: [ 'id', 'policy_config' ],
|
attributes: [ 'id', 'policy_config' ],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -950,7 +950,7 @@ class StoreService extends Service {
|
|||||||
try {
|
try {
|
||||||
const stores = await ctx.model.StoreWarehouse.findAll({
|
const stores = await ctx.model.StoreWarehouse.findAll({
|
||||||
where: {
|
where: {
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
warehouse_id: ctx.user.store_id,
|
warehouse_id: ctx.user.store_id,
|
||||||
},
|
},
|
||||||
attributes: [
|
attributes: [
|
||||||
|
|||||||
@ -923,9 +923,9 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
where.auth_status = authStatus;
|
where.auth_status = authStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
const useStatus = this.normalizeStatusFlag(data.use_status, 'use_status', null);
|
const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', null);
|
||||||
if (useStatus !== null) {
|
if (useStatus !== null) {
|
||||||
where.use_status = useStatus;
|
where.warehouse_use_status = useStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
return where;
|
return where;
|
||||||
@ -1334,7 +1334,8 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
reviewed_by: item.reviewed_by ? Number(item.reviewed_by) : null,
|
reviewed_by: item.reviewed_by ? Number(item.reviewed_by) : null,
|
||||||
ended_by: item.ended_by ? Number(item.ended_by) : null,
|
ended_by: item.ended_by ? Number(item.ended_by) : null,
|
||||||
remask: currentIsWarehouse ? (item.store_remask || '') : (item.warehouse_remask || ''),
|
remask: currentIsWarehouse ? (item.store_remask || '') : (item.warehouse_remask || ''),
|
||||||
use_status: Number(item.use_status || 0),
|
warehouse_use_status: Number(item.warehouse_use_status || 0),
|
||||||
|
store_use_status: Number(item.store_use_status || 0),
|
||||||
policy_config: item.policy_config && typeof item.policy_config === 'object' ? item.policy_config : null,
|
policy_config: item.policy_config && typeof item.policy_config === 'object' ? item.policy_config : null,
|
||||||
is_auth_valid: isAuthValid,
|
is_auth_valid: isAuthValid,
|
||||||
remaining_days: remainingDays,
|
remaining_days: remainingDays,
|
||||||
@ -1490,7 +1491,8 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
applied_by: Number(payload.initiated_by || 0) || accountId,
|
applied_by: Number(payload.initiated_by || 0) || accountId,
|
||||||
reviewed_by: accountId,
|
reviewed_by: accountId,
|
||||||
ended_by: null,
|
ended_by: null,
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
|
store_use_status: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (payload.store_remask !== undefined) {
|
if (payload.store_remask !== undefined) {
|
||||||
@ -2395,11 +2397,12 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
try {
|
try {
|
||||||
const currentSubject = await this.getCurrentSubject();
|
const currentSubject = await this.getCurrentSubject();
|
||||||
const relation = await this.findScopedRelation(data, currentSubject, transaction);
|
const relation = await this.findScopedRelation(data, currentSubject, transaction);
|
||||||
const nextUseStatus = this.normalizeStatusFlag(data.use_status, 'use_status', 0);
|
const nextUseStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', 0);
|
||||||
|
const patch = currentSubject.isWarehouse
|
||||||
|
? { warehouse_use_status: nextUseStatus }
|
||||||
|
: { store_use_status: nextUseStatus };
|
||||||
|
|
||||||
await relation.update({
|
await relation.update(patch, { transaction });
|
||||||
use_status: nextUseStatus,
|
|
||||||
}, { transaction });
|
|
||||||
|
|
||||||
const result = await ctx.model.StoreWarehouse.findByPk(relation.id, {
|
const result = await ctx.model.StoreWarehouse.findByPk(relation.id, {
|
||||||
include: this.getRelationIncludes(),
|
include: this.getRelationIncludes(),
|
||||||
@ -2669,7 +2672,8 @@ class SettingStoreWarehouseService extends Service {
|
|||||||
applied_by: accountId,
|
applied_by: accountId,
|
||||||
reviewed_by: accountId,
|
reviewed_by: accountId,
|
||||||
ended_by: null,
|
ended_by: null,
|
||||||
use_status: 1,
|
warehouse_use_status: 1,
|
||||||
|
store_use_status: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (storeRemask !== null) {
|
if (storeRemask !== null) {
|
||||||
|
|||||||
@ -0,0 +1,25 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 wms_store_warehouse.use_status 重命名为 warehouse_use_status,
|
||||||
|
* 并新增 store_use_status 供货主端独立控制使用状态。
|
||||||
|
*/
|
||||||
|
module.exports = {
|
||||||
|
async up(queryInterface) {
|
||||||
|
const { sequelize } = queryInterface;
|
||||||
|
await sequelize.query(`
|
||||||
|
ALTER TABLE wms_store_warehouse
|
||||||
|
CHANGE COLUMN use_status warehouse_use_status INT(1) NOT NULL DEFAULT 1 COMMENT '仓库侧使用状态:0-不可用,1-可用',
|
||||||
|
ADD COLUMN store_use_status INT(1) NOT NULL DEFAULT 1 COMMENT '货主侧使用状态:0-不可用,1-可用' AFTER warehouse_use_status
|
||||||
|
`);
|
||||||
|
},
|
||||||
|
|
||||||
|
async down(queryInterface) {
|
||||||
|
const { sequelize } = queryInterface;
|
||||||
|
await sequelize.query(`
|
||||||
|
ALTER TABLE wms_store_warehouse
|
||||||
|
DROP COLUMN store_use_status,
|
||||||
|
CHANGE COLUMN warehouse_use_status use_status INT(1) NOT NULL DEFAULT 1 COMMENT '使用状态,0-不可用,1-可用(SKU可见,货主可见,即使解约了)'
|
||||||
|
`);
|
||||||
|
},
|
||||||
|
};
|
||||||
@ -22801,9 +22801,14 @@
|
|||||||
"description": "备注名(当前为仓库则返回货主备注名,反之亦然)"
|
"description": "备注名(当前为仓库则返回货主备注名,反之亦然)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "data.list[].use_status",
|
"name": "data.list[].warehouse_use_status",
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"description": "启用状态:0=禁用 1=启用"
|
"description": "仓库侧启用状态:0=禁用 1=启用"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "data.list[].store_use_status",
|
||||||
|
"type": "number",
|
||||||
|
"description": "货主侧启用状态:0=禁用 1=启用"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "data.list[].policy_config",
|
"name": "data.list[].policy_config",
|
||||||
@ -22944,11 +22949,11 @@
|
|||||||
"description": "签约关系ID,兼容 contract_id"
|
"description": "签约关系ID,兼容 contract_id"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "use_status",
|
"name": "warehouse_use_status",
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"required": false,
|
"required": false,
|
||||||
"source": "body",
|
"source": "body",
|
||||||
"description": "使用状态,0=停用,1=恢复"
|
"description": "仓库侧使用状态,0=停用,1=恢复"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"response": [],
|
"response": [],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user