对于出库选单和Bom库的逻辑完善以及功能美化
This commit is contained in:
@ -4,7 +4,6 @@ from app.models.base import MaterialBase
|
||||
from app.models.bom import BomTable
|
||||
from app.extensions import db
|
||||
from flask_jwt_extended import jwt_required
|
||||
from sqlalchemy import distinct
|
||||
|
||||
bom_bp = Blueprint('bom', __name__)
|
||||
|
||||
@ -14,10 +13,13 @@ bom_bp = Blueprint('bom', __name__)
|
||||
@bom_bp.route('/list', methods=['GET'])
|
||||
@jwt_required()
|
||||
def get_bom_list():
|
||||
"""获取所有 BOM 配方列表(按 bom_no 分组),支持 keyword 搜索"""
|
||||
"""获取所有 BOM 配方列表,支持 keyword 搜索和 active_only 过滤"""
|
||||
try:
|
||||
keyword = request.args.get('keyword', '').strip()
|
||||
data = BomService.get_bom_list(keyword=keyword)
|
||||
# 将字符串 'true' 转为布尔值
|
||||
active_only = request.args.get('active_only', 'false').lower() == 'true'
|
||||
|
||||
data = BomService.get_bom_list(keyword=keyword, active_only=active_only)
|
||||
return jsonify({
|
||||
'code': 200,
|
||||
'msg': 'success',
|
||||
@ -31,9 +33,13 @@ def get_bom_list():
|
||||
@bom_bp.route('/detail/<bom_no>', methods=['GET'])
|
||||
@jwt_required()
|
||||
def get_bom_detail(bom_no):
|
||||
"""根据 BOM 编号获取配方详情"""
|
||||
"""
|
||||
根据 BOM 编号获取配方详情
|
||||
Query参数: ?version=V1.0 (如果不传则取最新)
|
||||
"""
|
||||
try:
|
||||
data = BomService.get_bom_detail(bom_no)
|
||||
version = request.args.get('version')
|
||||
data = BomService.get_bom_detail(bom_no, version=version)
|
||||
if not data:
|
||||
return jsonify({'code': 404, 'msg': 'BOM 不存在'}), 404
|
||||
return jsonify({
|
||||
@ -49,14 +55,14 @@ def get_bom_detail(bom_no):
|
||||
@bom_bp.route('/save', methods=['POST'])
|
||||
@jwt_required()
|
||||
def save_bom():
|
||||
"""保存或更新 BOM 配方(支持自定义 bom_no)"""
|
||||
"""保存或更新 BOM 配方(支持自定义 bom_no 和 多版本)"""
|
||||
try:
|
||||
req_data = request.get_json()
|
||||
# 必需字段校验
|
||||
if 'parent_id' not in req_data or 'children' not in req_data:
|
||||
return jsonify({'code': 400, 'msg': '缺少 parent_id 或 children 字段'}), 400
|
||||
|
||||
# 校验 bom_no 不能为空(如果前端要求必须填)
|
||||
# 校验 bom_no 不能为空
|
||||
if 'bom_no' in req_data and not req_data['bom_no']:
|
||||
return jsonify({'code': 400, 'msg': 'BOM编号不能为空'}), 400
|
||||
|
||||
@ -91,20 +97,28 @@ def get_bom_with_stock_by_no(bom_no):
|
||||
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
|
||||
|
||||
|
||||
# ==================== 删除BOM接口(根据bom_no删除整个配方) ====================
|
||||
# ==================== 删除BOM接口 ====================
|
||||
|
||||
@bom_bp.route('/<bom_no>', methods=['DELETE'])
|
||||
@jwt_required()
|
||||
def delete_bom(bom_no):
|
||||
"""根据 BOM 编号删除整个配方(包括所有子件记录)"""
|
||||
"""
|
||||
根据 BOM 编号删除
|
||||
Query参数: ?version=V1.0 (如果不传,删除该编号下所有版本)
|
||||
"""
|
||||
try:
|
||||
# 先检查是否存在
|
||||
exist = BomTable.query.filter_by(bom_no=bom_no).first()
|
||||
version = request.args.get('version')
|
||||
query = BomTable.query.filter_by(bom_no=bom_no)
|
||||
|
||||
if version:
|
||||
query = query.filter_by(version=version)
|
||||
|
||||
exist = query.first()
|
||||
if not exist:
|
||||
return jsonify({'code': 404, 'msg': 'BOM 不存在'}), 404
|
||||
|
||||
# 删除该 bom_no 下所有记录
|
||||
BomTable.query.filter_by(bom_no=bom_no).delete()
|
||||
# 删除
|
||||
query.delete()
|
||||
db.session.commit()
|
||||
return jsonify({
|
||||
'code': 200,
|
||||
@ -115,7 +129,7 @@ def delete_bom(bom_no):
|
||||
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
|
||||
|
||||
|
||||
# ==================== 兼容旧接口(保留不改动现有前端) ====================
|
||||
# ==================== 兼容旧接口 ====================
|
||||
|
||||
@bom_bp.route('/<int:parent_id>', methods=['GET'])
|
||||
@jwt_required()
|
||||
|
||||
Reference in New Issue
Block a user