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

修正新增入库时3个组件的名称筛选逻辑

Browse Source
This commit is contained in:
dxc
2026-02-05 15:04:06 +08:00
parent 4f90e02dcf
commit cad5fd696c
6 changed files with 273 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,19 +7,27 @@ inbound_product_bp = Blueprint('inbound_product', __name__)
# ------------------------------------------------------------------
# 0. 基础物料搜索
# 0. 基础物料搜索 (关键接口：配合 Service 实现自动回填)
# ------------------------------------------------------------------
@inbound_product_bp.route('/search-base', methods=['GET'])
def search_base():
"""
对应前端 API: /inbound/product/search-base
功能: 模糊搜索基础物料，返回 spec, unit, category, type 等详细信息
"""
try:
data = ProductInboundService.search_base_material(request.args.get('keyword', ''))
keyword = request.args.get('keyword', '')
# 调用 Service 层已修复的 search_base_material 方法
data = ProductInboundService.search_base_material(keyword)
return jsonify({"code": 200, "msg": "success", "data": data})
except Exception as e:
# 捕获异常并打印堆栈，方便调试
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500
# ------------------------------------------------------------------
# 1. 获取列表 (修改：接收 status 参数)
# 1. 获取列表 (支持 status 多选筛选)
# ------------------------------------------------------------------
@inbound_product_bp.route('/list', methods=['GET'])
def get_list():
@ -27,13 +35,15 @@ def get_list():
page = request.args.get('page', 1, type=int)
limit = request.args.get('pageSize', 15, type=int)
keyword = request.args.get('keyword', '')
# 接收状态参数
# 接收状态参数 (逗号分隔字符串 -> 列表)
statuses_str = request.args.get('statuses', '')
statuses = statuses_str.split(',') if statuses_str else []
result = ProductInboundService.get_list(page, limit, keyword, statuses)
return jsonify({"code": 200, "msg": "success", "data": result})
except Exception as e:
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500
@ -46,7 +56,7 @@ def submit():
# 调用 Service 处理入库，获取新创建的对象
new_stock = ProductInboundService.handle_inbound(request.get_json())
# 返回成功信息以及新创建的数据（包含生成的ID和SKU），供前端打印使用
# 返回成功信息以及新创建的数据（包含生成的ID和SKU），供前端自动打印使用
return jsonify({
"code": 200,
"msg": "入库成功",
@ -66,6 +76,7 @@ def update(id):
ProductInboundService.update_inbound(id, request.get_json())
return jsonify({"code": 200, "msg": "更新成功"})
except Exception as e:
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500
@ -78,11 +89,12 @@ def delete(id):
ProductInboundService.delete_inbound(id)
return jsonify({"code": 200, "msg": "删除成功"})
except Exception as e:
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500
# ------------------------------------------------------------------
# 5. [新增] 获取出库历史
# 5. 获取出库历史
# ------------------------------------------------------------------
@inbound_product_bp.route('/<int:id>/history', methods=['GET'])
def get_history(id):
@ -90,4 +102,5 @@ def get_history(id):
data = ProductInboundService.get_outbound_history(id)
return jsonify({"code": 200, "msg": "success", "data": data})
except Exception as e:
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500

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

@ -2,30 +2,46 @@
from app.extensions import db
from app.models.base import MaterialBase
from app.models.outbound import TransOutbound
from datetime import datetime, timedelta, timezone # [修改]
from datetime import datetime, timedelta, timezone
from sqlalchemy import or_, func, text, and_
import traceback
import json
class ProductInboundService:
# ============================================================
# 1. 基础物料搜索 (已修正：完全对齐 Buy/Semi 的逻辑)
# ============================================================
@staticmethod
def search_base_material(keyword):
try:
if not keyword:
query = MaterialBase.query.filter(MaterialBase.is_enabled == True).order_by(
MaterialBase.id.desc()).limit(20)
else:
query = MaterialBase.query.filter(
MaterialBase.is_enabled == True,
or_(MaterialBase.name.ilike(f'%{keyword}%'), MaterialBase.spec_model.ilike(f'%{keyword}%'))
).limit(20)
# 1. 基础查询：必须是已启用的物料
query = MaterialBase.query.filter(MaterialBase.is_enabled == True)
# 2. 动态条件：如果传入了关键词，则增加模糊匹配条件
if keyword:
query = query.filter(
or_(
MaterialBase.name.ilike(f'%{keyword}%'),
MaterialBase.spec_model.ilike(f'%{keyword}%')
)
)
# 3. 排序与限制：按ID倒序，取最新20条
query = query.order_by(MaterialBase.id.desc()).limit(20)
# 4. 结果封装：确保字段名与前端 Vue 的 handleSelect 方法一致
results = []
for item in query.all():
results.append({
'id': item.id, 'name': item.name, 'spec': item.spec_model,
'category': item.category, 'unit': item.unit, 'type': item.material_type
'id': item.id,
'name': item.name,
'spec': item.spec_model, # 对应前端: item.spec
'category': item.category, # 对应前端: item.category
'unit': item.unit, # 对应前端: item.unit
'type': item.material_type, # 对应前端: item.type
'status': '启用'
})
return results
except Exception:
@ -129,6 +145,9 @@ class ProductInboundService:
db.session.rollback()
raise e
# ============================================================
# 3. 更新逻辑
# ============================================================
@staticmethod
def update_inbound(stock_id, data):
from app.models.inbound.product import StockProduct
@ -184,6 +203,9 @@ class ProductInboundService:
db.session.rollback()
raise e
# ============================================================
# 4. 删除逻辑
# ============================================================
@staticmethod
def delete_inbound(stock_id):
from app.models.inbound.product import StockProduct
@ -197,6 +219,9 @@ class ProductInboundService:
db.session.rollback()
raise e
# ============================================================
# 5. 出库历史
# ============================================================
@staticmethod
def get_outbound_history(stock_id):
"""获取出库历史"""
@ -209,7 +234,7 @@ class ProductInboundService:
return []
# ============================================================
# 获取列表 (修改：按时间倒序排序 + 展示只显示日期)
# 6. 获取列表
# ============================================================
@staticmethod
def get_list(page, limit, keyword=None, statuses=None):
@ -240,7 +265,7 @@ class ProductInboundService:
)
)
# [核心修改] 按照 production_date (入库日期) 倒序排序
# 按照 production_date (入库日期) 倒序排序
pagination = query.order_by(StockProduct.production_date.desc()).paginate(page=page, per_page=limit,
error_out=False)
@ -257,7 +282,7 @@ class ProductInboundService:
for item in current_items:
d = item.to_dict()
# [核心修改] 格式化日期
# 格式化日期
date_display = ''
if item.production_date:
try:

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

@ -2,36 +2,44 @@
from app.extensions import db
from app.models.base import MaterialBase
from app.models.outbound import TransOutbound
from datetime import datetime, timedelta, timezone # [修改]
from datetime import datetime, timedelta, timezone
from sqlalchemy import or_, func, text, and_
import traceback
import json
class SemiInboundService:
# ============================================================
# 1. 基础物料搜索 (已修复：支持空关键词返回最新数据)
# ============================================================
@staticmethod
def search_base_material(keyword):
try:
if not keyword:
return []
# 基础查询：必须是已启用的物料
query = MaterialBase.query.filter(MaterialBase.is_enabled == True)
query = MaterialBase.query.filter(
MaterialBase.is_enabled == True,
or_(
MaterialBase.name.ilike(f'%{keyword}%'),
MaterialBase.spec_model.ilike(f'%{keyword}%')
# 如果有关键词，进行模糊匹配
if keyword:
query = query.filter(
or_(
MaterialBase.name.ilike(f'%{keyword}%'),
MaterialBase.spec_model.ilike(f'%{keyword}%')
)
)
).limit(20)
# 统一逻辑：按ID倒序，限制20条
query = query.order_by(MaterialBase.id.desc()).limit(20)
results = []
for item in query.all():
results.append({
'id': item.id,
'name': item.name,
'spec': item.spec_model,
'spec': item.spec_model, # 对应前端 item.spec
'category': item.category,
'unit': item.unit,
'type': item.material_type,
'type': item.material_type, # 对应前端 item.type
'status': '启用'
})
return results
@ -39,6 +47,9 @@ class SemiInboundService:
traceback.print_exc()
return []
# ============================================================
# 2. 新增入库逻辑
# ============================================================
@staticmethod
def handle_inbound(data):
from app.models.inbound.semi import StockSemi
@ -171,6 +182,9 @@ class SemiInboundService:
traceback.print_exc()
raise e
# ============================================================
# 3. 更新逻辑
# ============================================================
@staticmethod
def update_inbound(stock_id, data):
from app.models.inbound.semi import StockSemi
@ -268,6 +282,9 @@ class SemiInboundService:
db.session.rollback()
raise e
# ============================================================
# 4. 删除逻辑
# ============================================================
@staticmethod
def delete_inbound(stock_id):
from app.models.inbound.semi import StockSemi
@ -282,6 +299,9 @@ class SemiInboundService:
db.session.rollback()
raise e
# ============================================================
# 5. 出库历史
# ============================================================
@staticmethod
def get_outbound_history(stock_id):
"""获取出库历史"""
@ -294,7 +314,7 @@ class SemiInboundService:
return []
# ============================================================
# 6. 获取列表 (修改：按时间倒序排序 + 展示只显示日期)
# 6. 获取列表
# ============================================================
@staticmethod
def get_list(page, limit, keyword=None, statuses=None):
@ -329,7 +349,7 @@ class SemiInboundService:
)
)
# [核心修改] 按照 production_date (入库日期) 倒序排序
# 按照 production_date (入库日期) 倒序排序
pagination = query.order_by(StockSemi.production_date.desc()).paginate(page=page, per_page=limit,
error_out=False)
@ -346,7 +366,7 @@ class SemiInboundService:
for item in current_items:
d = item.to_dict()
# [核心修改] 格式化展示日期，覆盖 to_dict 的默认行为
# 格式化展示日期
date_display = ''
if item.production_date:
try: