修改semi,product,service的搜索逻辑
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
# inventory-backend/app/api/v1/inbound/service.py
|
||||
from flask import request, jsonify, current_app
|
||||
from flask_jwt_extended import jwt_required
|
||||
from . import inbound_bp
|
||||
from app.schemas.stock_schema import stock_service_schema
|
||||
from app.services.inbound.service_service import ServiceService
|
||||
from app.utils.decorators import role_required
|
||||
import traceback
|
||||
@ -23,6 +23,7 @@ def search_base():
|
||||
current_app.logger.error(f'搜索基础物料失败: {str(e)}')
|
||||
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
|
||||
|
||||
|
||||
@inbound_bp.route('/service', methods=['GET'])
|
||||
@jwt_required()
|
||||
def get_service_list():
|
||||
@ -62,20 +63,25 @@ def create_service():
|
||||
data = request.get_json()
|
||||
if not data:
|
||||
return jsonify({'code': 400, 'msg': '请求数据为空'}), 400
|
||||
errors = stock_service_schema.validate(data)
|
||||
if errors:
|
||||
return jsonify({'code': 400, 'msg': '数据校验失败', 'errors': errors}), 400
|
||||
|
||||
# 基础校验
|
||||
if not data.get('base_id'):
|
||||
return jsonify({'code': 400, 'msg': '请选择基础物料'}), 400
|
||||
if data.get('sale_price') is None:
|
||||
return jsonify({'code': 400, 'msg': '请输入售价'}), 400
|
||||
|
||||
try:
|
||||
service = ServiceService.create_service(data)
|
||||
return jsonify({
|
||||
'code': 201,
|
||||
'msg': '创建成功',
|
||||
'data': stock_service_schema.dump(service)
|
||||
'data': service.to_dict()
|
||||
}), 201
|
||||
except ValueError as e:
|
||||
return jsonify({'code': 400, 'msg': str(e)}), 400
|
||||
except Exception as e:
|
||||
current_app.logger.error(f'创建服务权益失败: {str(e)}')
|
||||
traceback.print_exc()
|
||||
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
|
||||
|
||||
|
||||
@ -88,7 +94,7 @@ def get_service(service_id):
|
||||
return jsonify({
|
||||
'code': 200,
|
||||
'msg': 'success',
|
||||
'data': stock_service_schema.dump(service)
|
||||
'data': service.to_dict()
|
||||
})
|
||||
except ValueError as e:
|
||||
return jsonify({'code': 404, 'msg': str(e)}), 404
|
||||
@ -105,17 +111,23 @@ def update_service(service_id):
|
||||
data = request.get_json()
|
||||
if not data:
|
||||
return jsonify({'code': 400, 'msg': '请求数据为空'}), 400
|
||||
# 部分字段不允许更新,可在此过滤
|
||||
allowed_fields = {'sale_price', 'provider_name', 'description'}
|
||||
|
||||
# 允许更新的字段
|
||||
allowed_fields = {
|
||||
'sale_price', 'provider_name', 'description',
|
||||
'cost_price', 'contract_id', 'contact_person', 'valid_period'
|
||||
}
|
||||
filtered_data = {k: v for k, v in data.items() if k in allowed_fields}
|
||||
|
||||
if not filtered_data:
|
||||
return jsonify({'code': 400, 'msg': '无有效更新字段'}), 400
|
||||
|
||||
try:
|
||||
service = ServiceService.update_service(service_id, filtered_data)
|
||||
return jsonify({
|
||||
'code': 200,
|
||||
'msg': '更新成功',
|
||||
'data': stock_service_schema.dump(service)
|
||||
'data': service.to_dict()
|
||||
})
|
||||
except ValueError as e:
|
||||
return jsonify({'code': 404, 'msg': str(e)}), 404
|
||||
@ -142,9 +154,6 @@ def delete_service(service_id):
|
||||
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# 供应商建议
|
||||
# ------------------------------------------------------------------
|
||||
@inbound_bp.route('/service/suggestions/providers', methods=['GET'])
|
||||
@jwt_required()
|
||||
def get_provider_suggestions():
|
||||
@ -155,9 +164,6 @@ def get_provider_suggestions():
|
||||
return jsonify({'code': 200, 'msg': 'success', 'data': data})
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# 系统用户建议
|
||||
# ------------------------------------------------------------------
|
||||
@inbound_bp.route('/service/suggestions/users', methods=['GET'])
|
||||
@jwt_required()
|
||||
def get_user_suggestions():
|
||||
@ -166,9 +172,6 @@ def get_user_suggestions():
|
||||
return jsonify({'code': 200, 'msg': 'success', 'data': data})
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# 获取筛选选项
|
||||
# ------------------------------------------------------------------
|
||||
@inbound_bp.route('/service/options', methods=['GET'])
|
||||
@jwt_required()
|
||||
def get_options():
|
||||
@ -176,4 +179,4 @@ def get_options():
|
||||
data = ServiceService.get_filter_options()
|
||||
return jsonify({'code': 200, 'msg': 'success', 'data': data})
|
||||
except Exception as e:
|
||||
return jsonify({'code': 500, 'msg': str(e)}), 500
|
||||
return jsonify({'code': 500, 'msg': str(e)}), 500
|
||||
Reference in New Issue
Block a user