修改半成品与成品出入库相关联逻辑

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

@@ -1,8 +1,9 @@
 # app/services/inbound/product_service.py
 from app.extensions import db
 from app.models.base import MaterialBase
+from app.models.outbound import TransOutbound
 from datetime import datetime
-from sqlalchemy import or_, func, text, and_  # Added and_
+from sqlalchemy import or_, func, text, and_
 import traceback
 import json
 
@@ -64,7 +65,7 @@ class ProductInboundService:
             generated_sku = str(next_global_id).zfill(10)
             final_barcode = data.get('barcode') or generated_sku
 
-            # [核心修改] 处理三个图片/链接列表
+            # 处理三个图片/链接列表
             photo_list = data.get('product_photo', [])
             quality_list = data.get('quality_report_link', [])
             inspection_list = data.get('inspection_report_link', [])
@@ -135,7 +136,7 @@ class ProductInboundService:
             for f in fields:
                 if f in data: setattr(stock, f, data[f])
 
-            # [核心修改] 更新 JSON 字段
+            # 更新 JSON 字段
             if 'product_photo' in data:
                 imgs = data['product_photo']
                 if isinstance(imgs, list): stock.product_photo = json.dumps(imgs)
@@ -155,10 +156,9 @@ class ProductInboundService:
             if 'in_quantity' in data:
                 new_qty = float(data['in_quantity'])
                 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
+                stock.in_quantity = new_qty
+                stock.stock_quantity = float(stock.stock_quantity) + diff
+                stock.available_quantity = float(stock.available_quantity) + diff
 
             if 'production_start_time' in data or 'production_end_time' in data:
                 old_range = stock.production_time_range or " ~ "
@@ -188,6 +188,23 @@ class ProductInboundService:
             db.session.rollback()
             raise e
 
+    # ============================================================
+    # 获取出库流转历史 (与 Buy 逻辑一致，关联 TransOutbound 表)
+    # ============================================================
+    @staticmethod
+    def get_outbound_history(stock_id):
+        """获取出库历史"""
+        try:
+            records = TransOutbound.query.filter_by(
+                source_table='stock_product', stock_id=stock_id
+            ).order_by(TransOutbound.outbound_time.desc()).all()
+            return [r.to_dict() for r in records]
+        except:
+            return []
+
+    # ============================================================
+    # 获取列表 (包含状态筛选与零库存隐藏逻辑)
+    # ============================================================
     @staticmethod
     def get_list(page, limit, keyword=None, statuses=None):
         from app.models.inbound.product import StockProduct
@@ -222,11 +239,8 @@ class ProductInboundService:
 
             pagination = query.order_by(StockProduct.id.desc()).paginate(page=page, per_page=limit, error_out=False)
 
-            # 3. 数据组装 (移除聚合逻辑，改为单行数据)
             current_items = pagination.items
 
-            # 移除聚合查询代码...
-
             def parse_img(json_str):
                 if not json_str: return []
                 try: