a11b7972c3
后端变更: - PurchaseRequest 新增 base_id 硬关联 MaterialBase，StockBuy 新增 request_id 关联采购单 - handle_inbound 支持 request_id 入参，入库后自动反写采购单状态为已完成 - 新增 get_approved_requests 接口，返回已审批未入库采购单列表（含物料信息+历史数据回退匹配） - create_purchase_request 新增 name+spec_model 自动匹配 MaterialBase - 新增 SQL 和 Alembic 数据库迁移脚本 前端变更: - 入库表单新增"从采购单导入"弹窗，支持搜索/选中已审批采购单并一键填充物料和商务信息 - 单价/总价交叉推算，缺项自动补全 - 选中行蓝色高亮+点击整行选中，行级交互优化
91 lines
4.2 KiB
Python
91 lines
4.2 KiB
Python
import json
|
|
from app.extensions import db, beijing_time
|
|
from datetime import datetime
|
|
|
|
|
|
class PurchaseRequest(db.Model):
|
|
"""
|
|
采购申请表
|
|
"""
|
|
__tablename__ = 'purchase_request'
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
request_no = db.Column(db.String(100), unique=True, nullable=False, index=True)
|
|
# [新增] 硬关联基础物料表，打通"按单入库"链路
|
|
base_id = db.Column(db.Integer, db.ForeignKey('material_base.id'), index=True, comment='关联基础物料ID')
|
|
name = db.Column(db.String(255), nullable=False, comment='采购名称')
|
|
spec_model = db.Column(db.String(255), comment='规格型号')
|
|
quantity = db.Column(db.Numeric(19, 4), nullable=False, comment='采购数量')
|
|
purchase_date = db.Column(db.Date, nullable=False, comment='采购时间')
|
|
supplier_link = db.Column(db.String(500), comment='商家地址链接')
|
|
remark = db.Column(db.Text, comment='备注信息')
|
|
images = db.Column(db.Text, comment='图片列表JSON')
|
|
unit_price = db.Column(db.Numeric(19, 4), default=0, comment='单价')
|
|
total_price = db.Column(db.Numeric(19, 4), default=0, comment='总价')
|
|
status = db.Column(db.Integer, default=0, nullable=False)
|
|
requester_id = db.Column(db.Integer, nullable=False, index=True)
|
|
approver_id = db.Column(db.Integer, index=True)
|
|
# [新增] 反向关联：该采购申请对应的入库记录
|
|
stock_buys = db.relationship('StockBuy', back_populates='purchase_request', lazy='dynamic')
|
|
approved_at = db.Column(db.DateTime)
|
|
reject_reason = db.Column(db.Text)
|
|
created_at = db.Column(db.DateTime, default=beijing_time, nullable=False)
|
|
updated_at = db.Column(db.DateTime, default=beijing_time, onupdate=beijing_time, nullable=False)
|
|
|
|
def _safe_parse_json(self, value):
|
|
if value is None:
|
|
return []
|
|
if isinstance(value, (list, dict)):
|
|
return value
|
|
if isinstance(value, str):
|
|
val = value.strip()
|
|
if not val:
|
|
return []
|
|
try:
|
|
parsed = json.loads(val)
|
|
return parsed if isinstance(parsed, list) else []
|
|
except Exception:
|
|
return []
|
|
return []
|
|
|
|
def get_images(self):
|
|
return self._safe_parse_json(self.images)
|
|
|
|
def set_images(self, image_list):
|
|
self.images = json.dumps(image_list, ensure_ascii=False) if image_list else '[]'
|
|
|
|
def _get_user_name(self, user_id):
|
|
if not user_id:
|
|
return ""
|
|
from app.models.system import SysUser
|
|
try:
|
|
user = db.session.get(SysUser, user_id)
|
|
return user.username if user else f"未知用户({user_id})"
|
|
except Exception:
|
|
return f"用户({user_id})"
|
|
|
|
def to_dict(self):
|
|
return {
|
|
'id': self.id,
|
|
'request_no': self.request_no,
|
|
'base_id': self.base_id,
|
|
'name': self.name,
|
|
'spec_model': self.spec_model or '',
|
|
'quantity': float(self.quantity) if self.quantity else 0,
|
|
'purchase_date': self.purchase_date.strftime('%Y-%m-%d') if self.purchase_date else None,
|
|
'supplier_link': self.supplier_link or '',
|
|
'remark': self.remark or '',
|
|
'images': self.get_images(),
|
|
'unit_price': float(self.unit_price) if self.unit_price else 0,
|
|
'total_price': float(self.total_price) if self.total_price else 0,
|
|
'status': self.status,
|
|
'status_text': ['待审批', '已通过', '已驳回', '已完成'][self.status] if self.status in [0, 1, 2, 3] else '未知',
|
|
'requester_id': self.requester_id,
|
|
'requester_name': self._get_user_name(self.requester_id),
|
|
'approver_id': self.approver_id,
|
|
'approver_name': self._get_user_name(self.approver_id) if self.approver_id else None,
|
|
'approved_at': self.approved_at.strftime('%Y-%m-%d %H:%M:%S') if self.approved_at else None,
|
|
'reject_reason': self.reject_reason or '',
|
|
'created_at': self.created_at.strftime('%Y-%m-%d %H:%M:%S') if self.created_at else None,
|
|
'updated_at': self.updated_at.strftime('%Y-%m-%d %H:%M:%S') if self.updated_at else None,
|
|
} |