diff --git a/inventory-backend/app/api/v1/inbound/buy.py b/inventory-backend/app/api/v1/inbound/buy.py index 8f20fbd..21c6059 100644 --- a/inventory-backend/app/api/v1/inbound/buy.py +++ b/inventory-backend/app/api/v1/inbound/buy.py @@ -29,21 +29,28 @@ def search_base(): # ------------------------------------------------------------------ -# 1. 获取列表 +# 1. 获取列表 (修改：支持状态筛选) # ------------------------------------------------------------------ @inbound_buy_bp.route('/list', methods=['GET']) def get_list(): try: page = request.args.get('page', 1, type=int) limit = request.args.get('pageSize', 15, type=int) - result = BuyInboundService.get_list(page, limit) + keyword = request.args.get('keyword', '') + + # 获取状态列表参数，前端传参格式: statuses=在库,借库 + statuses_str = request.args.get('statuses', '') + statuses = statuses_str.split(',') if statuses_str else [] + + result = BuyInboundService.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 # ------------------------------------------------------------------ -# 2. 新增入库 (修改：返回创建的对象数据) +# 2. 新增入库 # ------------------------------------------------------------------ @inbound_buy_bp.route('/submit', methods=['POST']) def submit(): @@ -52,10 +59,8 @@ def submit(): if not data: return jsonify({"code": 400, "msg": "No data"}), 400 - # 调用 Service 处理入库，获取新创建的对象 new_stock = BuyInboundService.handle_inbound(data) - # 返回成功信息以及新创建的数据（包含生成的ID和SKU），供前端打印使用 return jsonify({ "code": 200, "msg": "入库成功", @@ -88,4 +93,21 @@ def delete_buy(id): BuyInboundService.delete_inbound(id) return jsonify({"code": 200, "msg": "删除成功"}) except Exception as e: + return jsonify({"code": 500, "msg": str(e)}), 500 + + +# ------------------------------------------------------------------ +# 5. 获取关联的出库历史 +# ------------------------------------------------------------------ +@inbound_buy_bp.route('//history', methods=['GET']) +def get_history(id): + try: + history = BuyInboundService.get_outbound_history(id) + return jsonify({ + "code": 200, + "msg": "success", + "data": history + }) + except Exception as e: + traceback.print_exc() return jsonify({"code": 500, "msg": str(e)}), 500 \ No newline at end of file diff --git a/inventory-backend/app/services/inbound/buy_service.py b/inventory-backend/app/services/inbound/buy_service.py index 3c5913e..4c8ef53 100644 --- a/inventory-backend/app/services/inbound/buy_service.py +++ b/inventory-backend/app/services/inbound/buy_service.py @@ -1,12 +1,10 @@ -# 文件路径: inventory-backend/app/services/inbound/buy_service.py - +# app/services/inbound/buy_service.py from app.extensions import db from app.models.inbound.buy import StockBuy from app.models.base import MaterialBase -# 引入出库记录模型，用于查询流转历史 from app.models.outbound import TransOutbound from datetime import datetime -from sqlalchemy import or_, func, text +from sqlalchemy import or_, func, text, and_ import traceback import json @@ -14,17 +12,13 @@ import json class BuyInboundService: # ============================================================ - # 1. 基础物料搜索 (供下拉框使用) + # 1. 基础物料搜索 # ============================================================ @staticmethod def search_base_material(keyword): - """ - 搜索基础物料 - 如果 keyword 为空，返回最新的 20 条记录 - """ + """搜索基础物料""" try: query = MaterialBase.query.filter(MaterialBase.is_enabled == True) - if keyword: query = query.filter( or_( @@ -32,20 +26,13 @@ class BuyInboundService: MaterialBase.spec_model.ilike(f'%{keyword}%') ) ) - - # 无论是否有关键词，都按 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, - 'category': item.category, - 'unit': item.unit, - 'type': item.material_type, - 'status': '启用' + 'id': item.id, 'name': item.name, 'spec': item.spec_model, + 'category': item.category, 'unit': item.unit, + 'type': item.material_type, 'status': '启用' }) return results except Exception as e: @@ -57,62 +44,46 @@ class BuyInboundService: # ============================================================ @staticmethod def handle_inbound(data): - """ - 处理入库逻辑 - """ + """新增入库""" try: base_id = data.get('base_id') - if not base_id: - raise ValueError("必须选择基础物料进行入库 (缺少 base_id)") - + if not base_id: raise ValueError("必须选择基础物料") material = MaterialBase.query.get(base_id) - if not material: - raise ValueError(f"ID为 {base_id} 的基础物料不存在") + if not material: raise ValueError("物料不存在") in_date_val = datetime.utcnow().date() if data.get('in_date'): try: - # 兼容 YYYY-MM-DD HH:MM:SS 或 YYYY-MM-DD date_str = str(data['in_date']) - if len(date_str) > 10: - date_str = date_str[:10] + if len(date_str) > 10: date_str = date_str[:10] in_date_val = datetime.strptime(date_str, '%Y-%m-%d').date() - except ValueError: + except: pass in_qty = float(data.get('in_quantity') or 0) u_price = float(data.get('unit_price') or 0) - # 1. 获取全局打印流水号 (跨表唯一) seq_sql = text("SELECT nextval('global_print_seq')") result = db.session.execute(seq_sql) next_global_id = result.scalar() - # 2. 自动生成 SKU (格式: 00000001) generated_sku = str(next_global_id).zfill(10) + final_barcode = data.get('barcode') or generated_sku - # 3. 条码逻辑处理 - final_barcode = data.get('barcode') - if not final_barcode: - final_barcode = generated_sku - - # 4. 图片列表转 JSON 字符串处理 arrival_list = data.get('arrival_photo', []) report_list = data.get('inspection_report', []) - if not isinstance(arrival_list, list): arrival_list = [] if not isinstance(report_list, list): report_list = [] new_stock = StockBuy( base_id=material.id, global_print_id=next_global_id, - sku=generated_sku, # 自动生成的SKU - barcode=final_barcode, # 如果未输入，则存入SKU值 - + sku=generated_sku, + barcode=final_barcode, in_date=in_date_val, serial_number=data.get('serial_number'), batch_number=data.get('batch_number'), - status='在库', + status=data.get('status', '在库'), # 默认在库 in_quantity=in_qty, stock_quantity=in_qty, available_quantity=in_qty, @@ -127,18 +98,12 @@ class BuyInboundService: buyer_email=data.get('purchaser_email'), original_link=data.get('source_link'), detail_link=data.get('detail_link'), - - # 将列表转为 JSON 字符串存储 arrival_photo=json.dumps(arrival_list), inspection_report=json.dumps(report_list) ) - db.session.add(new_stock) db.session.commit() - - # 返回创建的对象实例 return new_stock - except Exception as e: db.session.rollback() raise e @@ -148,80 +113,45 @@ class BuyInboundService: # ============================================================ @staticmethod def update_inbound(stock_id, data): - """ - 更新入库记录 - """ + """更新入库""" try: - print(f"----- UPDATE DEBUG: ID={stock_id} -----") stock = StockBuy.query.get(stock_id) - if not stock: - raise ValueError("记录不存在") + if not stock: raise ValueError("记录不存在") - # 基础字段映射 field_mapping = { - 'sku': 'sku', - 'barcode': 'barcode', + 'sku': 'sku', 'barcode': 'barcode', 'warehouse_location': 'warehouse_location', - 'serial_number': 'serial_number', - 'batch_number': 'batch_number', - 'status': 'status', - 'inspection_status': 'inspection_status', - 'supplier_name': 'supplier_name', - 'detail_link': 'detail_link', - 'currency': 'currency', - 'exchange_rate': 'exchange_rate', - 'purchaser': 'buyer_name', - 'purchaser_email': 'buyer_email', + 'serial_number': 'serial_number', 'batch_number': 'batch_number', + 'status': 'status', 'inspection_status': 'inspection_status', + 'supplier_name': 'supplier_name', 'detail_link': 'detail_link', + 'currency': 'currency', 'exchange_rate': 'exchange_rate', + 'purchaser': 'buyer_name', 'purchaser_email': 'buyer_email', 'source_link': 'original_link' } + for k, v in field_mapping.items(): + if k in data: setattr(stock, v, data[k]) - for frontend_key, db_attr in field_mapping.items(): - if frontend_key in data: - setattr(stock, db_attr, data[frontend_key]) - - if 'arrival_photo' in data: - imgs = data['arrival_photo'] - if isinstance(imgs, list): - stock.arrival_photo = json.dumps(imgs) - - if 'inspection_report' in data: - imgs = data['inspection_report'] - if isinstance(imgs, list): - stock.inspection_report = json.dumps(imgs) - - # 数量与金额联动更新逻辑 - qty_changed = False - price_changed = False + if 'arrival_photo' in data and isinstance(data['arrival_photo'], list): + stock.arrival_photo = json.dumps(data['arrival_photo']) + if 'inspection_report' in data and isinstance(data['inspection_report'], list): + stock.inspection_report = json.dumps(data['inspection_report']) if 'in_quantity' in data: new_qty = float(data['in_quantity']) - old_qty = float(stock.in_quantity) - if new_qty != old_qty: - diff = new_qty - old_qty + diff = new_qty - float(stock.in_quantity) + if diff != 0: stock.in_quantity = new_qty - # 注意：手动修改入库量时，同步调整总库存和可用库存 stock.stock_quantity = float(stock.stock_quantity) + diff stock.available_quantity = float(stock.available_quantity) + diff - qty_changed = True if 'unit_price' in data: - new_price = float(data['unit_price']) - old_price = float(stock.unit_price) - if new_price != old_price: - stock.unit_price = new_price - price_changed = True - - if qty_changed or price_changed: - stock.total_price = float(stock.in_quantity) * float(stock.unit_price) + stock.unit_price = float(data['unit_price']) + stock.total_price = float(stock.in_quantity) * float(stock.unit_price) db.session.commit() - print("----- UPDATE SUCCESS -----") return stock - except Exception as e: db.session.rollback() - print(f"----- UPDATE FAILED: {str(e)} -----") - traceback.print_exc() raise e # ============================================================ @@ -229,13 +159,10 @@ class BuyInboundService: # ============================================================ @staticmethod def delete_inbound(stock_id): - """ - 删除入库记录 - """ + """删除入库""" try: stock = StockBuy.query.get(stock_id) - if not stock: - raise ValueError("记录不存在") + if not stock: raise ValueError("记录不存在") db.session.delete(stock) db.session.commit() return True @@ -244,108 +171,94 @@ class BuyInboundService: raise e # ============================================================ - # 5. [新增] 获取出库流转历史 (挂钩出库记录) + # 5. 获取出库流转历史 # ============================================================ @staticmethod def get_outbound_history(stock_id): - """ - 查询该入库单对应的所有出库记录 - """ + """获取出库历史""" try: records = TransOutbound.query.filter_by( - source_table='stock_buy', - stock_id=stock_id + source_table='stock_buy', stock_id=stock_id ).order_by(TransOutbound.outbound_time.desc()).all() - return [r.to_dict() for r in records] - except Exception as e: - traceback.print_exc() + except: return [] # ============================================================ - # 6. 获取列表 (含动态状态计算) + # 6. 获取列表 (核心逻辑修改) # ============================================================ @staticmethod - def get_list(page, limit, keyword=None): + def get_list(page, limit, keyword=None, statuses=None): + """ + 获取列表 + :param statuses: 状态列表 (e.g. ['在库', '借库', '已出库']) + """ try: - # 1. 联表查询：StockBuy join MaterialBase query = db.session.query(StockBuy).outerjoin(MaterialBase, StockBuy.base_id == MaterialBase.id) + # 1. 关键词搜索 (覆盖所有关键字段) if keyword: + kw = f'%{keyword}%' query = query.filter( or_( - MaterialBase.name.ilike(f'%{keyword}%'), - MaterialBase.spec_model.ilike(f'%{keyword}%'), - StockBuy.batch_number.ilike(f'%{keyword}%'), - StockBuy.serial_number.ilike(f'%{keyword}%'), - StockBuy.sku.ilike(f'%{keyword}%'), - StockBuy.supplier_name.ilike(f'%{keyword}%') + MaterialBase.name.ilike(kw), + MaterialBase.spec_model.ilike(kw), + StockBuy.batch_number.ilike(kw), + StockBuy.serial_number.ilike(kw), + StockBuy.sku.ilike(kw), + StockBuy.supplier_name.ilike(kw) + ) + ) + + # 2. 状态筛选与零库存隐藏逻辑 + # 用户要求： + # - 默认显示：'在库', '借库'。 + # - 零库存规则：库存为0时，不在页面显示（除非筛选了'已出库'）。 + + if not statuses: + # 默认情况：只查 '在库' 和 '借库' + statuses = ['在库', '借库'] + + # 构建筛选条件 + # 如果筛选条件中 包含 '已出库'，则允许显示 stock_quantity >= 0 (即显示所有) + # 如果筛选条件中 不包含 '已出库'，则强制要求 stock_quantity > 0 (隐藏零库存) + + if '已出库' in statuses: + # 用户想看已出库的，直接按状态查，不做数量限制 + query = query.filter(StockBuy.status.in_(statuses)) + else: + # 用户不想看已出库的，按状态查 AND 数量必须 > 0 + query = query.filter( + and_( + StockBuy.status.in_(statuses), + StockBuy.stock_quantity > 0 ) ) pagination = query.order_by(StockBuy.id.desc()).paginate(page=page, per_page=limit, error_out=False) - current_items = pagination.items - base_ids = list(set([item.base_id for item in current_items if item.base_id])) - # 2. 聚合统计 (计算该种物料的总库存) - stock_map = {} - if base_ids: - aggregates = db.session.query( - StockBuy.base_id, - func.sum(StockBuy.stock_quantity).label('total_stock'), - func.sum(StockBuy.available_quantity).label('total_avail') - ).filter(StockBuy.base_id.in_(base_ids)).group_by(StockBuy.base_id).all() - - for agg in aggregates: - stock_map[agg.base_id] = { - 'total_stock': float(agg.total_stock or 0), - 'total_avail': float(agg.total_avail or 0) - } - - # 辅助函数：解析JSON图片列表 - def parse_img_list(json_str): - if not json_str: - return [] + def parse_img(json_str): + if not json_str: return [] try: - if not json_str.startswith('['): - return [json_str] - return json.loads(json_str) + return json.loads(json_str) if json_str.startswith('[') else [json_str] except: return [] items = [] for item in current_items: - # ------------------------------------------------------------- - # [核心逻辑] 动态计算状态 - # ------------------------------------------------------------- - qty_in = float(item.in_quantity or 0) + # 获取单行数据，不再进行聚合计算 + qty_stock = float(item.stock_quantity or 0) qty_avail = float(item.available_quantity or 0) - # 默认使用数据库字段 - current_status = item.status - - # 如果有入库量，但可用量为0，说明已经全部出库 - if qty_in > 0 and qty_avail <= 0: - current_status = '出库' - - # 获取聚合数据 - mat_name = item.material.name if item.material else '未知物料' - mat_spec = item.material.spec_model if item.material else '' - mat_cat = item.material.category if item.material else '' - mat_unit = item.material.unit if item.material else '' - mat_type = item.material.material_type if item.material else '' - - stats = stock_map.get(item.base_id, {'total_stock': 0, 'total_avail': 0}) - d = { 'id': item.id, 'base_id': item.base_id, - 'material_name': mat_name, - 'spec_model': mat_spec, - 'category': mat_cat, - 'unit': mat_unit, - 'material_type': mat_type, + 'material_name': item.material.name if item.material else '', + 'spec_model': item.material.spec_model if item.material else '', + 'category': item.material.category if item.material else '', + 'unit': item.material.unit if item.material else '', + 'material_type': item.material.material_type if item.material else '', 'sku': item.sku, 'inbound_date': str(item.in_date) if item.in_date else '', @@ -353,17 +266,17 @@ class BuyInboundService: 'serial_number': item.serial_number, 'batch_number': item.batch_number, - # 使用动态计算的状态 - 'status': current_status, - + 'status': item.status, 'inspection_status': item.inspection_status, - 'qty_inbound': qty_in, - 'qty_stock': float(item.stock_quantity or 0), + 'qty_inbound': float(item.in_quantity or 0), + 'qty_stock': qty_stock, 'qty_available': qty_avail, - 'sum_stock': stats['total_stock'], - 'sum_available': stats['total_avail'], + # 解除挂钩：不再返回所有批次的总和，直接返回当前批次的数量 + # 为了兼容前端字段名，这里直接用当前行数量填充 + 'sum_stock': qty_stock, + 'sum_available': qty_avail, 'warehouse_loc': item.warehouse_location, 'unit_price': float(item.unit_price or 0), @@ -375,10 +288,8 @@ class BuyInboundService: 'purchaser_email': item.buyer_email, 'source_link': item.original_link, 'detail_link': item.detail_link, - - 'arrival_photo': parse_img_list(item.arrival_photo), - 'inspection_report': parse_img_list(item.inspection_report), - + 'arrival_photo': parse_img(item.arrival_photo), + 'inspection_report': parse_img(item.inspection_report), 'global_print_id': item.global_print_id, 'global_print_id_str': f"{item.global_print_id:08d}" if item.global_print_id else "" } @@ -386,6 +297,5 @@ class BuyInboundService: return {"total": pagination.total, "items": items} except Exception as e: - print(f"List Error: {e}") traceback.print_exc() return {"total": 0, "items": []} \ No newline at end of file diff --git a/inventory-web/src/views/stock/inbound/buy.vue b/inventory-web/src/views/stock/inbound/buy.vue index a733e3f..82f38bf 100644 --- a/inventory-web/src/views/stock/inbound/buy.vue +++ b/inventory-web/src/views/stock/inbound/buy.vue @@ -9,11 +9,25 @@ clearable @clear="fetchData" @keyup.enter="fetchData" + style="width: 300px; margin-right: 10px;" > + + + + + +
@@ -66,21 +80,24 @@ -