duxingchen/KCGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 采购/半成品/成品列表拆分SKU独立搜索框

Browse Source
This commit is contained in:
DXC
2026-03-09 17:29:24 +08:00
parent 646baa08fe
commit 5d813c24bc
9 changed files with 74 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
inventory-backend/app/api/v1/inbound/buy.py
View File

@ -115,6 +115,7 @@ def get_list():
page = request.args.get('page', 1, type=int)
limit = request.args.get('pageSize', 15, type=int)
keyword = request.args.get('keyword', '')
sku = request.args.get('sku', '')
# 新增筛选参数
category = request.args.get('category', '')
@ -137,7 +138,7 @@ def get_list():
statuses_str = request.args.get('statuses', '')
statuses = statuses_str.split(',') if statuses_str else []
result = BuyInboundService.get_list(page, limit, keyword, statuses, category, material_type, company,
result = BuyInboundService.get_list(page, limit, keyword, sku, statuses, category, material_type, company,
order_by, is_asc, advanced_filters)
# 字段级脱敏
user_permissions = get_current_user_permissions()

3
inventory-backend/app/api/v1/inbound/product.py
View File

@ -73,6 +73,7 @@ def get_list():
page = request.args.get('page', 1, type=int)
limit = request.args.get('pageSize', 15, type=int)
keyword = request.args.get('keyword', '')
sku = request.args.get('sku', '')
statuses_str = request.args.get('statuses', '')
statuses = statuses_str.split(',') if statuses_str else []
category = request.args.get('category', '')
@ -104,7 +105,7 @@ def get_list():
# 调用服务，传入所有参数
result = ProductInboundService.get_list(
page, limit, keyword, statuses,
page, limit, keyword, sku, statuses,
category=extra_filters.get('category'),
material_type=extra_filters.get('material_type'),
company=extra_filters.get('company'),

3
inventory-backend/app/api/v1/inbound/semi.py
View File

@ -73,6 +73,7 @@ def get_list():
page = request.args.get('page', 1, type=int)
limit = request.args.get('pageSize', 15, type=int)
keyword = request.args.get('keyword', '')
sku = request.args.get('sku', '')
statuses_str = request.args.get('statuses', '')
statuses = statuses_str.split(',') if statuses_str else []
company = request.args.get('company', '')
@ -104,7 +105,7 @@ def get_list():
# 调用服务，传入所有参数
result = SemiInboundService.get_list(
page, limit, keyword, statuses,
page, limit, keyword, sku, statuses,
**extra_filters
)
user_permissions = get_current_user_permissions()

10
inventory-backend/app/services/inbound/buy_service.py
View File

@ -240,17 +240,16 @@ class BuyInboundService:
# 5. 获取列表 (支持排序和高级筛选)
# ============================================================
@staticmethod
def get_list(page, limit, keyword=None, statuses=None, category=None, material_type=None, company=None,
def get_list(page, limit, keyword=None, sku=None, statuses=None, category=None, material_type=None, company=None,
order_by='', is_asc='', advanced_filters=None):
try:
from sqlalchemy import and_, or_
query = db.session.query(StockBuy).outerjoin(MaterialBase, StockBuy.base_id == MaterialBase.id)
# 1. 通用关键词搜索
# 1. 通用关键词搜索（名称、规格、公司）
if keyword:
k_str = f'%{keyword.strip()}%'
conditions = [
StockBuy.sku.ilike(k_str),
StockBuy.barcode.ilike(k_str),
StockBuy.batch_number.ilike(k_str),
StockBuy.serial_number.ilike(k_str),
@ -262,6 +261,11 @@ class BuyInboundService:
]
query = query.filter(or_(*conditions))
# 1.1 SKU 独立搜索
if sku and sku.strip():
sku_str = f'%{sku.strip()}%'
query = query.filter(StockBuy.sku.ilike(sku_str))
# 2. 类别独立搜索
if category and category.strip():
query = query.filter(MaterialBase.category == category.strip())

10
inventory-backend/app/services/inbound/product_service.py
View File

@ -270,11 +270,12 @@ class ProductInboundService:
return []
@staticmethod
def get_list(page, limit, keyword=None, statuses=None, category=None, material_type=None, company=None,
def get_list(page, limit, keyword=None, sku=None, statuses=None, category=None, material_type=None, company=None,
order_by_column=None, is_asc=None, advanced_filters=None):
from app.models.inbound.product import StockProduct
try:
query = db.session.query(StockProduct).outerjoin(MaterialBase, StockProduct.base_id == MaterialBase.id)
# 1. 通用关键词搜索（名称、规格、公司）
if keyword:
kw = f'%{keyword}%'
query = query.filter(or_(
@ -283,9 +284,12 @@ class ProductInboundService:
MaterialBase.company_name.ilike(kw),
StockProduct.serial_number.ilike(kw),
StockProduct.work_order_code.ilike(kw),
StockProduct.order_id.ilike(kw),
StockProduct.sku.ilike(kw)
StockProduct.order_id.ilike(kw)
))
# 1.1 SKU 独立搜索
if sku and sku.strip():
sku_str = f'%{sku.strip()}%'
query = query.filter(StockProduct.sku.ilike(sku_str))
if category and category.strip():
query = query.filter(MaterialBase.category == category.strip())
if material_type and material_type.strip():

8
inventory-backend/app/services/inbound/semi_service.py
View File

@ -359,11 +359,12 @@ class SemiInboundService:
return []
@staticmethod
def get_list(page, limit, keyword=None, statuses=None, category=None, material_type=None, company=None,
def get_list(page, limit, keyword=None, sku=None, statuses=None, category=None, material_type=None, company=None,
order_by_column=None, is_asc=None, advanced_filters=None):
from app.models.inbound.semi import StockSemi
try:
query = db.session.query(StockSemi).outerjoin(MaterialBase, StockSemi.base_id == MaterialBase.id)
# 1. 通用关键词搜索（名称、规格、公司）
if keyword:
kw = f'%{keyword}%'
query = query.filter(
@ -373,11 +374,14 @@ class SemiInboundService:
MaterialBase.company_name.ilike(kw),
StockSemi.batch_number.ilike(kw),
StockSemi.serial_number.ilike(kw),
StockSemi.sku.ilike(kw),
StockSemi.work_order_code.ilike(kw),
StockSemi.bom_code.ilike(kw)
)
)
# 1.1 SKU 独立搜索
if sku and sku.strip():
sku_str = f'%{sku.strip()}%'
query = query.filter(StockSemi.sku.ilike(sku_str))
if category and category.strip():
query = query.filter(MaterialBase.category == category.strip())
if material_type and material_type.strip():