From d8539c0e3a6ae665152901ef1afe987bdf5f939f Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 5 Nov 2026 02:15:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(product):=20=E5=95=86=E5=93=81=E6=8C=89?= =?UTF-8?q?=E8=B4=A7=E4=B8=BB=E9=9A=94=E7=A6=BB=E4=B8=8E=E8=B4=A7=E4=B8=BB?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 商品列表/搜索按货主范围过滤:货主权限仅可见自己所属公司的商品,可按货主筛选 - 详情/编辑/删除对越权商品返回 403;新增只能建到自己所属公司下 - 商品创建后不可更改所属货主(历史无货主商品允许补齐一次,导入时忽略变更并提示) - 批量导入按货主范围校验,不能导入或修改其它公司的商品 - 删除限制:被组合商品引用、或仍有库存(正品/残次品数量 > 0)时禁止删除 - 导出新增货主列并按范围收窄;商品表单货主下拉仅在新建时可选 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- backend/app/controller/product.js | 159 ++++++++++++++++++++++++++- backend/app/utils/exportDefs.js | 6 + frontend/src/api/product.ts | 10 +- frontend/src/views/Product/Index.vue | 10 +- 4 files changed, 180 insertions(+), 5 deletions(-) diff --git a/backend/app/controller/product.js b/backend/app/controller/product.js index 1f2cf57..9725cdc 100644 --- a/backend/app/controller/product.js +++ b/backend/app/controller/product.js @@ -94,6 +94,20 @@ class ProductController extends Controller { where.subsidiary_id = Number(ctx.query.subsidiary_id); } + // 所在公司权限:商品列表仅可见自己所属公司(货主)的商品 + const access = await ctx.service.access.resolve(ctx.userId, principalId); + if (!access.isGroup) { + const ownIds = access.ownCompanyIds.map(Number); + if (where.subsidiary_id !== undefined) { + if (!ownIds.includes(Number(where.subsidiary_id))) { + ctx.body = { code: 0, message: 'success', data: buildPageResult([], 0, { page, pageSize }) }; + return; + } + } else { + where.subsidiary_id = { [Op.in]: ownIds }; + } + } + const { count, rows } = await ctx.model.Product.findAndCountAll({ where, offset, @@ -129,10 +143,30 @@ class ProductController extends Controller { return; } + // 所在公司权限:仅可查看自己所属公司(货主)的商品 + if (!(await this.canAccess(ctx, product))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可查看自己所属公司(货主)的商品' }; + return; + } + const [ data ] = await attachStockFields(ctx, product.principal_id, [ product ]); ctx.body = { code: 0, message: 'success', data: this.withSubsidiaryName(data) }; } + /** + * 判断当前账号是否有权操作该商品(集团权限均可;所在公司权限限自己所属公司) + * @param {Object} ctx egg context + * @param {Object} product 商品 model 实例 + * @return {Promise} 是否有权限 + */ + async canAccess(ctx, product) { + const access = await ctx.service.access.resolve(ctx.userId, product.principal_id); + if (access.isGroup) return true; + if (product.subsidiary_id === null || product.subsidiary_id === undefined) return false; + return access.ownCompanyIds.map(Number).includes(Number(product.subsidiary_id)); + } + /** * 所属货主(下属公司)关联:仅取 id 与名称 * @return {Object} Sequelize include 配置 @@ -221,6 +255,14 @@ class ProductController extends Controller { return; } + // 所在公司权限:只能把商品建到自己所属公司(货主)下 + const access = await ctx.service.access.resolve(ctx.userId, principalId); + if (!access.isGroup && !access.ownCompanyIds.map(Number).includes(Number(subsidiary.value))) { + ctx.status = 403; + ctx.body = { code: 403, message: '只能选择自己所属公司(货主)' }; + return; + } + const product = await ctx.model.Product.create({ ...ctx.request.body, subsidiary_id: subsidiary.value, @@ -271,6 +313,23 @@ class ProductController extends Controller { }; delete ctx.request.body.principal_id; + // 所在公司权限:仅可修改自己所属公司(货主)的商品 + if (!(await this.canAccess(ctx, product))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可修改自己所属公司(货主)的商品' }; + return; + } + + // 商品创建后所属货主不可更改(历史无货主商品允许补齐一次) + const incomingSubsidiary = ctx.request.body.subsidiary_id; + if (incomingSubsidiary !== undefined && incomingSubsidiary !== null && incomingSubsidiary !== '' + && product.subsidiary_id != null + && Number(incomingSubsidiary) !== Number(product.subsidiary_id)) { + ctx.status = 400; + ctx.body = { code: 400, message: '商品创建后不可更改所属货主' }; + return; + } + const subsidiary = await this.resolveSubsidiaryId(ctx.request.body.subsidiary_id, product.principal_id); if (!subsidiary.ok) { ctx.status = 400; @@ -458,6 +517,8 @@ class ProductController extends Controller { } // 3) 逐行写入(同一事务,任一行异常回滚该行前的内容不做半途提交) + const importAccess = await ctx.service.access.resolve(ctx.userId, principalId); + const importOwnIds = importAccess.ownCompanyIds.map(Number); const transaction = await ctx.model.transaction(); let created = 0; let updated = 0; @@ -480,12 +541,42 @@ class ProductController extends Controller { delete data.subsidiary_name; if (subsidiaryId) data.subsidiary_id = subsidiaryId; + // 所在公司权限:只能导入到自己所属公司(货主) + if (subsidiaryId && !importAccess.isGroup && !importOwnIds.includes(Number(subsidiaryId))) { + errors.push({ + row: rowNumber, + item_code: rawData.item_code, + message: `只能导入到自己所属公司(货主)的商品:「${rawData.subsidiary_name}」无权限`, + }); + continue; + } + const exist = existMap.get(data.item_code); try { if (exist) { + // 所在公司权限:不可批量修改其他公司的商品 + if (!importAccess.isGroup + && (exist.subsidiary_id == null || !importOwnIds.includes(Number(exist.subsidiary_id)))) { + errors.push({ + row: rowNumber, + item_code: data.item_code, + message: '该商品不属于自己所属公司(货主),无权修改', + }); + continue; + } const patch = {}; for (const [ key, value ] of Object.entries(data)) { if (value === undefined || value === '') continue; + // 商品创建后所属货主不可更改 + if (key === 'subsidiary_id' && exist.subsidiary_id != null + && Number(value) !== Number(exist.subsidiary_id)) { + errors.push({ + row: rowNumber, + item_code: data.item_code, + message: '商品创建后不可更改所属货主,已忽略该列', + }); + continue; + } if (String(exist[key] ?? '') !== String(value)) patch[key] = value; } if (exist.deleted_at) { @@ -573,9 +664,12 @@ class ProductController extends Controller { const { ctx } = this; const Op = this.app.Sequelize.Op; const keyword = (ctx.query.keyword || '').trim(); + const subsidiaryId = ctx.query.subsidiary_id; const principalId = ctx.state.principalId; const where = { principal_id: principalId, status: 1 }; + // 组合明细等场景可限制只搜某个货主的商品 + if (subsidiaryId !== undefined && subsidiaryId !== '') where.subsidiary_id = Number(subsidiaryId); if (keyword) { where[Op.or] = [ { item_code: { [Op.like]: `%${keyword}%` } }, @@ -585,13 +679,36 @@ class ProductController extends Controller { ]; } + // 所在公司权限:只能搜到自己所属公司(货主)的商品 + const access = await ctx.service.access.resolve(ctx.userId, principalId); + if (!access.isGroup) { + const ownIds = access.ownCompanyIds.map(Number); + if (where.subsidiary_id !== undefined) { + if (!ownIds.includes(Number(where.subsidiary_id))) { + ctx.body = { code: 0, message: 'success', data: [] }; + return; + } + } else { + where.subsidiary_id = { [Op.in]: ownIds }; + } + } + const rows = await ctx.model.Product.findAll({ where, - attributes: [ 'id', 'item_code', 'goods_code', 'barcode', 'item_name', 'sku_property', 'stock_unit', 'status' ], + attributes: [ 'id', 'item_code', 'goods_code', 'barcode', 'item_name', 'sku_property', 'stock_unit', 'status', 'subsidiary_id' ], + include: [ + { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, + ], limit: 50, order: [[ 'id', 'DESC' ]], }); - ctx.body = { code: 0, message: 'success', data: rows }; + // 附加扁平的货主名称,便于列表直接展示 + const data = rows.map(row => { + const plain = row.toJSON(); + plain.subsidiary_name = plain.subsidiary ? plain.subsidiary.name : ''; + return plain; + }); + ctx.body = { code: 0, message: 'success', data }; } /** @@ -613,6 +730,44 @@ class ProductController extends Controller { } const snapshot = { item_code: product.item_code, item_name: product.item_name }; + + // 所在公司权限:仅可删除自己所属公司(货主)的商品 + if (!(await this.canAccess(ctx, product))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可删除自己所属公司(货主)的商品' }; + return; + } + + // 被组合商品引用时禁止删除 + const comboRefs = await ctx.model.ComboProductItem.findAll({ + where: { product_id: product.id }, + attributes: [ 'combo_product_id' ], + include: [{ model: ctx.model.ComboProduct, as: 'comboProduct', attributes: [ 'name', 'code' ] }], + limit: 5, + }); + if (comboRefs.length) { + const names = comboRefs + .map(item => (item.comboProduct ? `${item.comboProduct.name}(${item.comboProduct.code})` : `#${item.combo_product_id}`)) + .join('、'); + ctx.status = 400; + ctx.body = { code: 400, message: `该商品已被组合商品引用,禁止删除:${names}` }; + return; + } + + // 存在库存(正品/残次品任一数量不为 0)时禁止删除 + const stocks = await ctx.model.ProductStock.findAll({ + where: { principal_id: product.principal_id, product_id: product.id }, + attributes: [ 'item_type', 'quantity' ], + raw: true, + }); + const positive = stocks.filter(row => Number(row.quantity) > 0); + if (positive.length) { + const detail = positive.map(row => `${row.item_type === 'CC' ? '残次品' : '正品'} ${Number(row.quantity)}`).join('、'); + ctx.status = 400; + ctx.body = { code: 400, message: `该商品仍有库存(${detail}),禁止删除;请先清零库存` }; + return; + } + await product.destroy(); // 删除后记录也随之无法按对象查询,仍需留痕(按删除前的ID写入) await ctx.service.operationLog.record({ diff --git a/backend/app/utils/exportDefs.js b/backend/app/utils/exportDefs.js index f7c6510..e150115 100644 --- a/backend/app/utils/exportDefs.js +++ b/backend/app/utils/exportDefs.js @@ -805,6 +805,12 @@ const EXPORT_TYPES = { .eq('t.stock_unit', f.stock_unit) .eq('t.subsidiary_id', f.subsidiary_id) .eq('t.status', f.status); + // 所在公司权限:只能导出自己所属公司(货主)的商品 + if (ctx.access && !ctx.access.isGroup) { + const ids = (ctx.access.ownCompanyIds || []).map(Number); + if (ids.length) wh.raw(`t.subsidiary_id IN (${ids.map(() => '?').join(',')})`, ...ids); + else wh.raw('1 = 0'); + } return buildResult({ columns: PRODUCT_COLUMNS, from: 'products t', wh }); }, }, diff --git a/frontend/src/api/product.ts b/frontend/src/api/product.ts index 3d3b48f..cf355d0 100644 --- a/frontend/src/api/product.ts +++ b/frontend/src/api/product.ts @@ -56,6 +56,10 @@ export interface ProductItem { /** 商品快速搜索返回(聚合:商品编码/货物编码/条码/商品名称) */ export interface ProductSearchItem { id: number + /** 所属货主(下属公司ID);null 表示未指定 */ + subsidiary_id?: number | null + /** 所属货主名称(接口返回,未指定为空串) */ + subsidiary_name?: string item_code: string goods_code: string | null barcode: string | null @@ -108,8 +112,10 @@ export function getProducts(params?: object) { } /** 商品快速搜索:商品编码/货物编码/条码/商品名称 聚合匹配,返回启用商品 */ -export function searchProducts(keyword?: string) { - return get('/products/search', keyword ? { keyword } : undefined) +export function searchProducts(keyword?: string, params?: { subsidiary_id?: number }) { + const query: Record = { ...(params || {}) } + if (keyword) query.keyword = keyword + return get('/products/search', Object.keys(query).length ? query : undefined) } /** 新增商品(同一主体下 item_code 唯一,已删除的不影响) */ diff --git a/frontend/src/views/Product/Index.vue b/frontend/src/views/Product/Index.vue index 4e5ae40..ccfddcb 100644 --- a/frontend/src/views/Product/Index.vue +++ b/frontend/src/views/Product/Index.vue @@ -101,7 +101,8 @@ const subsidiaryOptions = ref([]) async function loadSubsidiaryOptions() { try { - subsidiaryOptions.value = await getPrincipalSubsidiaryOptions() + // mine=1:所在公司权限下只返回自己所属公司 + subsidiaryOptions.value = await getPrincipalSubsidiaryOptions({ mine: 1 }) } catch { subsidiaryOptions.value = [] } @@ -724,10 +725,12 @@ onMounted(async () => { v-model="form.subsidiary_id" placeholder="请选择下属公司(所属货主)" filterable + :disabled="editId != null" style="width: 100%" > +
商品创建后不可更改所属货主
@@ -889,6 +892,11 @@ onMounted(async () => {