feat(inbound): handle batch duplication gracefully, support spec search, and auto-fill historical locations

inventory-backend/app/services/inbound/semi_service.py

@@ -1,6 +1,8 @@
 # app/services/inbound/semi_service.py
 from app.extensions import db
 from app.models.base import MaterialBase
+from app.models.inbound.buy import StockBuy
+from app.models.inbound.product import StockProduct
 from app.models.outbound import TransOutbound
 from datetime import datetime, timedelta, timezone
 from sqlalchemy import or_, func, text, and_
@@ -21,7 +23,7 @@ class SemiInboundService:
             exists = query.first()
             if exists:
                 occupied_name = exists.base.name if (hasattr(exists, 'base') and exists.base) else "未知物料"
-                raise ValueError(f"序列号【{serial_number}】已存在！被半成品 [{occupied_name}] 占用，请核查。")
+                return f"序列号【{serial_number}】已存在！被半成品 [{occupied_name}] 占用，请核查。"
 
         if batch_number and base_id:
             query = StockSemi.query.filter(
@@ -31,7 +33,9 @@ class SemiInboundService:
             if exclude_id:
                 query = query.filter(StockSemi.id != exclude_id)
             if query.first():
-                raise ValueError(f"该物料已存在批号【{batch_number}】，请勿重复建单，建议在原批次上追加库存。")
+                return f"该物料已存在批号【{batch_number}】，请勿重复建单，建议在原批次上追加库存。"
+
+        return None
 
     @staticmethod
     def search_base_material(keyword, page=1, limit=50):
@@ -50,6 +54,29 @@ class SemiInboundService:
             pagination = query.paginate(page=page, per_page=limit, error_out=False)
             results = []
             for item in pagination.items:
+                # 查询最近一次入库的库位（半成品入库 + 采购入库 + 成品入库）
+                last_location = ''
+                # 查半成品入库
+                last_semi = StockSemi.query.filter(
+                    StockSemi.base_id == item.id
+                ).order_by(StockSemi.in_date.desc()).first()
+                if last_semi and last_semi.warehouse_location:
+                    last_location = last_semi.warehouse_location
+                else:
+                    # 查采购入库
+                    last_buy = StockBuy.query.filter(
+                        StockBuy.base_id == item.id
+                    ).order_by(StockBuy.in_date.desc()).first()
+                    if last_buy and last_buy.warehouse_location:
+                        last_location = last_buy.warehouse_location
+                    else:
+                        # 查成品入库
+                        last_product = StockProduct.query.filter(
+                            StockProduct.base_id == item.id
+                        ).order_by(StockProduct.in_date.desc()).first()
+                        if last_product and last_product.warehouse_location:
+                            last_location = last_product.warehouse_location
+
                 results.append({
                     'id': item.id,
                     'company_name': item.company_name,
@@ -58,7 +85,8 @@ class SemiInboundService:
                     'category': item.category,
                     'unit': item.unit,
                     'type': item.material_type,
-                    'status': '启用'
+                    'status': '启用',
+                    'history_location': last_location
                 })
             return {"items": results, "total": pagination.total, "page": page, "has_next": pagination.has_next}
         except Exception as e:
@@ -114,11 +142,14 @@ class SemiInboundService:
             if not material.is_enabled:
                 raise ValueError(f"物料【{material.name}】已停用，无法办理新入库。")
 
-            SemiInboundService._check_unique(
+            # 校验批号/序列号唯一性
+            unique_error = SemiInboundService._check_unique(
                 base_id=base_id,
                 serial_number=data.get('serial_number'),
                 batch_number=data.get('batch_number')
             )
+            if unique_error:
+                return {'error': unique_error}
 
             beijing_tz = timezone(timedelta(hours=8))
             current_time = datetime.now(beijing_tz).replace(tzinfo=None)