借库逻辑实现

inventory-backend/app/models/transaction.py

@@ -2,95 +2,52 @@ from app.extensions import db
 from datetime import datetime
 
 
-# 1. 借用表
 class TransBorrow(db.Model):
     __tablename__ = 'trans_borrow'
 
     id = db.Column(db.Integer, primary_key=True)
-    sku = db.Column(db.String(100), index=True)  # 加索引优化查询
+    borrow_no = db.Column(db.String(100))
+
+    sku = db.Column(db.String(100))
     source_table = db.Column(db.String(50))
     stock_id = db.Column(db.Integer)
+    barcode = db.Column(db.String(100))
+
     quantity = db.Column(db.Numeric(19, 4))
 
+    # 借出信息
+    borrower_name = db.Column(db.String(100))
     borrow_time = db.Column(db.DateTime, default=datetime.now)
+    borrow_signature = db.Column(db.Text)  # 借用人签字
     expected_return_time = db.Column(db.DateTime)
 
-    borrower_name = db.Column(db.String(100))
-    actual_return_time = db.Column(db.DateTime)
-    approver_name = db.Column(db.String(100))
+    # 归还信息
+    is_returned = db.Column(db.Boolean, default=False)
+    return_time = db.Column(db.DateTime)
+    return_operator = db.Column(db.String(100))  # 库管
+    return_signature = db.Column(db.Text)  # 库管签字
+    return_location = db.Column(db.String(100))  # 归还库位
 
-    # 状态：borrowed(借出), returned(已还), overdue(逾期)
     status = db.Column(db.String(20), default='borrowed')
+    remark = db.Column(db.Text)
 
     def to_dict(self):
         return {
             'id': self.id,
+            'borrow_no': self.borrow_no,
             'sku': self.sku,
+            'barcode': self.barcode,
             'quantity': float(self.quantity) if self.quantity else 0,
             'borrower_name': self.borrower_name,
-            'borrow_time': self.borrow_time.strftime('%Y-%m-%d %H:%M:%S') if self.borrow_time else None,
-            'status': self.status
-        }
-
-
-# 2. 维修表
-class TransRepair(db.Model):
-    __tablename__ = 'trans_repair'
-
-    id = db.Column(db.Integer, primary_key=True)
-    sku = db.Column(db.String(100), index=True)
-    source_table = db.Column(db.String(50))
-    stock_id = db.Column(db.Integer)
-
-    arrival_date = db.Column(db.Date)
-    expected_repair_time = db.Column(db.String(100))
-    shipping_date = db.Column(db.Date)
-
-    is_self_made = db.Column(db.Boolean, default=False)
-    related_product_id = db.Column(db.Integer)
-    related_contract_id = db.Column(db.String(100))
-
-    repair_manager = db.Column(db.String(100))
-    fault_description = db.Column(db.Text)
-    repair_result = db.Column(db.Text)
-
-    cost_price = db.Column(db.Numeric(19, 4))
-    sale_price = db.Column(db.Numeric(19, 4))
-
-    def to_dict(self):
-        return {
-            'id': self.id,
-            'sku': self.sku,
-            'status': 'repaired' if self.repair_result else 'pending',
-            'manager': self.repair_manager
-        }
-
-
-# 3. 报废表
-class TransScrap(db.Model):
-    __tablename__ = 'trans_scrap'
-
-    id = db.Column(db.Integer, primary_key=True)
-    sku = db.Column(db.String(100), index=True)
-    source_table = db.Column(db.String(50))
-    stock_id = db.Column(db.Integer)
-    quantity = db.Column(db.Numeric(19, 4))
-
-    reason = db.Column(db.Text)
-    operator_name = db.Column(db.String(100))
-    operation_time = db.Column(db.DateTime, default=datetime.now)
-
-    approver_name = db.Column(db.String(100))
-    approval_status = db.Column(db.String(20), default='pending')  # pending, approved, rejected
-
-    cost_at_scrap = db.Column(db.Numeric(19, 4))
-    total_loss = db.Column(db.Numeric(19, 4))
-
-    def to_dict(self):
-        return {
-            'id': self.id,
-            'sku': self.sku,
-            'quantity': float(self.quantity) if self.quantity else 0,
-            'total_loss': float(self.total_loss) if self.total_loss else 0,
-            'reason': self.reason
+            'borrow_time': self.borrow_time.strftime('%Y-%m-%d %H:%M') if self.borrow_time else '',
+            'borrow_signature': self.borrow_signature,
+            'expected_return_time': self.expected_return_time.strftime(
+                '%Y-%m-%d %H:%M') if self.expected_return_time else '',
+            'is_returned': self.is_returned,
+            'return_time': self.return_time.strftime('%Y-%m-%d %H:%M') if self.return_time else '',
+            'return_operator': self.return_operator,
+            'return_signature': self.return_signature,
+            'return_location': self.return_location,
+            'status': self.status,
+            'remark': self.remark
         }