xxx
This commit is contained in:
@@ -12,6 +12,12 @@ HOST_PORT=10001
|
||||
|
||||
DEBUG=false
|
||||
|
||||
# 日志配置
|
||||
# LOG_FORMAT: json（生产默认，结构化输出）/ text（开发默认，人可读）
|
||||
# LOG_LEVEL: DEBUG / INFO / WARNING / ERROR
|
||||
LOG_FORMAT=json
|
||||
LOG_LEVEL=INFO
|
||||
|
||||
# 文件处理配置
|
||||
UPLOAD_DIR=./uploads
|
||||
MAX_FILE_SIZE=104857600
|
||||
@@ -41,6 +47,9 @@ SECRET_KEY=your-secret-key-change-in-production-min-32-chars
|
||||
ALGORITHM=HS256
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES=1440
|
||||
|
||||
# CORS 白名单（逗号分隔，不设置则默认为 [*]，生产环境务必设置）
|
||||
# CORS_ORIGINS=http://localhost:5173,http://localhost:10001,https://your-domain.com
|
||||
|
||||
# 管理员账户配置
|
||||
ADMIN_USERNAME=admin
|
||||
ADMIN_PASSWORD=change-this-to-a-secure-password
|
||||
|
||||
@@ -10,7 +10,6 @@ minio>=7.1.0
|
||||
aiohttp>=3.13.4
|
||||
|
||||
celery[redis]>=5.3.0
|
||||
kafka-python>=2.0.2
|
||||
|
||||
pytest>=7.0.0
|
||||
pytest-asyncio>=0.21.0
|
||||
|
||||
+100
-13
@@ -99,7 +99,7 @@
|
||||
### P1-3 前端 OpenAPI 契约生成
|
||||
- **现状**：前端 40+ 处 `any`，字段全手写已大面积错配。
|
||||
- **目标**：`openapi-typescript` 从 `/openapi.json` 生成 TS 类型替换 `any`；`api.ts` 加 baseURL/拦截器/超时，按域封装 `inventoryApi`/`moldinsightApi`/`authApi`。
|
||||
- **状态**：- [ ]
|
||||
- **状态**：- [x]（见 P4-1）
|
||||
|
||||
### P1-4 引入 Alembic，废除裸 DDL
|
||||
- **现状**：无 `alembic.ini`；`init_db.py` 22 条 `ALTER TABLE ADD COLUMN IF NOT EXISTS`，无版本/无回滚；`migrate_db.py` 是 `drop_all` 破坏性脚本；两应用 startup 并发跑 DDL 争锁。
|
||||
@@ -137,27 +137,45 @@
|
||||
### P2-2 真 AI 落地，砍掉假 AI
|
||||
- **现状**：`ai_mold_assistant.py` 209 行纯 stub 从未被调用；`ai_parting_detector.py` GNN 框架完整但无权重；`llm_service` 是唯一真接 AI（且有 P0-2 bug）。
|
||||
- **目标**：聚焦一个能跑通的 AI 能力（LLM 扩到成本估算/工艺对话）；GNN 要么真训权重，要么移除 stub。
|
||||
- **状态**：- [ ]
|
||||
- **进展（2026-07-27）**：✅ `ai_mold_assistant.py` stub 已删除（P3-3 死代码清理）；✅ LLM 成本估算已落地（`llm_service.estimate_cost` + `POST /api/cost-estimate`）；✅ 规则式兜底（`cost_estimate_service.py`，LLM 未启用时自动降级）；⏳ GNN `ai_parting_detector.py` 仍无权重，待决策保留或移除
|
||||
- **状态**：- [~]（成本估算完成，GNN 待决策）
|
||||
|
||||
### P2-3 模具成本估算 + 批量分析
|
||||
- 依赖 P1-2 完成后才有性价比。
|
||||
- **状态**：- [ ]
|
||||
- **进展（2026-07-27）**：
|
||||
- ✅ **P2-3a 前端成本估算 UI**：ResultView 新增「💰 成本估算」按钮 + 锚点导航 + 成本卡片（模具造价/单件成本/估算假设/置信度）
|
||||
- ✅ **P2-3b 规则式兜底**：`cost_estimate_service.py`（模具钢材料单价表 + 加工复杂度系数 + 侧向机构附加费），LLM 未启用时 `advanced_router` 自动调用规则引擎
|
||||
- ✅ **P2-3c 批量上传后端**：`batch_router.py`（多文件 `POST /api/batch-upload` + Redis batch_id→task_ids 映射 24h TTL + `GET /api/batch/{batch_id}` 聚合查询），复用现有 `processing_service` + Celery 并发
|
||||
- ✅ **P2-3d 批量前端 UI**：`BatchView.vue`（拖拽多文件上传 + 进度看板 + 轮询 + 任务表格），MoldInsightView 入口按钮
|
||||
- **状态**：- [x]
|
||||
|
||||
### P2 执行结果
|
||||
|
||||
- ✅ **P2-1 打通模具分析 -> 进销存**：`STPFile` 加 `product_id` 外键（nullable+index+FK）+ Alembic 迁移 `006c18c51b0d`（首次真实迁移）；inventory `POST /api/products/from-task/{task_id}` 端点（按 task_id 查 STPFile，幂等创建 `Product(finished)`，回写 product_id，SKU=`MI{stp_file_id}`，描述含体积/重量/表面积）；前端 ResultView 导出栏加「创建为成品」按钮。py_compile + alembic heads + vue-tsc 0 错误通过。**模具分析 -> 成品 -> BOM -> 销售/采购的业务闭环接通**
|
||||
- ✅ **P2-2 真 AI 落地（部分）**：删除 `ai_mold_assistant.py` 死代码；LLM 成本估算 + 规则兜底双路径已上线
|
||||
- ✅ **P2-3 成本估算 + 批量分析（全部完成）**：前端成本卡片 + 规则式兜底 + 批量上传后端 + 批量进度看板
|
||||
|
||||
---
|
||||
|
||||
## P3 工程治理（穿插顺手做）
|
||||
|
||||
- [ ] `create_app()` 工厂消除两入口重复引导，废弃单体 `main.py`
|
||||
- [ ] 删死依赖/死代码：Kafka（零引用）、`templates/` legacy、`ai_mold_assistant` stub、`ProcessingService.__init__` 3 个死实例
|
||||
- [ ] `get_db_session` 统一事务边界（commit/rollback），废除路由手动 commit
|
||||
- [ ] 连接池治理（3 进程峰值 150 > PG 默认 100），考虑 PgBouncer
|
||||
- [ ] 进销存 state 从模块级单例迁回 Pinia，tab 改子路由
|
||||
- [ ] 统一 `/health` 响应 schema；SPA fallback 排除 `/api` 前缀避免吞 404
|
||||
- [ ] CORS 收敛（`allow_origins=["*"]` + `allow_credentials=True` 不安全）
|
||||
- [x] `create_app()` 工厂消除两入口重复引导，废弃单体 `main.py` → `shared/app_factory.py`（2026-07-27）
|
||||
- [x] 删死依赖/死代码：Kafka 依赖删除、`templates/` 三个 legacy Jinja 模板删除、`task_router` result_page 死端点删除、`ProcessingService.__init__` 3 个死实例删除（2026-07-27）
|
||||
- [x] `get_db_session` 统一事务边界（成功 commit / 异常 rollback），inventory 路由 commit→flush（2026-07-27）
|
||||
- [x] 连接池治理：web `pool_size=10, max_overflow=20` / celery `pool_size=5, max_overflow=10`，环境变量可覆盖（2026-07-27）
|
||||
- [x] 进销存 state 从模块级单例迁回 Pinia `defineStore`，tab 改子路由（URL 可分享/回退）（2026-07-27）
|
||||
- [x] 统一 `/health` 响应 schema（status/service/version/database_connected）；SPA fallback 排除 `/api`、`/docs`、`/openapi` 前缀（2026-07-27）
|
||||
- [x] CORS 收敛：`CORS_ORIGINS` 环境变量白名单，空则降级 `["*"]` + 警告日志（2026-07-27）
|
||||
|
||||
### P3 执行结果（全部完成，2026-07-27）
|
||||
|
||||
- ✅ **P3-1 CORS 收敛**：`settings.py` 新增 `CORS_ORIGINS` 解析；`app_factory.py` 从白名单创建 CORS，空则 `["*"]` + warning
|
||||
- ✅ **P3-2 /health + SPA fallback**：`app_factory.py` 统一 GET+POST /health（含 database_connected 检测）；catch-all 排除 `api/`/`docs`/`openapi` 前缀
|
||||
- ✅ **P3-3 删除死代码**：`requirements.txt` + `deploy/requirements-moldinsight.txt` 删 `kafka-python`；删除 `templates/*.html` 三个 legacy 模板；`task_router.py` 删 `result_page` 端点；`processing_service.py` 删 3 个死实例 + 死 import
|
||||
- ✅ **P3-4 事务边界**：`database.py` 的 `get_db_session` 统一 commit/rollback；inventory 5 个路由共 25 处 `commit()` → `flush()`
|
||||
- ✅ **P3-5 连接池**：`database.py` 按角色分层 `_get_pool_config()`，web/celery 分别配置；`celery_tasks.py` 初始化 celery 角色引擎
|
||||
- ✅ **P3-6 app_factory**：新建 `shared/app_factory.py`（CORS/日志中间件/静态文件/startup/shutdown/health/SPA fallback）；两入口各 ~30 行
|
||||
- ✅ **P3-7 Pinia + 子路由**：新建 `stores/inventory.ts`（defineStore）；`useInventory.ts` 改为薄壳委托；10 个 Tab 子路由懒加载；Sidebar 改 `router.push`
|
||||
|
||||
---
|
||||
|
||||
@@ -166,6 +184,75 @@
|
||||
| 阶段 | 项数 | 已完成 | 进行中 |
|
||||
|------|------|--------|--------|
|
||||
| P0 | 7 | 6 修复 + 1 排查 | - |
|
||||
| P1 | 5 | 4 | P1-1+P1-5+P1-4 完成 + P1-2 注册表完成（Stage 暂缓） |
|
||||
| P2 | 3 | 1 | P2-1 完成 |
|
||||
| P3 | 7 | 0 | - |
|
||||
| P1 | 5 | 5 | P1-1~P1-5 全部完成（P1-2 Stage 流水线暂缓） |
|
||||
| P2 | 3 | 3 | P2-1+P2-2(部分)+P2-3 全部完成 |
|
||||
| P3 | 7 | 7 | 全部完成 |
|
||||
| P4 | 10 | 4 | P4-1 OpenAPI 契约 + P4-4 采购需求推导 + P4-6 集成测试 + P4-7 结构化日志 |
|
||||
|
||||
---
|
||||
|
||||
## P4 后续演进方向（待规划）
|
||||
|
||||
### 方向 A：前端工程化加固（低风险、高收益）
|
||||
|
||||
#### P4-1 OpenAPI 契约自动生成 ✅
|
||||
- **现状**：前端 `any` 泛滥，字段靠手写已多次错配（P0-3 教训）
|
||||
- **目标**：`openapi-typescript` 从 `/openapi.json` 生成 TS interface，替换 `types/schemas.ts` 中的 `any`；`api.ts` 按域封装 `inventoryApi` / `moldinsightApi` / `authApi`
|
||||
- **体量**：~1 天
|
||||
- **完成（2026-07-27）**：`openapi.json` 双服务统一（70 paths / 76 schemas）；`types/api.ts` 自动生成（5500+ 行）；`api-client.ts` 按域封装（authApi/inventoryApi/moldinsightApi）；`stores/inventory.ts` 核心 ref 加 `Schema<>` 类型标注
|
||||
|
||||
#### P4-2 Stage 流水线拆分
|
||||
- **现状**：`process_file_core` 278 行线性函数，新增分析阶段需改核心函数
|
||||
- **目标**：拆成 Stage 链（parse_stp → detect_features → plan_mold → generate_visualization → analyze_design → generate_report → finalize），每个 Stage 可独立测试和替换
|
||||
- **前提**：需在有 OCC 的环境下运行时验证
|
||||
- **体量**：~2-3 天
|
||||
|
||||
### 方向 B：业务闭环深化
|
||||
|
||||
#### P4-3 模具分析报告 → 销售订单关联
|
||||
- **现状**：P2-1 已打通 STP→成品，但分析报告（HTML）与销售订单无直接关联
|
||||
- **目标**：销售订单创建时可选择关联 moldinsight task_id，订单详情页嵌入分析报告 iframe/摘要；报价单自动引用成本估算数据
|
||||
- **体量**：~2 天
|
||||
|
||||
#### P4-4 采购需求自动推导 ✅
|
||||
- **现状**：BOM 定义了成品所需物料，但采购仍需手动创建
|
||||
- **目标**：销售订单确认 → 按 BOM 展开物料需求 → 对比当前库存 → 自动生成采购建议（缺多少、建议供应商、预计金额）；一键转为采购订单
|
||||
- **体量**：~3 天
|
||||
- **完成（2026-07-27）**：`purchase_demand_schemas.py`（Request/ItemResponse/Response）+ `purchase_demand_service.py`（6 步算法：批量查询订单→BOM 展开含损耗率→聚合需求→库存对比→主供应商推荐→按缺口降序排列）+ `purchase_demand_routes.py`（薄路由 `POST /api/purchase-demands/calculate`）+ 前端「采购建议」按钮 + 对话框（多选销售订单 + 结果表格含缺口/供应商/交期）
|
||||
|
||||
#### P4-5 GNN 分型面检测（决策项）
|
||||
- **现状**：`ai_parting_detector.py` 有框架无权重，从未被调用
|
||||
- **选择**：(a) 投入训权重（需标注数据集 + GPU）；(b) 改为规则式分型面推荐（利用已识别的 Undercut/Pocket 特征 + 几何启发式）；(c) 彻底移除，减少维护负担
|
||||
- **建议**：短期选 (b) 或 (c)，等数据积累后再考虑 (a)
|
||||
|
||||
### 方向 C：可靠性与可观测性
|
||||
|
||||
#### P4-6 集成测试覆盖 ✅
|
||||
- **现状**：`tests/` 仅 2 个测试文件，核心业务流程无回归保障
|
||||
- **目标**：关键路径 pytest 覆盖——STP 上传→分析→创建成品→销售订单→采购→库存变动；mock OCC 外部依赖
|
||||
- **体量**：~2-3 天
|
||||
- **完成（2026-07-27）**：`conftest.py` 重构（SQLite + aiosqlite + FK 逆序清空 + 每测试重新播种）；`test_purchase_demand.py` 5 个用例（正常推导/缺货/无效订单/无BOM/空请求）；`test_api_inventory_orders.py` 32 个用例（库存/采购/销售/物料/StockMovement CRUD + 校验）；`test_sales_order_delivered_freeze.py` 2 个用例（交付冻结/非交付可改）；`sales_order_service.py` 补 delivered 状态守卫 bug 修复；39 测试全通过
|
||||
|
||||
#### P4-7 结构化日志 + 请求追踪 ✅
|
||||
- **现状**：`app_factory.py` 有请求日志中间件，但无 request_id 贯穿、无结构化 JSON 输出
|
||||
- **目标**：中间件注入 `X-Request-ID`；日志格式改 JSON（timestamp/level/request_id/service/path/duration_ms）；接入 Prometheus `/metrics` 端点（请求计数/延迟/错误率）
|
||||
- **体量**：~1 天
|
||||
- **完成（2026-07-27）**：`logger.py` 升级为 JSON 结构化日志（`JSONFormatter` + `TextFormatter`）+ `contextvars` request_id 跨 async 传播；`app_factory.py` 中间件升级（自动生成/提取 `X-Request-ID`、注入响应头、全请求结构化日志含 method/path/status/duration_ms/client_ip）；支持 `LOG_FORMAT`/`LOG_LEVEL` 环境变量切换；Prometheus `/metrics` 端点归入后续 P4-8 或独立任务
|
||||
|
||||
#### P4-8 Celery 任务可靠性
|
||||
- **现状**：任务失败无自动重试；无死信队列；批量任务进度仅靠 Redis TTL
|
||||
- **目标**：`@task(autoretry_for, retry_backoff)` 自动重试；死信队列记录永久失败任务；批量任务完成后写 PG 持久化（不依赖 Redis TTL 过期）
|
||||
- **体量**：~1-2 天
|
||||
|
||||
### 方向 D：格式扩展与性能
|
||||
|
||||
#### P4-9 IGES / BREP 格式支持
|
||||
- **现状**：仅支持 STP/STEP，注册表模式已就绪（P1-2）
|
||||
- **目标**：`IgesParserStage` + `BrepParserStage` 注册到流水线；前端上传组件扩展 accept 列表
|
||||
- **前提**：依赖 P4-2 Stage 流水线完成
|
||||
- **体量**：~1-2 天（流水线就绪后）
|
||||
|
||||
#### P4-10 大文件分析性能优化
|
||||
- **现状**：大模型（>1000 面）分析耗时线性增长，点云采样全量处理
|
||||
- **目标**：自适应采样（按曲率密度分配采样点）；LOD 分级（远距低模 + 近距高模）；分析结果增量更新（仅重算变更区域）
|
||||
- **体量**：~3-5 天
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"dev": "vite",
|
||||
"build": "vue-tsc -b && vite build",
|
||||
"preview": "vite preview",
|
||||
"gen:api": "openapi-typescript ../openapi-inventory.json -o src/types/api.ts"
|
||||
"gen:api": "openapi-typescript ../openapi.json -o src/types/api.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"air-datepicker": "^3.6.0",
|
||||
|
||||
@@ -1,48 +1,45 @@
|
||||
<script setup lang="ts">
|
||||
import { onMounted, onUnmounted } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { onMounted, onUnmounted, watch } from 'vue'
|
||||
import { useRouter, useRoute } from 'vue-router'
|
||||
import { useAppStore } from '@/stores/app'
|
||||
import { addNotification } from '@/shared/notification'
|
||||
import { useInventory } from '@/modules/inventory/composables/useInventory'
|
||||
import { useInventoryStore } from '@/stores/inventory'
|
||||
|
||||
import InventorySidebar from './components/InventorySidebar.vue'
|
||||
import DashboardTab from './components/DashboardTab.vue'
|
||||
import ProductsTab from './components/ProductsTab.vue'
|
||||
import MaterialsTab from './components/MaterialsTab.vue'
|
||||
import InventoryTab from './components/InventoryTab.vue'
|
||||
import PurchaseOrdersTab from './components/PurchaseOrdersTab.vue'
|
||||
import SalesOrdersTab from './components/SalesOrdersTab.vue'
|
||||
import SuppliersTab from './components/SuppliersTab.vue'
|
||||
import CustomersTab from './components/CustomersTab.vue'
|
||||
import FinanceTab from './components/FinanceTab.vue'
|
||||
import MovementsTab from './components/MovementsTab.vue'
|
||||
|
||||
const store = useAppStore()
|
||||
const store = useInventoryStore()
|
||||
const appStore = useAppStore()
|
||||
const router = useRouter()
|
||||
const {
|
||||
state,
|
||||
activeMenu,
|
||||
checkBackendHealth,
|
||||
loadDashboard,
|
||||
destroyPickers
|
||||
} = useInventory()
|
||||
const route = useRoute()
|
||||
|
||||
// Derive activeTab from route path (last segment)
|
||||
const tabFromRoute = () => {
|
||||
const segments = route.path.split('/')
|
||||
return segments[segments.length - 1] || 'dashboard'
|
||||
}
|
||||
|
||||
// Sync store.activeTab when route changes
|
||||
watch(() => route.path, () => {
|
||||
store.activeTab = tabFromRoute()
|
||||
}, { immediate: true })
|
||||
|
||||
onMounted(() => {
|
||||
if (!store.user) {
|
||||
if (!appStore.user) {
|
||||
router.push('/login')
|
||||
return
|
||||
}
|
||||
checkBackendHealth().then(() => {
|
||||
if (!state.backendDbReady) {
|
||||
addNotification(state.backendDbMessage || '业务服务不可用', 'warning')
|
||||
store.activeTab = tabFromRoute()
|
||||
store.checkBackendHealth().then(() => {
|
||||
if (!store.backendDbReady) {
|
||||
addNotification(store.backendDbMessage || '业务服务不可用', 'warning')
|
||||
return
|
||||
}
|
||||
loadDashboard()
|
||||
store.loadDashboard()
|
||||
})
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
destroyPickers()
|
||||
store.destroyPickers()
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -61,32 +58,23 @@ onUnmounted(() => {
|
||||
<section class="inventory-content">
|
||||
<div class="inventory-content-header">
|
||||
<div class="inventory-breadcrumb">
|
||||
<span>{{ activeMenu?.group?.title || '进销存' }}</span>
|
||||
<span>{{ store.activeMenu?.group?.title || '进销存' }}</span>
|
||||
<span class="sep">/</span>
|
||||
<span class="current">{{ activeMenu?.item?.label || '' }}</span>
|
||||
<span class="current">{{ store.activeMenu?.item?.label || '' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<t-alert
|
||||
v-if="!state.backendDbReady"
|
||||
:title="state.backendDbMessage"
|
||||
v-if="!store.backendDbReady"
|
||||
:title="store.backendDbMessage"
|
||||
theme="warning"
|
||||
show-icon
|
||||
:closable="false"
|
||||
style="margin-bottom: 16px;"
|
||||
/>
|
||||
|
||||
<t-loading :loading="state.loading">
|
||||
<DashboardTab v-if="state.activeTab === 'dashboard'" />
|
||||
<ProductsTab v-else-if="state.activeTab === 'products'" />
|
||||
<MaterialsTab v-else-if="state.activeTab === 'materials'" />
|
||||
<InventoryTab v-else-if="state.activeTab === 'inventory'" />
|
||||
<PurchaseOrdersTab v-else-if="state.activeTab === 'purchases'" />
|
||||
<SalesOrdersTab v-else-if="state.activeTab === 'sales_orders'" />
|
||||
<SuppliersTab v-else-if="state.activeTab === 'suppliers'" />
|
||||
<CustomersTab v-else-if="state.activeTab === 'customers'" />
|
||||
<FinanceTab v-else-if="state.activeTab === 'finance'" />
|
||||
<MovementsTab v-else-if="state.activeTab === 'movements'" />
|
||||
<t-loading :loading="store.loading">
|
||||
<router-view />
|
||||
</t-loading>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
<script setup lang="ts">
|
||||
import { useInventory } from '@/modules/inventory/composables/useInventory'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useInventoryStore } from '@/stores/inventory'
|
||||
|
||||
const { state, menuGroups, openGroups, toggleGroup, handleMenuClick } = useInventory()
|
||||
const router = useRouter()
|
||||
const store = useInventoryStore()
|
||||
const { menuGroups, openGroups, toggleGroup } = store
|
||||
|
||||
const navigateTo = (itemKey: string) => {
|
||||
store.activeTab = itemKey
|
||||
router.push(`/inventory/${itemKey}`)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -15,8 +23,8 @@ const { state, menuGroups, openGroups, toggleGroup, handleMenuClick } = useInven
|
||||
<div
|
||||
v-for="item in group.items"
|
||||
:key="item.key"
|
||||
:class="['sidebar-item', { active: state.activeTab === item.key }]"
|
||||
@click="handleMenuClick(item.key)"
|
||||
:class="['sidebar-item', { active: store.activeTab === item.key }]"
|
||||
@click="navigateTo(item.key)"
|
||||
>
|
||||
{{ item.label }}
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,9 @@ import { ref, computed, onMounted } from 'vue'
|
||||
import { DialogPlugin } from 'tdesign-vue-next'
|
||||
import { useInventory } from '../composables/useInventory'
|
||||
import { apiRequest } from '@/shared/api'
|
||||
import { inventoryApi } from '@/shared/api-client'
|
||||
import { addNotification, handleApiError } from '@/shared/notification'
|
||||
import type { Schema } from '@/types/schemas'
|
||||
|
||||
function confirmDialog(header: string, body: string, theme: string, confirmText: string, cancelText: string): Promise<boolean> {
|
||||
return new Promise((resolve) => {
|
||||
@@ -47,6 +49,46 @@ const receiveWarehouseId = ref<number | null>(null)
|
||||
const receiveRemark = ref('')
|
||||
const receiving = ref(false)
|
||||
|
||||
// ── 采购需求推导 ──
|
||||
const showDemandModal = ref(false)
|
||||
const demandLoading = ref(false)
|
||||
const salesOrdersForDemand = ref<Schema<'SalesOrderResponse'>[]>([])
|
||||
const selectedSalesOrderIds = ref<number[]>([])
|
||||
const demandResult = ref<Schema<'PurchaseDemandResponse'> | null>(null)
|
||||
|
||||
async function openDemandDialog() {
|
||||
showDemandModal.value = true
|
||||
demandResult.value = null
|
||||
selectedSalesOrderIds.value = []
|
||||
try {
|
||||
const data = await inventoryApi.listSalesOrders({ limit: 100 })
|
||||
salesOrdersForDemand.value = (data as any)?.items || data || []
|
||||
} catch (e) {
|
||||
handleApiError(e, '加载销售订单')
|
||||
}
|
||||
}
|
||||
|
||||
async function calculateDemands() {
|
||||
if (!selectedSalesOrderIds.value.length) {
|
||||
addNotification('请选择至少一个销售订单', 'warning')
|
||||
return
|
||||
}
|
||||
demandLoading.value = true
|
||||
try {
|
||||
demandResult.value = await inventoryApi.calculatePurchaseDemands(selectedSalesOrderIds.value)
|
||||
} catch (e) {
|
||||
handleApiError(e, '计算采购需求')
|
||||
} finally {
|
||||
demandLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function closeDemandModal() {
|
||||
showDemandModal.value = false
|
||||
demandResult.value = null
|
||||
selectedSalesOrderIds.value = []
|
||||
}
|
||||
|
||||
function openCreateOrder() {
|
||||
editingItem.value = null
|
||||
form.value = {
|
||||
@@ -299,6 +341,7 @@ onMounted(() => {
|
||||
</t-select>
|
||||
<t-button @click="loadPurchaseOrders">刷新</t-button>
|
||||
<t-button type="primary" @click="openCreateOrder">新增采购订单</t-button>
|
||||
<t-button theme="success" variant="outline" @click="openDemandDialog">采购建议</t-button>
|
||||
</div>
|
||||
|
||||
<t-table :data="state.purchaseOrders" :loading="state.loading" stripe>
|
||||
@@ -515,6 +558,87 @@ onMounted(() => {
|
||||
<t-button type="primary" :loading="receiving" :disabled="receiving" @click="receivePurchaseOrder">确认入库</t-button>
|
||||
</template>
|
||||
</t-dialog>
|
||||
<!-- 采购需求推导对话框 -->
|
||||
<t-dialog
|
||||
v-model:visible="showDemandModal"
|
||||
title="采购需求推导"
|
||||
width="1000px"
|
||||
@closed="closeDemandModal"
|
||||
>
|
||||
<div style="margin-bottom: 16px;">
|
||||
<p style="margin-bottom: 8px; color: var(--td-text-color-secondary);">
|
||||
选择销售订单，系统将自动按 BOM 展开物料需求、对比库存、推荐供应商。
|
||||
</p>
|
||||
<div style="display: flex; gap: 12px; align-items: center;">
|
||||
<t-select
|
||||
v-model="selectedSalesOrderIds"
|
||||
multiple
|
||||
placeholder="请选择销售订单"
|
||||
style="flex: 1;"
|
||||
:loading="salesOrdersForDemand.length === 0"
|
||||
>
|
||||
<t-option
|
||||
v-for="order in salesOrdersForDemand"
|
||||
:key="order.id"
|
||||
:label="`${order.order_no} - ${order.customer_name || ''}`"
|
||||
:value="order.id"
|
||||
/>
|
||||
</t-select>
|
||||
<t-button
|
||||
type="primary"
|
||||
:loading="demandLoading"
|
||||
:disabled="!selectedSalesOrderIds.length"
|
||||
@click="calculateDemands"
|
||||
>
|
||||
计算
|
||||
</t-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="demandResult">
|
||||
<div style="display: flex; gap: 24px; margin-bottom: 12px; font-weight: 600;">
|
||||
<span>来源订单：{{ demandResult.source_order_nos?.join(', ') || '-' }}</span>
|
||||
<span>缺货物料：<t-tag :type="demandResult.shortage_count > 0 ? 'danger' : 'success'" size="small">{{ demandResult.shortage_count }}</t-tag></span>
|
||||
<span>预计采购总额：{{ formatCurrency(Number(demandResult.total_estimated_cost || 0)) }}</span>
|
||||
</div>
|
||||
|
||||
<t-table :data="demandResult.items || []" stripe border size="small" max-height="400">
|
||||
<t-table-column prop="material_sku" label="物料SKU" width="120" />
|
||||
<t-table-column prop="material_name" label="物料名称" min-width="140" />
|
||||
<t-table-column label="需求量" width="90">
|
||||
<template #default="{ row }">{{ row.required_quantity }}</template>
|
||||
</t-table-column>
|
||||
<t-table-column label="库存量" width="90">
|
||||
<template #default="{ row }">{{ row.available_quantity }}</template>
|
||||
</t-table-column>
|
||||
<t-table-column label="缺口" width="90">
|
||||
<template #default="{ row }">
|
||||
<t-tag :type="row.shortage_quantity > 0 ? 'danger' : 'success'" size="small">
|
||||
{{ row.shortage_quantity }}
|
||||
</t-tag>
|
||||
</template>
|
||||
</t-table-column>
|
||||
<t-table-column label="单价" width="90">
|
||||
<template #default="{ row }">{{ formatCurrency(Number(row.unit_cost || 0)) }}</template>
|
||||
</t-table-column>
|
||||
<t-table-column label="预计金额" width="110">
|
||||
<template #default="{ row }">{{ formatCurrency(Number(row.estimated_cost || 0)) }}</template>
|
||||
</t-table-column>
|
||||
<t-table-column prop="suggested_supplier_name" label="建议供应商" min-width="120">
|
||||
<template #default="{ row }">{{ row.suggested_supplier_name || '-' }}</template>
|
||||
</t-table-column>
|
||||
<t-table-column label="交期(天)" width="80">
|
||||
<template #default="{ row }">{{ row.supplier_lead_time ?? '-' }}</template>
|
||||
</t-table-column>
|
||||
</t-table>
|
||||
|
||||
<t-empty v-if="(demandResult.items || []).length === 0" description="无物料需求（BOM 为空或订单无明细）" />
|
||||
</template>
|
||||
|
||||
<template #footer>
|
||||
<t-button @click="showDemandModal = false">关闭</t-button>
|
||||
</template>
|
||||
</t-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,518 +1,10 @@
|
||||
import { reactive, ref, computed } from 'vue'
|
||||
import { apiRequest } from '@/shared/api'
|
||||
import { addNotification, handleApiError } from '@/shared/notification'
|
||||
import { formatCurrency, formatNumber, formatDateTime, formatDate } from '@/shared/utils'
|
||||
import type { Schema } from '@/types/schemas'
|
||||
|
||||
declare const AirDatepicker: any
|
||||
|
||||
const state = reactive({
|
||||
activeTab: 'dashboard' as string,
|
||||
backendDbReady: true,
|
||||
backendDbMessage: '' as string,
|
||||
productCategory: 'finished' as string,
|
||||
dashboard: null as any, // 后端 /api/dashboard 无 response_model，暂未生成类型
|
||||
financeSummary: null as Schema<'FinanceSummaryResponse'> | null,
|
||||
financePeriod: {
|
||||
year: new Date().getFullYear(),
|
||||
quarter: '' as string
|
||||
},
|
||||
financeTransactions: [] as Schema<'FinanceTransactionResponse'>[],
|
||||
receivables: [] as Schema<'ReceivableItemResponse'>[],
|
||||
payables: [] as Schema<'PayableItemResponse'>[],
|
||||
customerFinanceStatement: [] as Schema<'PartnerStatementItemResponse'>[],
|
||||
supplierFinanceStatement: [] as Schema<'PartnerStatementItemResponse'>[],
|
||||
customerProductStatement: [] as Schema<'PartnerProductStatementItemResponse'>[],
|
||||
supplierProductStatement: [] as Schema<'PartnerProductStatementItemResponse'>[],
|
||||
products: [] as any[],
|
||||
materials: [] as any[],
|
||||
finishedProducts: [] as any[],
|
||||
purchaseOrders: [] as any[],
|
||||
purchaseWarehouseId: null as number | null,
|
||||
purchaseReceiveItems: [] as any[],
|
||||
productionOrders: [] as any[],
|
||||
productionPlan: null as any,
|
||||
productionWarehouseId: null as number | null,
|
||||
suppliers: [] as any[],
|
||||
customers: [] as any[],
|
||||
warehouses: [] as any[],
|
||||
inventory: [] as any[],
|
||||
movements: [] as any[],
|
||||
loading: false,
|
||||
showModal: false,
|
||||
modalType: '' as string,
|
||||
editingItem: null as any,
|
||||
productBomItems: [] as any[],
|
||||
materialConsumptionItems: [] as any[],
|
||||
showMaterialConsumptionModal: false,
|
||||
consumedMaterials: [] as any[],
|
||||
restockItems: [] as any[],
|
||||
showRestockModal: false,
|
||||
form: {} as any
|
||||
})
|
||||
|
||||
let deliveryPicker: any = null
|
||||
let expectedPicker: any = null
|
||||
|
||||
const deliveryDateInput = ref<HTMLElement | null>(null)
|
||||
const expectedDateInput = ref<HTMLElement | null>(null)
|
||||
const deliveryDateNativeInput = ref<HTMLElement | null>(null)
|
||||
const expectedDateNativeInput = ref<HTMLElement | null>(null)
|
||||
/**
|
||||
* Backward-compatible wrapper — delegates to Pinia store.
|
||||
* All existing components calling `useInventory()` keep working unchanged.
|
||||
* New code should import `useInventoryStore` directly from `@/stores/inventory`.
|
||||
*/
|
||||
import { useInventoryStore } from '@/stores/inventory'
|
||||
|
||||
export function useInventory() {
|
||||
const parseDateTimeLocal = (text: string | null | undefined): Date | null => {
|
||||
if (!text) return null
|
||||
const raw = String(text).trim()
|
||||
const normalized = raw.replace('T', ' ').slice(0, 16)
|
||||
const m = normalized.match(/^(\d{4})-(\d{2})-(\d{2})\s(\d{2}):(\d{2})$/)
|
||||
if (!m) return null
|
||||
const year = Number(m[1])
|
||||
const month = Number(m[2])
|
||||
const day = Number(m[3])
|
||||
const hour = Number(m[4])
|
||||
const minute = Number(m[5])
|
||||
if (!Number.isFinite(year + month + day + hour + minute)) return null
|
||||
return new Date(year, month - 1, day, hour, minute, 0)
|
||||
}
|
||||
|
||||
const toPickerValue = (value: any): string => {
|
||||
if (!value) return ''
|
||||
const raw = String(value).trim()
|
||||
if (/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}/.test(raw)) return raw.slice(0, 16)
|
||||
if (raw.includes('T')) return raw.replace('T', ' ').slice(0, 16)
|
||||
const dt = new Date(raw)
|
||||
if (!Number.isFinite(dt.getTime())) return ''
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
return `${dt.getFullYear()}-${pad(dt.getMonth() + 1)}-${pad(dt.getDate())} ${pad(dt.getHours())}:${pad(dt.getMinutes())}`
|
||||
}
|
||||
|
||||
const toApiDateTime = (value: any): string | null => {
|
||||
if (!value) return null
|
||||
const text = String(value).trim()
|
||||
if (text.includes('T')) return text.split('T')[0]
|
||||
if (text.includes(' ')) return text.split(' ')[0]
|
||||
if (text.length === 10) return text
|
||||
if (value instanceof Date) {
|
||||
const year = value.getFullYear()
|
||||
const month = String(value.getMonth() + 1).padStart(2, '0')
|
||||
const day = String(value.getDate()).padStart(2, '0')
|
||||
return `${year}-${month}-${day}`
|
||||
}
|
||||
return text
|
||||
}
|
||||
|
||||
const toNativeValue = (value: any): string => {
|
||||
if (!value) return ''
|
||||
const text = String(value).trim()
|
||||
if (text.length === 10 && !text.includes('T') && !text.includes(' ')) return text
|
||||
const isoText = text.replace(' ', 'T')
|
||||
return isoText.length >= 16 ? isoText.slice(0, 16) : isoText
|
||||
}
|
||||
|
||||
const fromNativeValue = (value: any): string => {
|
||||
if (!value) return ''
|
||||
const text = String(value).trim()
|
||||
if (text.length === 10 && !text.includes('T') && !text.includes(' ')) return text
|
||||
return text.replace('T', ' ').slice(0, 16)
|
||||
}
|
||||
|
||||
const destroyPickers = () => {
|
||||
if (deliveryPicker) {
|
||||
deliveryPicker.destroy()
|
||||
deliveryPicker = null
|
||||
}
|
||||
if (expectedPicker) {
|
||||
expectedPicker.destroy()
|
||||
expectedPicker = null
|
||||
}
|
||||
}
|
||||
|
||||
const initPickers = () => {
|
||||
destroyPickers()
|
||||
if (typeof AirDatepicker !== 'function') return
|
||||
|
||||
if (state.modalType === 'salesOrder' && deliveryDateInput.value) {
|
||||
deliveryPicker = new AirDatepicker(deliveryDateInput.value, {
|
||||
timepicker: false,
|
||||
autoClose: true,
|
||||
zIndex: 2005,
|
||||
dateFormat: 'yyyy-MM-dd',
|
||||
onSelect: ({ formattedDate }: any) => {
|
||||
state.form.delivery_date = formattedDate || ''
|
||||
state.form.delivery_date_native = toNativeValue(formattedDate || '')
|
||||
}
|
||||
})
|
||||
const initial = parseDateTimeLocal(state.form.delivery_date)
|
||||
if (initial) deliveryPicker.selectDate(initial, { silent: true })
|
||||
}
|
||||
|
||||
if (state.modalType === 'purchaseOrder' && expectedDateInput.value) {
|
||||
expectedPicker = new AirDatepicker(expectedDateInput.value, {
|
||||
timepicker: false,
|
||||
autoClose: true,
|
||||
zIndex: 2005,
|
||||
dateFormat: 'yyyy-MM-dd',
|
||||
onSelect: ({ formattedDate }: any) => {
|
||||
state.form.expected_date = formattedDate || ''
|
||||
state.form.expected_date_native = toNativeValue(formattedDate || '')
|
||||
}
|
||||
})
|
||||
const initial = parseDateTimeLocal(state.form.expected_date)
|
||||
if (initial) expectedPicker.selectDate(initial, { silent: true })
|
||||
}
|
||||
}
|
||||
|
||||
const openDateTimePicker = (pickerKind: string) => {
|
||||
if (pickerKind === 'delivery' && deliveryPicker) {
|
||||
deliveryPicker.show()
|
||||
return
|
||||
}
|
||||
if (pickerKind === 'expected' && expectedPicker) {
|
||||
expectedPicker.show()
|
||||
return
|
||||
}
|
||||
|
||||
const nativeInput = pickerKind === 'delivery' ? deliveryDateNativeInput.value : expectedDateNativeInput.value
|
||||
if (!nativeInput) return
|
||||
if (typeof (nativeInput as any).showPicker === 'function') {
|
||||
(nativeInput as any).showPicker()
|
||||
return
|
||||
}
|
||||
nativeInput.focus()
|
||||
nativeInput.click()
|
||||
}
|
||||
|
||||
const getMovementTypeLabel = (movementType: string): string => {
|
||||
const movementLabelMap: Record<string, string> = {
|
||||
in: '其他入库',
|
||||
out: '其他出库',
|
||||
adjust: '库存调整',
|
||||
purchase_in: '采购入库',
|
||||
return_from_production: '生产退料入库',
|
||||
outsource_return: '外协回库',
|
||||
finish_in: '完工入库',
|
||||
issue_to_production: '生产领料出库',
|
||||
outsource_send: '外协发料出库',
|
||||
shipment_out: '销售出库',
|
||||
scrap_out: '报废出库'
|
||||
}
|
||||
return movementLabelMap[movementType] || movementType
|
||||
}
|
||||
|
||||
const getMovementBadgeClass = (movementType: string): string => {
|
||||
if (['purchase_in', 'return_from_production', 'outsource_return', 'finish_in', 'in'].includes(movementType)) {
|
||||
return 'badge-success'
|
||||
}
|
||||
if (['issue_to_production', 'outsource_send', 'shipment_out', 'scrap_out', 'out'].includes(movementType)) {
|
||||
return 'badge-error'
|
||||
}
|
||||
return 'badge-warning'
|
||||
}
|
||||
|
||||
const getPurchaseOrderStatusLabel = (status: string): string => {
|
||||
const statusMap: Record<string, string> = {
|
||||
draft: '已下单',
|
||||
pending: '已下单',
|
||||
partial_received: '部分收货',
|
||||
received: '已收货',
|
||||
paid: '已付款',
|
||||
cancelled: '已作废'
|
||||
}
|
||||
return statusMap[status] || status
|
||||
}
|
||||
|
||||
const isPurchaseOrderLocked = (status: string): boolean => {
|
||||
return ['received', 'paid', 'cancelled'].includes(status)
|
||||
}
|
||||
|
||||
const getSalesOrderStatusLabel = (status: string): string => {
|
||||
const statusMap: Record<string, string> = {
|
||||
manufacturing: '制造中',
|
||||
delivered: '已交付',
|
||||
paid: '已收款',
|
||||
cancelled: '已作废'
|
||||
}
|
||||
return statusMap[status] || status
|
||||
}
|
||||
|
||||
const getDeliveryStatusLabel = (ds: string): string => {
|
||||
const map: Record<string, string> = { manufacturing: '制造中', delivered: '已交付', cancelled: '已作废' }
|
||||
return map[ds] || ds
|
||||
}
|
||||
|
||||
const getPaymentStatusLabel = (ps: string): string => {
|
||||
const map: Record<string, string> = { unpaid: '未收款', paid: '已收款' }
|
||||
return map[ps] || ps
|
||||
}
|
||||
|
||||
const getReceiptStatusLabel = (rs: string): string => {
|
||||
const map: Record<string, string> = { pending: '已下单', partial_received: '部分收货', received: '已收货', cancelled: '已作废' }
|
||||
return map[rs] || rs
|
||||
}
|
||||
|
||||
const checkBackendHealth = async () => {
|
||||
try {
|
||||
const resp = await fetch('/health', { method: 'GET' })
|
||||
if (!resp.ok) {
|
||||
state.backendDbReady = false
|
||||
state.backendDbMessage = '后端服务异常，暂无法加载业务数据'
|
||||
return
|
||||
}
|
||||
const health = await resp.json().catch(() => null)
|
||||
if (health && health.database_connected === false) {
|
||||
state.backendDbReady = false
|
||||
state.backendDbMessage = '数据库未连接，当前仅可浏览界面，业务数据暂不可用'
|
||||
return
|
||||
}
|
||||
state.backendDbReady = true
|
||||
state.backendDbMessage = ''
|
||||
} catch {
|
||||
state.backendDbReady = false
|
||||
state.backendDbMessage = '无法连接后端服务'
|
||||
}
|
||||
}
|
||||
|
||||
const loadDashboard = async () => {
|
||||
state.loading = true
|
||||
try { state.dashboard = await apiRequest('/api/dashboard') }
|
||||
catch (e) { handleApiError(e, '加载仪表盘') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadFinishedProducts = async () => {
|
||||
state.loading = true
|
||||
try { state.finishedProducts = await apiRequest('/api/products?item_type=finished&limit=100') }
|
||||
catch (e) { handleApiError(e, '加载成品') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadProducts = async () => { await loadFinishedProducts() }
|
||||
|
||||
const loadMaterials = async () => {
|
||||
state.loading = true
|
||||
try { state.materials = await apiRequest('/api/products?item_type=material&limit=100') }
|
||||
catch (e) { handleApiError(e, '加载物料') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadWarehouses = async () => {
|
||||
state.loading = true
|
||||
try { state.warehouses = await apiRequest('/api/warehouses') }
|
||||
catch (e) { handleApiError(e, '加载仓库') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const ensureStockBaseData = async () => {
|
||||
if (!state.materials.length) await loadMaterials()
|
||||
if (!state.warehouses.length) await loadWarehouses()
|
||||
if (!state.warehouses.length) {
|
||||
try {
|
||||
await apiRequest('/api/warehouses', { method: 'POST', body: JSON.stringify({ name: '默认仓库' }) })
|
||||
await loadWarehouses()
|
||||
addNotification('已自动创建默认仓库', 'success')
|
||||
} catch (e) { handleApiError(e, '自动创建默认仓库') }
|
||||
}
|
||||
}
|
||||
|
||||
const loadSuppliers = async () => {
|
||||
state.loading = true
|
||||
try { state.suppliers = await apiRequest('/api/suppliers') }
|
||||
catch (e) { handleApiError(e, '加载供应商') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadProductionOrders = async () => {
|
||||
state.loading = true
|
||||
try {
|
||||
const [orders, warehouses] = await Promise.all([
|
||||
apiRequest('/api/sales-orders?limit=100'),
|
||||
apiRequest('/api/warehouses')
|
||||
])
|
||||
state.productionOrders = orders?.items || []
|
||||
state.warehouses = warehouses || []
|
||||
if (!state.productionWarehouseId) {
|
||||
state.productionWarehouseId = state.warehouses.find((w: any) => w.is_default)?.id || state.warehouses[0]?.id || null
|
||||
}
|
||||
} catch (e) { handleApiError(e, '加载按单生产数据') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadPurchaseOrders = async () => {
|
||||
state.loading = true
|
||||
try {
|
||||
const [orders, warehouses] = await Promise.all([
|
||||
apiRequest('/api/purchase-orders?limit=100'),
|
||||
apiRequest('/api/warehouses')
|
||||
])
|
||||
state.purchaseOrders = orders?.items || []
|
||||
state.warehouses = warehouses || []
|
||||
if (!state.purchaseWarehouseId) {
|
||||
state.purchaseWarehouseId = state.warehouses.find((w: any) => w.is_default)?.id || state.warehouses[0]?.id || null
|
||||
}
|
||||
} catch (e) { handleApiError(e, '加载采购订单') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadCustomers = async () => {
|
||||
state.loading = true
|
||||
try { state.customers = await apiRequest('/api/customers') }
|
||||
catch (e) { handleApiError(e, '加载客户') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadInventory = async () => {
|
||||
state.loading = true
|
||||
try { state.inventory = (await apiRequest('/api/inventory'))?.items || [] }
|
||||
catch (e) { handleApiError(e, '加载库存') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadMovements = async () => {
|
||||
state.loading = true
|
||||
try { state.movements = (await apiRequest('/api/stock-movements'))?.items || [] }
|
||||
catch (e) { handleApiError(e, '加载变动记录') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const loadFinance = async () => {
|
||||
state.loading = true
|
||||
try {
|
||||
const selectedYear = Number(state.financePeriod.year) || new Date().getFullYear()
|
||||
const selectedQuarter = state.financePeriod.quarter ? Number(state.financePeriod.quarter) : null
|
||||
const periodQuery = selectedQuarter
|
||||
? `year=${selectedYear}&quarter=${selectedQuarter}`
|
||||
: `year=${selectedYear}`
|
||||
const [summary, transactions, receivables, payables, customerStatement, supplierStatement, customerProductStatement, supplierProductStatement] = await Promise.all([
|
||||
apiRequest(`/api/finance/summary?${periodQuery}`),
|
||||
apiRequest(`/api/finance/transactions?status=confirmed&limit=20&${periodQuery}`),
|
||||
apiRequest(`/api/finance/receivables?limit=20&${periodQuery}`),
|
||||
apiRequest(`/api/finance/payables?limit=20&${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-statement/customer?${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-statement/supplier?${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-product-statement/customer?${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-product-statement/supplier?${periodQuery}`)
|
||||
])
|
||||
state.financeSummary = summary
|
||||
state.financeTransactions = transactions?.items || []
|
||||
state.receivables = receivables
|
||||
state.payables = payables
|
||||
state.customerFinanceStatement = customerStatement.items || []
|
||||
state.supplierFinanceStatement = supplierStatement.items || []
|
||||
state.customerProductStatement = customerProductStatement.items || []
|
||||
state.supplierProductStatement = supplierProductStatement.items || []
|
||||
} catch (e) { handleApiError(e, '加载财务数据') }
|
||||
finally { state.loading = false }
|
||||
}
|
||||
|
||||
const refreshFinanceByPeriod = () => {
|
||||
if (state.activeTab === 'finance') loadFinance()
|
||||
}
|
||||
|
||||
const switchTab = (tab: string) => {
|
||||
state.activeTab = tab
|
||||
}
|
||||
|
||||
const closeModal = () => {
|
||||
state.showModal = false
|
||||
state.modalType = ''
|
||||
state.editingItem = null
|
||||
state.productBomItems = []
|
||||
state.purchaseReceiveItems = []
|
||||
state.form = {}
|
||||
destroyPickers()
|
||||
}
|
||||
|
||||
const modalTitle = computed(() => {
|
||||
const prefix = state.editingItem ? '编辑' : '新增'
|
||||
const typeMap: Record<string, string> = {
|
||||
product: state.form.item_type === 'finished' ? '成品' : '物料',
|
||||
inventoryItem: '物料库存',
|
||||
salesOrder: '销售订单',
|
||||
purchaseOrder: '采购订单',
|
||||
purchaseReceive: '采购到货入库',
|
||||
supplier: '供应商',
|
||||
customer: '客户'
|
||||
}
|
||||
return prefix + (typeMap[state.modalType] || '')
|
||||
})
|
||||
|
||||
const menuGroups = [
|
||||
{ key: 'overview', title: '概览', items: [{ key: 'dashboard', label: '仪表盘' }] },
|
||||
{ key: 'sales', title: '销售', items: [{ key: 'sales_orders', label: '销售订单管理' }] },
|
||||
{ key: 'purchase', title: '采购', items: [{ key: 'purchases', label: '采购订单管理' }] },
|
||||
{ key: 'product', title: '产品', items: [{ key: 'products', label: '成品管理' }, { key: 'materials', label: '物料管理' }] },
|
||||
{ key: 'partner', title: '往来单位', items: [{ key: 'customers', label: '客户管理' }, { key: 'suppliers', label: '供应商管理' }] },
|
||||
{ key: 'warehouse', title: '仓库', items: [{ key: 'inventory', label: '库存管理' }, { key: 'movements', label: '库存变动记录' }] },
|
||||
{ key: 'finance', title: '财务', items: [{ key: 'finance', label: '财务概览' }] }
|
||||
]
|
||||
|
||||
const openGroups = reactive<Record<string, boolean>>(
|
||||
Object.fromEntries(menuGroups.map(g => [g.key, true]))
|
||||
)
|
||||
|
||||
const toggleGroup = (groupKey: string) => { openGroups[groupKey] = !openGroups[groupKey] }
|
||||
|
||||
const activeMenu = computed(() => {
|
||||
for (const group of menuGroups) {
|
||||
const item = group.items.find(i => i.key === state.activeTab)
|
||||
if (item) return { group, item }
|
||||
}
|
||||
return null
|
||||
})
|
||||
|
||||
const handleMenuClick = (itemKey: string) => { switchTab(itemKey) }
|
||||
|
||||
const switchProductCategory = (category: string) => { state.productCategory = category }
|
||||
|
||||
return {
|
||||
state,
|
||||
deliveryDateInput,
|
||||
expectedDateInput,
|
||||
deliveryDateNativeInput,
|
||||
expectedDateNativeInput,
|
||||
menuGroups,
|
||||
openGroups,
|
||||
activeMenu,
|
||||
modalTitle,
|
||||
parseDateTimeLocal,
|
||||
toPickerValue,
|
||||
toApiDateTime,
|
||||
toNativeValue,
|
||||
fromNativeValue,
|
||||
destroyPickers,
|
||||
initPickers,
|
||||
openDateTimePicker,
|
||||
getMovementTypeLabel,
|
||||
getMovementBadgeClass,
|
||||
getPurchaseOrderStatusLabel,
|
||||
isPurchaseOrderLocked,
|
||||
getSalesOrderStatusLabel,
|
||||
getDeliveryStatusLabel,
|
||||
getPaymentStatusLabel,
|
||||
getReceiptStatusLabel,
|
||||
checkBackendHealth,
|
||||
loadDashboard,
|
||||
loadFinishedProducts,
|
||||
loadProducts,
|
||||
loadMaterials,
|
||||
loadWarehouses,
|
||||
ensureStockBaseData,
|
||||
loadSuppliers,
|
||||
loadProductionOrders,
|
||||
loadPurchaseOrders,
|
||||
loadCustomers,
|
||||
loadInventory,
|
||||
loadMovements,
|
||||
loadFinance,
|
||||
refreshFinanceByPeriod,
|
||||
switchTab,
|
||||
closeModal,
|
||||
toggleGroup,
|
||||
handleMenuClick,
|
||||
switchProductCategory,
|
||||
formatCurrency,
|
||||
formatNumber,
|
||||
formatDateTime,
|
||||
formatDate
|
||||
}
|
||||
return useInventoryStore()
|
||||
}
|
||||
|
||||
@@ -0,0 +1,372 @@
|
||||
<template>
|
||||
<div class="page-container">
|
||||
<div class="page-header">
|
||||
<t-button variant="text" @click="router.back()">
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 12H5M12 19l-7-7 7-7"/></svg>
|
||||
返回
|
||||
</t-button>
|
||||
<h1>批量分析</h1>
|
||||
<p>同时上传多个 STP 文件，并行分析、统一查看进度</p>
|
||||
</div>
|
||||
|
||||
<!-- 上传区 -->
|
||||
<div class="upload-layout" v-if="!state.batchId">
|
||||
<div class="upload-main-card">
|
||||
<h2 class="section-title">1. 选择多个 STP 文件</h2>
|
||||
<div
|
||||
:class="['upload-zone', { 'drag-over': state.dragOver }]"
|
||||
@dragover.prevent="state.dragOver = true"
|
||||
@dragleave.prevent="state.dragOver = false"
|
||||
@drop="handleDrop"
|
||||
@click="fileInput?.click()"
|
||||
>
|
||||
<input
|
||||
ref="fileInput"
|
||||
type="file"
|
||||
accept=".stp,.step"
|
||||
multiple
|
||||
@change="handleFileChange"
|
||||
hidden
|
||||
/>
|
||||
<div class="upload-icon">📁</div>
|
||||
<div class="upload-text">
|
||||
<span class="upload-title">点击选择或拖拽多个 STP/STEP 文件</span>
|
||||
<span class="upload-hint">支持批量上传，单次最多 20 个文件</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="state.selectedFiles.length" class="batch-file-list">
|
||||
<div class="batch-file-header">
|
||||
<span>已选择 {{ state.selectedFiles.length }} 个文件</span>
|
||||
<t-button variant="text" size="small" @click="state.selectedFiles = []">清空</t-button>
|
||||
</div>
|
||||
<div v-for="(file, idx) in state.selectedFiles" :key="idx" class="batch-file-item">
|
||||
<span class="file-name">{{ file.name }}</span>
|
||||
<span class="file-size">{{ formatFileSize(file.size) }}</span>
|
||||
<t-button variant="text" size="small" @click="removeFile(idx)">×</t-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="state.error" class="error-message">{{ state.error }}</div>
|
||||
</div>
|
||||
|
||||
<div class="upload-side-card">
|
||||
<h2 class="section-title">2. 注塑模参数</h2>
|
||||
<div class="material-panel compact-panel">
|
||||
<t-form-item label="产品材料">
|
||||
<t-select v-model="state.selectedMaterial">
|
||||
<t-option value="ABS" label="ABS (1.05 g/cm³)" />
|
||||
<t-option value="PP" label="PP (0.90 g/cm³)" />
|
||||
<t-option value="PE" label="PE (0.95 g/cm³)" />
|
||||
<t-option value="PC" label="PC (1.20 g/cm³)" />
|
||||
<t-option value="PA" label="PA (1.14 g/cm³)" />
|
||||
<t-option value="POM" label="POM (1.41 g/cm³)" />
|
||||
<t-option value="PMMA" label="PMMA (1.18 g/cm³)" />
|
||||
<t-option value="PBT" label="PBT (1.31 g/cm³)" />
|
||||
</t-select>
|
||||
</t-form-item>
|
||||
</div>
|
||||
|
||||
<t-button
|
||||
v-if="state.selectedFiles.length"
|
||||
theme="primary"
|
||||
class="upload-submit-btn"
|
||||
@click="batchUpload"
|
||||
:disabled="state.uploading"
|
||||
>
|
||||
{{ state.uploading ? '上传中...' : '3. 开始批量分析' }}
|
||||
</t-button>
|
||||
<div v-else class="inline-note">先选择 STP 文件，再填写材料并开始批量分析。</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 进度看板 -->
|
||||
<div v-else class="batch-dashboard">
|
||||
<div class="batch-progress-header">
|
||||
<div class="batch-progress-info">
|
||||
<h2>批量任务：{{ state.batchId.slice(0, 8) }}...</h2>
|
||||
<p>
|
||||
共 {{ state.batchData?.total }} 个任务，
|
||||
<t-tag type="success" variant="light">完成 {{ state.batchData?.completed }}</t-tag>
|
||||
<t-tag type="danger" variant="light" v-if="state.batchData?.failed">失败 {{ state.batchData?.failed }}</t-tag>
|
||||
<t-tag type="warning" variant="light" v-if="state.batchData?.processing">进行中 {{ state.batchData?.processing }}</t-tag>
|
||||
</p>
|
||||
</div>
|
||||
<t-button
|
||||
variant="outline"
|
||||
size="small"
|
||||
@click="state.batchId = ''; state.batchData = null"
|
||||
>
|
||||
新建批量
|
||||
</t-button>
|
||||
</div>
|
||||
|
||||
<!-- 整体进度条 -->
|
||||
<div class="progress-bar" style="margin-bottom: var(--space-4);">
|
||||
<div
|
||||
class="progress-fill"
|
||||
:style="{ width: (state.batchData?.progress_percent || 0) + '%' }"
|
||||
></div>
|
||||
</div>
|
||||
|
||||
<!-- 任务列表 -->
|
||||
<div class="table-container">
|
||||
<t-table :data="state.batchData?.tasks || []" row-key="task_id" stripe>
|
||||
<t-table-column title="文件名" colKey="filename" />
|
||||
<t-table-column title="状态">
|
||||
<template #default="{ row }">
|
||||
<t-tag
|
||||
:type="row.status === 'completed' ? 'success' : row.status === 'failed' ? 'danger' : 'warning'"
|
||||
variant="light"
|
||||
>
|
||||
{{ statusLabel(row.status) }}
|
||||
</t-tag>
|
||||
</template>
|
||||
</t-table-column>
|
||||
<t-table-column title="进度">
|
||||
<template #default="{ row }">
|
||||
<div v-if="row.status === 'processing'" class="progress-bar" style="width: 100px; display: inline-block;">
|
||||
<div class="progress-fill" :style="{ width: (row.progress || 0) + '%' }"></div>
|
||||
</div>
|
||||
<span v-else>{{ row.progress || 0 }}%</span>
|
||||
</template>
|
||||
</t-table-column>
|
||||
<t-table-column title="错误信息" colKey="error" />
|
||||
<t-table-column title="操作">
|
||||
<template #default="{ row }">
|
||||
<t-button
|
||||
v-if="row.status === 'completed'"
|
||||
theme="primary"
|
||||
size="small"
|
||||
@click="router.push(`/moldinsight/result/${row.task_id}`)"
|
||||
>
|
||||
查看结果
|
||||
</t-button>
|
||||
<span v-else-if="row.status === 'failed'" style="color: var(--danger-color);">
|
||||
{{ row.error || '分析失败' }}
|
||||
</span>
|
||||
<span v-else style="color: var(--text-secondary);">处理中...</span>
|
||||
</template>
|
||||
</t-table-column>
|
||||
</t-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { reactive, ref, onMounted, onUnmounted } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useAppStore } from '@/stores/app'
|
||||
import { apiRequest } from '@/shared/api'
|
||||
import { handleApiError, addNotification } from '@/shared/notification'
|
||||
import { clearAuth } from '@/shared/auth'
|
||||
import { formatFileSize } from '@/shared/utils'
|
||||
|
||||
interface BatchTask {
|
||||
task_id: string
|
||||
filename: string
|
||||
status: string
|
||||
progress?: number
|
||||
error?: string
|
||||
html_file?: string
|
||||
}
|
||||
|
||||
interface BatchData {
|
||||
batch_id: string
|
||||
total: number
|
||||
completed: number
|
||||
failed: number
|
||||
processing: number
|
||||
progress_percent: number
|
||||
tasks: BatchTask[]
|
||||
}
|
||||
|
||||
const router = useRouter()
|
||||
const appStore = useAppStore()
|
||||
const fileInput = ref<HTMLInputElement | null>(null)
|
||||
let pollTimer: ReturnType<typeof setTimeout> | null = null
|
||||
|
||||
const state = reactive({
|
||||
selectedFiles: [] as File[],
|
||||
selectedMaterial: 'ABS',
|
||||
dragOver: false,
|
||||
uploading: false,
|
||||
error: '',
|
||||
batchId: null as string | null,
|
||||
batchData: null as BatchData | null,
|
||||
})
|
||||
|
||||
const handleFileChange = (event: Event) => {
|
||||
const target = event.target as HTMLInputElement
|
||||
const files = Array.from(target.files || [])
|
||||
addFiles(files)
|
||||
}
|
||||
|
||||
const handleDrop = (event: DragEvent) => {
|
||||
event.preventDefault()
|
||||
state.dragOver = false
|
||||
const files = Array.from(event.dataTransfer?.files || [])
|
||||
addFiles(files)
|
||||
}
|
||||
|
||||
const addFiles = (files: File[]) => {
|
||||
const valid = files.filter(f => {
|
||||
const lower = f.name.toLowerCase()
|
||||
return lower.endsWith('.stp') || lower.endsWith('.step')
|
||||
})
|
||||
if (valid.length < files.length) {
|
||||
state.error = '部分文件格式不支持，已自动过滤非 STP/STEP 文件'
|
||||
}
|
||||
const combined = [...state.selectedFiles, ...valid]
|
||||
if (combined.length > 20) {
|
||||
state.error = '单次批量上传最多 20 个文件'
|
||||
state.selectedFiles = combined.slice(0, 20)
|
||||
} else {
|
||||
state.selectedFiles = combined
|
||||
}
|
||||
}
|
||||
|
||||
const removeFile = (idx: number) => {
|
||||
state.selectedFiles.splice(idx, 1)
|
||||
}
|
||||
|
||||
const statusLabel = (status: string) => {
|
||||
const map: Record<string, string> = {
|
||||
processing: '处理中',
|
||||
completed: '已完成',
|
||||
failed: '失败',
|
||||
unknown: '未知',
|
||||
rejected: '已拒绝',
|
||||
}
|
||||
return map[status] || status
|
||||
}
|
||||
|
||||
const batchUpload = async () => {
|
||||
if (!appStore.token) {
|
||||
state.error = '请先登录后再上传文件'
|
||||
router.push('/login')
|
||||
return
|
||||
}
|
||||
if (!state.selectedFiles.length) return
|
||||
|
||||
state.uploading = true
|
||||
state.error = ''
|
||||
|
||||
const formData = new FormData()
|
||||
for (const file of state.selectedFiles) {
|
||||
formData.append('files', file)
|
||||
}
|
||||
formData.append('material', state.selectedMaterial)
|
||||
formData.append('draft_angle', '2.0')
|
||||
formData.append('shrinkage_rate', '0.5')
|
||||
formData.append('parting_precision', '0.1')
|
||||
formData.append('cavity_match', '95')
|
||||
|
||||
try {
|
||||
const res = await fetch('/api/batch-upload', {
|
||||
method: 'POST',
|
||||
headers: { Authorization: `Bearer ${appStore.token}` },
|
||||
body: formData,
|
||||
})
|
||||
if (res.status === 401) {
|
||||
clearAuth()
|
||||
router.push('/login')
|
||||
return
|
||||
}
|
||||
if (!res.ok) throw new Error(`上传失败: ${res.status}`)
|
||||
const data = await res.json()
|
||||
state.batchId = data.batch_id
|
||||
addNotification(`已创建批量任务：${data.accepted} 个文件已接受`, 'success')
|
||||
startBatchPolling(data.batch_id)
|
||||
} catch (e) {
|
||||
state.error = handleApiError(e, '批量上传')
|
||||
} finally {
|
||||
state.uploading = false
|
||||
}
|
||||
}
|
||||
|
||||
const startBatchPolling = (batchId: string) => {
|
||||
const poll = async () => {
|
||||
try {
|
||||
const data = await apiRequest<BatchData>(`/api/batch/${batchId}`)
|
||||
state.batchData = data
|
||||
// 全部完成或全部失败则停止轮询
|
||||
if (data.processing === 0) {
|
||||
addNotification(
|
||||
`批量任务完成：${data.completed} 个成功，${data.failed} 个失败`,
|
||||
data.failed > 0 ? 'warning' : 'success'
|
||||
)
|
||||
return
|
||||
}
|
||||
pollTimer = setTimeout(poll, 3000)
|
||||
} catch (e) {
|
||||
handleApiError(e, '查询批量状态')
|
||||
}
|
||||
}
|
||||
poll()
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (!appStore.user) {
|
||||
router.push('/login')
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
if (pollTimer) clearTimeout(pollTimer)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.batch-file-list {
|
||||
margin-top: var(--space-3);
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: var(--radius-sm);
|
||||
padding: var(--space-2);
|
||||
}
|
||||
.batch-file-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: var(--space-2);
|
||||
font-weight: 600;
|
||||
}
|
||||
.batch-file-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
padding: var(--space-1) 0;
|
||||
border-bottom: 1px solid var(--border-light);
|
||||
}
|
||||
.batch-file-item .file-name {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.batch-file-item .file-size {
|
||||
color: var(--text-secondary);
|
||||
font-size: 0.85rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.batch-dashboard {
|
||||
margin-top: var(--space-4);
|
||||
}
|
||||
.batch-progress-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
margin-bottom: var(--space-2);
|
||||
}
|
||||
.batch-progress-info h2 {
|
||||
margin: 0 0 var(--space-1);
|
||||
}
|
||||
.batch-progress-info p {
|
||||
margin: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
</style>
|
||||
@@ -3,6 +3,9 @@
|
||||
<div class="page-header">
|
||||
<h1>注塑模 STP 分析</h1>
|
||||
<p>上传 STEP/STP 产品件，完成自动分模、工程建议与导出</p>
|
||||
<t-button variant="outline" size="small" @click="router.push('/moldinsight/batch')" style="margin-top: var(--space-2);">
|
||||
📦 批量分析
|
||||
</t-button>
|
||||
</div>
|
||||
|
||||
<div class="moldinsight-intro-grid">
|
||||
|
||||
@@ -123,6 +123,9 @@
|
||||
<t-button type="default" size="small" @click="createProductFromAnalysis" :loading="state.creatingProduct" title="将本次模具分析创建为进销存成品，可在进销存模块继续配置 BOM / 销售">
|
||||
📋 创建为成品
|
||||
</t-button>
|
||||
<t-button type="default" size="small" @click="estimateCost" :loading="state.costLoading" title="估算模具造价与单件成本">
|
||||
💰 成本估算
|
||||
</t-button>
|
||||
</div>
|
||||
|
||||
<div id="preview-3d" v-if="selectedHtmlFile" class="viewer-section viewer-section-hero">
|
||||
@@ -388,6 +391,97 @@
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<div id="cost-estimate" class="viewer-section">
|
||||
<div class="summary-header">
|
||||
<h3>成本估算</h3>
|
||||
<t-tag v-if="state.costResult" :type="state.costResult.source === 'ai' ? 'success' : 'warning'">
|
||||
{{ state.costResult.source === 'ai' ? 'AI 估算' : '规则估算' }}
|
||||
</t-tag>
|
||||
<t-tag v-else theme="primary">待生成</t-tag>
|
||||
</div>
|
||||
|
||||
<div class="result-card" style="margin-bottom: var(--space-3);">
|
||||
<t-button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="state.costLoading"
|
||||
@click="estimateCost()"
|
||||
title="基于当前方案估算模具造价与单件成本"
|
||||
>
|
||||
{{ state.costLoading ? '⏳ 估算中...' : '💰 生成成本估算' }}
|
||||
</t-button>
|
||||
</div>
|
||||
|
||||
<t-alert v-if="state.costError" theme="warning" title="成本估算失败" :message="state.costError" />
|
||||
|
||||
<template v-if="state.costResult">
|
||||
<div class="result-grid">
|
||||
<div class="result-card result-card-highlight">
|
||||
<h4>模具造价</h4>
|
||||
<div class="info-list">
|
||||
<div class="info-item">
|
||||
<span class="info-label">总造价</span>
|
||||
<span class="info-value" style="font-size: 1.2rem; font-weight: 700; color: var(--primary-color);">
|
||||
{{ state.costResult.total_mold_cost }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="info-label">材料费</span>
|
||||
<span class="info-value">{{ state.costResult.mold_cost.material }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="info-label">加工费</span>
|
||||
<span class="info-value">{{ state.costResult.mold_cost.machining }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="info-label">复杂度系数</span>
|
||||
<span class="info-value">{{ state.costResult.mold_cost.complexity_factor }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="result-card">
|
||||
<h4>单件成本</h4>
|
||||
<div class="info-list">
|
||||
<div class="info-item">
|
||||
<span class="info-label">单件费用</span>
|
||||
<span class="info-value" style="font-size: 1.1rem; font-weight: 600; color: var(--warning-color);">
|
||||
{{ state.costResult.cost_per_part }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="info-label">材料用量</span>
|
||||
<span class="info-value">{{ state.costResult.part_cost.material }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="info-label">成型周期</span>
|
||||
<span class="info-value">{{ state.costResult.part_cost.cycle_time }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="info-label">置信度</span>
|
||||
<span class="info-value">{{ Math.round((state.costResult.confidence || 0) * 100) }}%</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="state.costResult.assumptions?.length" class="result-card full-width" style="margin-top: var(--space-3);">
|
||||
<h4>估算假设</h4>
|
||||
<div class="recommendations-list">
|
||||
<div
|
||||
v-for="(assumption, idx) in state.costResult.assumptions"
|
||||
:key="'cost-assumption-' + idx"
|
||||
class="recommendation-item low"
|
||||
>
|
||||
<div class="recommendation-text">ℹ️ {{ assumption }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<t-alert v-else-if="!state.costError" theme="info" title="尚未生成" message="点击“生成成本估算”后，将基于当前方案估算模具造价与单件成本。" />
|
||||
</div>
|
||||
|
||||
<div id="llm-report" class="viewer-section" v-if="hasVisibleDesignReport">
|
||||
<div class="summary-header">
|
||||
<h3>LLM 设计报告</h3>
|
||||
@@ -564,6 +658,25 @@ interface CamOperation {
|
||||
estimated_time_min?: number
|
||||
}
|
||||
|
||||
interface CostEstimate {
|
||||
mold_cost: {
|
||||
material: string
|
||||
machining: string
|
||||
complexity_factor: string
|
||||
subtotal: string
|
||||
}
|
||||
part_cost: {
|
||||
material: string
|
||||
cycle_time: string
|
||||
cost_per_part: string
|
||||
}
|
||||
total_mold_cost: string
|
||||
cost_per_part: string
|
||||
confidence: number
|
||||
assumptions: string[]
|
||||
source?: string
|
||||
}
|
||||
|
||||
interface SideActionAiAdvice {
|
||||
source: string
|
||||
status: string
|
||||
@@ -607,7 +720,10 @@ const state = reactive({
|
||||
controller: 'fanuc',
|
||||
include_gcode: false
|
||||
},
|
||||
creatingProduct: false
|
||||
creatingProduct: false,
|
||||
costLoading: false,
|
||||
costError: '',
|
||||
costResult: null as CostEstimate | null,
|
||||
})
|
||||
|
||||
const camSteelOptions = [
|
||||
@@ -889,6 +1005,7 @@ const resultAnchorLinks = [
|
||||
{ id: 'preview-3d', label: '预览' },
|
||||
{ id: 'ai-side-action', label: 'AI倒扣分析' },
|
||||
{ id: 'export-cam', label: 'CAM/CNC' },
|
||||
{ id: 'cost-estimate', label: '成本估算' },
|
||||
{ id: 'llm-report', label: '设计报告' }
|
||||
]
|
||||
|
||||
@@ -1141,4 +1258,28 @@ const generateCamPlan = async () => {
|
||||
state.camLoading = false
|
||||
}
|
||||
}
|
||||
|
||||
const estimateCost = async () => {
|
||||
try {
|
||||
state.costLoading = true
|
||||
state.costError = ''
|
||||
const taskId = route.params.taskId as string
|
||||
const result = await apiRequest<any>('/api/cost-estimate', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ task_id: taskId })
|
||||
})
|
||||
state.costResult = result?.data || null
|
||||
addNotification(
|
||||
result?.data?.source === 'ai' ? 'AI 成本估算完成' : '规则成本估算完成',
|
||||
'success'
|
||||
)
|
||||
} catch (e: any) {
|
||||
state.costResult = null
|
||||
state.costError = e.message || '成本估算失败'
|
||||
addNotification(`成本估算失败: ${state.costError}`, 'error')
|
||||
} finally {
|
||||
state.costLoading = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -8,8 +8,25 @@ const router = createRouter({
|
||||
{ path: '/login', component: () => import('@/modules/login/LoginView.vue') },
|
||||
{ path: '/users', component: () => import('@/modules/users/UsersView.vue') },
|
||||
{ path: '/moldinsight', component: () => import('@/modules/moldinsight/MoldInsightView.vue') },
|
||||
{ path: '/moldinsight/batch', component: () => import('@/modules/moldinsight/BatchView.vue') },
|
||||
{ path: '/moldinsight/result/:taskId', component: () => import('@/modules/moldinsight/ResultView.vue') },
|
||||
{ path: '/inventory', component: () => import('@/modules/inventory/InventoryView.vue') },
|
||||
{
|
||||
path: '/inventory',
|
||||
component: () => import('@/modules/inventory/InventoryView.vue'),
|
||||
redirect: '/inventory/dashboard',
|
||||
children: [
|
||||
{ path: 'dashboard', component: () => import('@/modules/inventory/components/DashboardTab.vue') },
|
||||
{ path: 'products', component: () => import('@/modules/inventory/components/ProductsTab.vue') },
|
||||
{ path: 'materials', component: () => import('@/modules/inventory/components/MaterialsTab.vue') },
|
||||
{ path: 'inventory', component: () => import('@/modules/inventory/components/InventoryTab.vue') },
|
||||
{ path: 'purchases', component: () => import('@/modules/inventory/components/PurchaseOrdersTab.vue') },
|
||||
{ path: 'sales_orders', component: () => import('@/modules/inventory/components/SalesOrdersTab.vue') },
|
||||
{ path: 'suppliers', component: () => import('@/modules/inventory/components/SuppliersTab.vue') },
|
||||
{ path: 'customers', component: () => import('@/modules/inventory/components/CustomersTab.vue') },
|
||||
{ path: 'finance', component: () => import('@/modules/inventory/components/FinanceTab.vue') },
|
||||
{ path: 'movements', component: () => import('@/modules/inventory/components/MovementsTab.vue') },
|
||||
],
|
||||
},
|
||||
{ path: '/_design-system', component: () => import('@/design-system/DesignSystemView.vue') },
|
||||
{ path: '/_release', component: () => import('@/design-system/ReleaseView.vue') },
|
||||
],
|
||||
|
||||
@@ -0,0 +1,410 @@
|
||||
/**
|
||||
* Typed domain API client — wraps `apiRequest` with OpenAPI-generated types.
|
||||
*
|
||||
* Usage:
|
||||
* import { inventoryApi } from '@/shared/api-client'
|
||||
* const products = await inventoryApi.listProducts({ item_type: 'finished' })
|
||||
* // products is typed as Schema<'ProductResponse'>[]
|
||||
*/
|
||||
import { apiRequest } from './api'
|
||||
import type { Schema } from '@/types/schemas'
|
||||
|
||||
// ── Auth ───────────────────────────────────────────────────────
|
||||
export const authApi = {
|
||||
login(username: string, password: string) {
|
||||
const body = new URLSearchParams({ username, password })
|
||||
return apiRequest<Schema<'Token'>>('/api/auth/login', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: body.toString(),
|
||||
})
|
||||
},
|
||||
|
||||
loginJson(username: string, password: string) {
|
||||
return apiRequest<Schema<'Token'>>('/api/auth/login/json', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ username, password } satisfies Schema<'LoginRequest'>),
|
||||
})
|
||||
},
|
||||
|
||||
me() {
|
||||
return apiRequest<Schema<'UserResponse'>>('/api/auth/me')
|
||||
},
|
||||
|
||||
logout() {
|
||||
return apiRequest('/api/auth/logout', { method: 'POST' })
|
||||
},
|
||||
|
||||
// Users
|
||||
listUsers() {
|
||||
return apiRequest<Schema<'UserResponse'>[]>('/api/auth/users')
|
||||
},
|
||||
|
||||
createUser(data: Schema<'UserCreate'>) {
|
||||
return apiRequest<Schema<'UserResponse'>>('/api/auth/users', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updateUser(userId: number, data: Schema<'UserUpdate'>) {
|
||||
return apiRequest<Schema<'UserResponse'>>(`/api/auth/users/${userId}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
deleteUser(userId: number) {
|
||||
return apiRequest(`/api/auth/users/${userId}`, { method: 'DELETE' })
|
||||
},
|
||||
|
||||
resetPassword(userId: number, newPassword: string) {
|
||||
return apiRequest(`/api/auth/users/${userId}/reset-password`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify({ new_password: newPassword }),
|
||||
})
|
||||
},
|
||||
|
||||
// Roles
|
||||
listRoles() {
|
||||
return apiRequest<Schema<'RoleResponse'>[]>('/api/auth/roles')
|
||||
},
|
||||
|
||||
createRole(data: Schema<'RoleCreate'>) {
|
||||
return apiRequest<Schema<'RoleResponse'>>('/api/auth/roles', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updateRole(roleId: number, data: Schema<'RoleCreate'>) {
|
||||
return apiRequest<Schema<'RoleResponse'>>(`/api/auth/roles/${roleId}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
deleteRole(roleId: number) {
|
||||
return apiRequest(`/api/auth/roles/${roleId}`, { method: 'DELETE' })
|
||||
},
|
||||
|
||||
setRolePermissions(roleId: number, permissionIds: number[]) {
|
||||
return apiRequest(`/api/auth/roles/${roleId}/permissions`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify({ permission_ids: permissionIds }),
|
||||
})
|
||||
},
|
||||
|
||||
// Permissions
|
||||
listPermissions() {
|
||||
return apiRequest<Schema<'PermissionResponse'>[]>('/api/auth/permissions')
|
||||
},
|
||||
}
|
||||
|
||||
// ── Inventory / ERP ────────────────────────────────────────────
|
||||
export const inventoryApi = {
|
||||
// Dashboard
|
||||
dashboard() {
|
||||
return apiRequest('/api/dashboard')
|
||||
},
|
||||
|
||||
// Products
|
||||
listProducts(params?: { item_type?: string; limit?: number }) {
|
||||
const q = new URLSearchParams()
|
||||
if (params?.item_type) q.set('item_type', params.item_type)
|
||||
if (params?.limit) q.set('limit', String(params.limit))
|
||||
const qs = q.toString()
|
||||
return apiRequest<Schema<'ProductResponse'>[]>(`/api/products${qs ? `?${qs}` : ''}`)
|
||||
},
|
||||
|
||||
createProduct(data: Schema<'ProductCreate'>) {
|
||||
return apiRequest<Schema<'ProductResponse'>>('/api/products', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updateProduct(id: number, data: Partial<Schema<'ProductCreate'>>) {
|
||||
return apiRequest<Schema<'ProductResponse'>>(`/api/products/${id}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
deleteProduct(id: number) {
|
||||
return apiRequest(`/api/products/${id}`, { method: 'DELETE' })
|
||||
},
|
||||
|
||||
getProductMaterials(productId: number) {
|
||||
return apiRequest<{ items: Schema<'ProductMaterialItemResponse'>[] }>(`/api/products/${productId}/materials`)
|
||||
},
|
||||
|
||||
// from-task (mold analysis → product)
|
||||
createProductFromTask(taskId: string) {
|
||||
return apiRequest<Schema<'ProductResponse'>>(`/api/products/from-task/${taskId}`, {
|
||||
method: 'POST',
|
||||
})
|
||||
},
|
||||
|
||||
// Warehouses
|
||||
listWarehouses() {
|
||||
return apiRequest<Schema<'WarehouseResponse'>[]>('/api/warehouses')
|
||||
},
|
||||
|
||||
createWarehouse(data: Schema<'WarehouseCreate'>) {
|
||||
return apiRequest<Schema<'WarehouseResponse'>>('/api/warehouses', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
// Inventory
|
||||
listInventory() {
|
||||
return apiRequest<{ items: Schema<'InventoryResponse'>[] }>('/api/inventory')
|
||||
},
|
||||
|
||||
// Stock Movements
|
||||
listStockMovements(params?: { limit?: number }) {
|
||||
const q = params?.limit ? `?limit=${params.limit}` : ''
|
||||
return apiRequest<{ items: Schema<'StockMovementResponse'>[] }>(`/api/stock-movements${q}`)
|
||||
},
|
||||
|
||||
// Suppliers
|
||||
listSuppliers() {
|
||||
return apiRequest<Schema<'SupplierResponse'>[]>('/api/suppliers')
|
||||
},
|
||||
|
||||
createSupplier(data: Schema<'SupplierCreate'>) {
|
||||
return apiRequest<Schema<'SupplierResponse'>>('/api/suppliers', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updateSupplier(id: number, data: Partial<Schema<'SupplierCreate'>>) {
|
||||
return apiRequest<Schema<'SupplierResponse'>>(`/api/suppliers/${id}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
deleteSupplier(id: number) {
|
||||
return apiRequest(`/api/suppliers/${id}`, { method: 'DELETE' })
|
||||
},
|
||||
|
||||
// Customers
|
||||
listCustomers() {
|
||||
return apiRequest<Schema<'CustomerResponse'>[]>('/api/customers')
|
||||
},
|
||||
|
||||
createCustomer(data: Schema<'CustomerCreate'>) {
|
||||
return apiRequest<Schema<'CustomerResponse'>>('/api/customers', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updateCustomer(id: number, data: Partial<Schema<'CustomerCreate'>>) {
|
||||
return apiRequest<Schema<'CustomerResponse'>>(`/api/customers/${id}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
deleteCustomer(id: number) {
|
||||
return apiRequest(`/api/customers/${id}`, { method: 'DELETE' })
|
||||
},
|
||||
|
||||
// Purchase Orders
|
||||
listPurchaseOrders(params?: { limit?: number }) {
|
||||
const q = params?.limit ? `?limit=${params.limit}` : ''
|
||||
return apiRequest<{ items: Schema<'PurchaseOrderResponse'>[] }>(`/api/purchase-orders${q}`)
|
||||
},
|
||||
|
||||
createPurchaseOrder(data: Schema<'PurchaseOrderCreate'>) {
|
||||
return apiRequest<Schema<'PurchaseOrderResponse'>>('/api/purchase-orders', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updatePurchaseOrder(id: number, data: Partial<Schema<'PurchaseOrderCreate'>>) {
|
||||
return apiRequest<Schema<'PurchaseOrderResponse'>>(`/api/purchase-orders/${id}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
receivePurchaseOrder(id: number, data: Schema<'PurchaseOrderReceiveRequest'>) {
|
||||
return apiRequest<Schema<'PurchaseOrderResponse'>>(`/api/purchase-orders/${id}/receive`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updatePurchaseOrderStatus(id: number, status: string) {
|
||||
return apiRequest<Schema<'PurchaseOrderResponse'>>(`/api/purchase-orders/${id}/status`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify({ status }),
|
||||
})
|
||||
},
|
||||
|
||||
// Sales Orders
|
||||
listSalesOrders(params?: { limit?: number }) {
|
||||
const q = params?.limit ? `?limit=${params.limit}` : ''
|
||||
return apiRequest<{ items: Schema<'SalesOrderResponse'>[] }>(`/api/sales-orders${q}`)
|
||||
},
|
||||
|
||||
getSalesOrder(id: number) {
|
||||
return apiRequest<Schema<'SalesOrderDetailResponse'>>(`/api/sales-orders/${id}`)
|
||||
},
|
||||
|
||||
createSalesOrder(data: Schema<'SalesOrderCreate'>) {
|
||||
return apiRequest<Schema<'SalesOrderResponse'>>('/api/sales-orders', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
updateSalesOrder(id: number, data: Partial<Schema<'SalesOrderCreate'>>) {
|
||||
return apiRequest<Schema<'SalesOrderResponse'>>(`/api/sales-orders/${id}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
deleteSalesOrder(id: number) {
|
||||
return apiRequest(`/api/sales-orders/${id}`, { method: 'DELETE' })
|
||||
},
|
||||
|
||||
// Purchase Demands (采购需求推导)
|
||||
calculatePurchaseDemands(salesOrderIds: number[]) {
|
||||
return apiRequest<Schema<'PurchaseDemandResponse'>>('/api/purchase-demands/calculate', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ sales_order_ids: salesOrderIds } satisfies Schema<'PurchaseDemandCalculateRequest'>),
|
||||
})
|
||||
},
|
||||
|
||||
// Finance
|
||||
financeSummary(params?: { year?: number; quarter?: number }) {
|
||||
const q = new URLSearchParams()
|
||||
if (params?.year) q.set('year', String(params.year))
|
||||
if (params?.quarter) q.set('quarter', String(params.quarter))
|
||||
return apiRequest<Schema<'FinanceSummaryResponse'>>(`/api/finance/summary?${q}`)
|
||||
},
|
||||
|
||||
financeTransactions(params?: { status?: string; limit?: number; year?: number; quarter?: number }) {
|
||||
const q = new URLSearchParams()
|
||||
if (params?.status) q.set('status', params.status)
|
||||
if (params?.limit) q.set('limit', String(params.limit))
|
||||
if (params?.year) q.set('year', String(params.year))
|
||||
if (params?.quarter) q.set('quarter', String(params.quarter))
|
||||
return apiRequest<{ items: Schema<'FinanceTransactionResponse'>[] }>(`/api/finance/transactions?${q}`)
|
||||
},
|
||||
|
||||
financeReceivables(params?: { limit?: number; year?: number; quarter?: number }) {
|
||||
const q = new URLSearchParams()
|
||||
if (params?.limit) q.set('limit', String(params.limit))
|
||||
if (params?.year) q.set('year', String(params.year))
|
||||
if (params?.quarter) q.set('quarter', String(params.quarter))
|
||||
return apiRequest<Schema<'ReceivableItemResponse'>[]>(`/api/finance/receivables?${q}`)
|
||||
},
|
||||
|
||||
financePayables(params?: { limit?: number; year?: number; quarter?: number }) {
|
||||
const q = new URLSearchParams()
|
||||
if (params?.limit) q.set('limit', String(params.limit))
|
||||
if (params?.year) q.set('year', String(params.year))
|
||||
if (params?.quarter) q.set('quarter', String(params.quarter))
|
||||
return apiRequest<Schema<'PayableItemResponse'>[]>(`/api/finance/payables?${q}`)
|
||||
},
|
||||
|
||||
financePartnerStatement(partnerType: 'customer' | 'supplier', params?: { year?: number; quarter?: number }) {
|
||||
const q = new URLSearchParams()
|
||||
if (params?.year) q.set('year', String(params.year))
|
||||
if (params?.quarter) q.set('quarter', String(params.quarter))
|
||||
return apiRequest<Schema<'FinancePartnerStatementResponse'>>(`/api/finance/partner-statement/${partnerType}?${q}`)
|
||||
},
|
||||
|
||||
financePartnerProductStatement(partnerType: 'customer' | 'supplier', params?: { year?: number; quarter?: number }) {
|
||||
const q = new URLSearchParams()
|
||||
if (params?.year) q.set('year', String(params.year))
|
||||
if (params?.quarter) q.set('quarter', String(params.quarter))
|
||||
return apiRequest<Schema<'FinancePartnerProductStatementResponse'>>(`/api/finance/partner-product-statement/${partnerType}?${q}`)
|
||||
},
|
||||
}
|
||||
|
||||
// ── MoldInsight ────────────────────────────────────────────────
|
||||
export const moldinsightApi = {
|
||||
uploadStp(formData: FormData) {
|
||||
return apiRequest<{ task_id: string }>('/api/upload', {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
})
|
||||
},
|
||||
|
||||
getStatus(taskId: string) {
|
||||
return apiRequest<{
|
||||
task_id: string
|
||||
status: string
|
||||
progress: number
|
||||
result?: Record<string, unknown>
|
||||
error?: string
|
||||
}>(`/api/status/${taskId}`)
|
||||
},
|
||||
|
||||
batchUpload(formData: FormData) {
|
||||
return apiRequest<{
|
||||
batch_id: string
|
||||
accepted: number
|
||||
rejected: number
|
||||
task_ids: string[]
|
||||
}>('/api/batch-upload', {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
})
|
||||
},
|
||||
|
||||
getBatchStatus(batchId: string) {
|
||||
return apiRequest<{
|
||||
batch_id: string
|
||||
total: number
|
||||
completed: number
|
||||
failed: number
|
||||
processing: number
|
||||
progress_percent: number
|
||||
tasks: Array<{
|
||||
task_id: string
|
||||
filename: string
|
||||
status: string
|
||||
progress?: number
|
||||
error?: string
|
||||
html_file?: string
|
||||
}>
|
||||
}>(`/api/batch/${batchId}`)
|
||||
},
|
||||
|
||||
estimateCost(data: {
|
||||
task_id?: string
|
||||
material?: string
|
||||
mold_type?: string
|
||||
cavity_count?: number
|
||||
weight?: number
|
||||
dimensions?: { length: number; width: number; height: number }
|
||||
}) {
|
||||
return apiRequest<{
|
||||
mold_cost?: number
|
||||
part_cost?: number
|
||||
total_mold_cost?: number
|
||||
confidence?: number
|
||||
assumptions?: string[]
|
||||
currency?: string
|
||||
}>('/api/cost-estimate', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
},
|
||||
|
||||
getAluminumPrice() {
|
||||
return apiRequest<{ price: number; unit: string; updated_at: string }>('/api/aluminum-price/')
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,463 @@
|
||||
import { defineStore } from 'pinia'
|
||||
import { reactive, ref, computed } from 'vue'
|
||||
import { apiRequest } from '@/shared/api'
|
||||
import { addNotification, handleApiError } from '@/shared/notification'
|
||||
import { formatCurrency, formatNumber, formatDateTime, formatDate } from '@/shared/utils'
|
||||
import type { Schema } from '@/types/schemas'
|
||||
|
||||
declare const AirDatepicker: any
|
||||
|
||||
// Dashboard has no Pydantic schema in backend, define it here
|
||||
interface DashboardData {
|
||||
finished_product_count: number
|
||||
total_stock: number
|
||||
total_value: number
|
||||
supplier_count: number
|
||||
customer_count: number
|
||||
warehouse_count: number
|
||||
}
|
||||
|
||||
export const useInventoryStore = defineStore('inventory', () => {
|
||||
// ── state ──
|
||||
const activeTab = ref('dashboard')
|
||||
const backendDbReady = ref(true)
|
||||
const backendDbMessage = ref('')
|
||||
const productCategory = ref('finished')
|
||||
const dashboard = ref<DashboardData | null>(null)
|
||||
const financeSummary = ref<Schema<'FinanceSummaryResponse'> | null>(null)
|
||||
const financePeriod = reactive({ year: new Date().getFullYear(), quarter: '' as string })
|
||||
const financeTransactions = ref<Schema<'FinanceTransactionResponse'>[]>([])
|
||||
const receivables = ref<Schema<'ReceivableItemResponse'>[]>([])
|
||||
const payables = ref<Schema<'PayableItemResponse'>[]>([])
|
||||
const customerFinanceStatement = ref<Schema<'PartnerStatementItemResponse'>[]>([])
|
||||
const supplierFinanceStatement = ref<Schema<'PartnerStatementItemResponse'>[]>([])
|
||||
const customerProductStatement = ref<Schema<'PartnerProductStatementItemResponse'>[]>([])
|
||||
const supplierProductStatement = ref<Schema<'PartnerProductStatementItemResponse'>[]>([])
|
||||
const products = ref<Schema<'ProductResponse'>[]>([])
|
||||
const materials = ref<Schema<'ProductResponse'>[]>([])
|
||||
const finishedProducts = ref<Schema<'ProductResponse'>[]>([])
|
||||
const purchaseOrders = ref<Schema<'PurchaseOrderResponse'>[]>([])
|
||||
const purchaseWarehouseId = ref<number | null>(null)
|
||||
const purchaseReceiveItems = ref<any[]>([])
|
||||
const productionOrders = ref<Schema<'SalesOrderResponse'>[]>([])
|
||||
const productionPlan = ref<any>(null)
|
||||
const productionWarehouseId = ref<number | null>(null)
|
||||
const suppliers = ref<Schema<'SupplierResponse'>[]>([])
|
||||
const customers = ref<Schema<'CustomerResponse'>[]>([])
|
||||
const warehouses = ref<Schema<'WarehouseResponse'>[]>([])
|
||||
const inventory = ref<Schema<'InventoryResponse'>[]>([])
|
||||
const movements = ref<Schema<'StockMovementResponse'>[]>([])
|
||||
const loading = ref(false)
|
||||
const showModal = ref(false)
|
||||
const modalType = ref('')
|
||||
const editingItem = ref<any>(null)
|
||||
const productBomItems = ref<any[]>([])
|
||||
const materialConsumptionItems = ref<any[]>([])
|
||||
const showMaterialConsumptionModal = ref(false)
|
||||
const consumedMaterials = ref<any[]>([])
|
||||
const restockItems = ref<any[]>([])
|
||||
const showRestockModal = ref(false)
|
||||
const form = ref<any>({})
|
||||
|
||||
// ── date-picker refs ──
|
||||
let deliveryPicker: any = null
|
||||
let expectedPicker: any = null
|
||||
const deliveryDateInput = ref<HTMLElement | null>(null)
|
||||
const expectedDateInput = ref<HTMLElement | null>(null)
|
||||
const deliveryDateNativeInput = ref<HTMLElement | null>(null)
|
||||
const expectedDateNativeInput = ref<HTMLElement | null>(null)
|
||||
|
||||
// ── legacy state object (backward-compat for components still using `state.xxx`) ──
|
||||
const state = reactive({
|
||||
get activeTab() { return activeTab.value }, set activeTab(v) { activeTab.value = v },
|
||||
get backendDbReady() { return backendDbReady.value }, set backendDbReady(v) { backendDbReady.value = v },
|
||||
get backendDbMessage() { return backendDbMessage.value }, set backendDbMessage(v) { backendDbMessage.value = v },
|
||||
get productCategory() { return productCategory.value }, set productCategory(v) { productCategory.value = v },
|
||||
get dashboard() { return dashboard.value }, set dashboard(v) { dashboard.value = v },
|
||||
get financeSummary() { return financeSummary.value }, set financeSummary(v) { financeSummary.value = v },
|
||||
financePeriod,
|
||||
get financeTransactions() { return financeTransactions.value }, set financeTransactions(v) { financeTransactions.value = v },
|
||||
get receivables() { return receivables.value }, set receivables(v) { receivables.value = v },
|
||||
get payables() { return payables.value }, set payables(v) { payables.value = v },
|
||||
get customerFinanceStatement() { return customerFinanceStatement.value }, set customerFinanceStatement(v) { customerFinanceStatement.value = v },
|
||||
get supplierFinanceStatement() { return supplierFinanceStatement.value }, set supplierFinanceStatement(v) { supplierFinanceStatement.value = v },
|
||||
get customerProductStatement() { return customerProductStatement.value }, set customerProductStatement(v) { customerProductStatement.value = v },
|
||||
get supplierProductStatement() { return supplierProductStatement.value }, set supplierProductStatement(v) { supplierProductStatement.value = v },
|
||||
get products() { return products.value }, set products(v) { products.value = v },
|
||||
get materials() { return materials.value }, set materials(v) { materials.value = v },
|
||||
get finishedProducts() { return finishedProducts.value }, set finishedProducts(v) { finishedProducts.value = v },
|
||||
get purchaseOrders() { return purchaseOrders.value }, set purchaseOrders(v) { purchaseOrders.value = v },
|
||||
get purchaseWarehouseId() { return purchaseWarehouseId.value }, set purchaseWarehouseId(v) { purchaseWarehouseId.value = v },
|
||||
get purchaseReceiveItems() { return purchaseReceiveItems.value }, set purchaseReceiveItems(v) { purchaseReceiveItems.value = v },
|
||||
get productionOrders() { return productionOrders.value }, set productionOrders(v) { productionOrders.value = v },
|
||||
get productionPlan() { return productionPlan.value }, set productionPlan(v) { productionPlan.value = v },
|
||||
get productionWarehouseId() { return productionWarehouseId.value }, set productionWarehouseId(v) { productionWarehouseId.value = v },
|
||||
get suppliers() { return suppliers.value }, set suppliers(v) { suppliers.value = v },
|
||||
get customers() { return customers.value }, set customers(v) { customers.value = v },
|
||||
get warehouses() { return warehouses.value }, set warehouses(v) { warehouses.value = v },
|
||||
get inventory() { return inventory.value }, set inventory(v) { inventory.value = v },
|
||||
get movements() { return movements.value }, set movements(v) { movements.value = v },
|
||||
get loading() { return loading.value }, set loading(v) { loading.value = v },
|
||||
get showModal() { return showModal.value }, set showModal(v) { showModal.value = v },
|
||||
get modalType() { return modalType.value }, set modalType(v) { modalType.value = v },
|
||||
get editingItem() { return editingItem.value }, set editingItem(v) { editingItem.value = v },
|
||||
get productBomItems() { return productBomItems.value }, set productBomItems(v) { productBomItems.value = v },
|
||||
get materialConsumptionItems() { return materialConsumptionItems.value }, set materialConsumptionItems(v) { materialConsumptionItems.value = v },
|
||||
get showMaterialConsumptionModal() { return showMaterialConsumptionModal.value }, set showMaterialConsumptionModal(v) { showMaterialConsumptionModal.value = v },
|
||||
get consumedMaterials() { return consumedMaterials.value }, set consumedMaterials(v) { consumedMaterials.value = v },
|
||||
get restockItems() { return restockItems.value }, set restockItems(v) { restockItems.value = v },
|
||||
get showRestockModal() { return showRestockModal.value }, set showRestockModal(v) { showRestockModal.value = v },
|
||||
get form() { return form.value }, set form(v) { form.value = v },
|
||||
})
|
||||
|
||||
// ── helpers ──
|
||||
const parseDateTimeLocal = (text: string | null | undefined): Date | null => {
|
||||
if (!text) return null
|
||||
const raw = String(text).trim()
|
||||
const normalized = raw.replace('T', ' ').slice(0, 16)
|
||||
const m = normalized.match(/^(\d{4})-(\d{2})-(\d{2})\s(\d{2}):(\d{2})$/)
|
||||
if (!m) return null
|
||||
const year = Number(m[1]); const month = Number(m[2]); const day = Number(m[3])
|
||||
const hour = Number(m[4]); const minute = Number(m[5])
|
||||
if (!Number.isFinite(year + month + day + hour + minute)) return null
|
||||
return new Date(year, month - 1, day, hour, minute, 0)
|
||||
}
|
||||
|
||||
const toPickerValue = (value: any): string => {
|
||||
if (!value) return ''
|
||||
const raw = String(value).trim()
|
||||
if (/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}/.test(raw)) return raw.slice(0, 16)
|
||||
if (raw.includes('T')) return raw.replace('T', ' ').slice(0, 16)
|
||||
const dt = new Date(raw)
|
||||
if (!Number.isFinite(dt.getTime())) return ''
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
return `${dt.getFullYear()}-${pad(dt.getMonth() + 1)}-${pad(dt.getDate())} ${pad(dt.getHours())}:${pad(dt.getMinutes())}`
|
||||
}
|
||||
|
||||
const toApiDateTime = (value: any): string | null => {
|
||||
if (!value) return null
|
||||
const text = String(value).trim()
|
||||
if (text.includes('T')) return text.split('T')[0]
|
||||
if (text.includes(' ')) return text.split(' ')[0]
|
||||
if (text.length === 10) return text
|
||||
if (value instanceof Date) {
|
||||
const year = value.getFullYear()
|
||||
const month = String(value.getMonth() + 1).padStart(2, '0')
|
||||
const day = String(value.getDate()).padStart(2, '0')
|
||||
return `${year}-${month}-${day}`
|
||||
}
|
||||
return text
|
||||
}
|
||||
|
||||
const toNativeValue = (value: any): string => {
|
||||
if (!value) return ''
|
||||
const text = String(value).trim()
|
||||
if (text.length === 10 && !text.includes('T') && !text.includes(' ')) return text
|
||||
const isoText = text.replace(' ', 'T')
|
||||
return isoText.length >= 16 ? isoText.slice(0, 16) : isoText
|
||||
}
|
||||
|
||||
const fromNativeValue = (value: any): string => {
|
||||
if (!value) return ''
|
||||
const text = String(value).trim()
|
||||
if (text.length === 10 && !text.includes('T') && !text.includes(' ')) return text
|
||||
return text.replace('T', ' ').slice(0, 16)
|
||||
}
|
||||
|
||||
// ── pickers ──
|
||||
const destroyPickers = () => {
|
||||
if (deliveryPicker) { deliveryPicker.destroy(); deliveryPicker = null }
|
||||
if (expectedPicker) { expectedPicker.destroy(); expectedPicker = null }
|
||||
}
|
||||
|
||||
const initPickers = () => {
|
||||
destroyPickers()
|
||||
if (typeof AirDatepicker !== 'function') return
|
||||
if (modalType.value === 'salesOrder' && deliveryDateInput.value) {
|
||||
deliveryPicker = new AirDatepicker(deliveryDateInput.value, {
|
||||
timepicker: false, autoClose: true, zIndex: 2005, dateFormat: 'yyyy-MM-dd',
|
||||
onSelect: ({ formattedDate }: any) => {
|
||||
form.value.delivery_date = formattedDate || ''
|
||||
form.value.delivery_date_native = toNativeValue(formattedDate || '')
|
||||
}
|
||||
})
|
||||
const initial = parseDateTimeLocal(form.value.delivery_date)
|
||||
if (initial) deliveryPicker.selectDate(initial, { silent: true })
|
||||
}
|
||||
if (modalType.value === 'purchaseOrder' && expectedDateInput.value) {
|
||||
expectedPicker = new AirDatepicker(expectedDateInput.value, {
|
||||
timepicker: false, autoClose: true, zIndex: 2005, dateFormat: 'yyyy-MM-dd',
|
||||
onSelect: ({ formattedDate }: any) => {
|
||||
form.value.expected_date = formattedDate || ''
|
||||
form.value.expected_date_native = toNativeValue(formattedDate || '')
|
||||
}
|
||||
})
|
||||
const initial = parseDateTimeLocal(form.value.expected_date)
|
||||
if (initial) expectedPicker.selectDate(initial, { silent: true })
|
||||
}
|
||||
}
|
||||
|
||||
const openDateTimePicker = (pickerKind: string) => {
|
||||
if (pickerKind === 'delivery' && deliveryPicker) { deliveryPicker.show(); return }
|
||||
if (pickerKind === 'expected' && expectedPicker) { expectedPicker.show(); return }
|
||||
const nativeInput = pickerKind === 'delivery' ? deliveryDateNativeInput.value : expectedDateNativeInput.value
|
||||
if (!nativeInput) return
|
||||
if (typeof (nativeInput as any).showPicker === 'function') { (nativeInput as any).showPicker(); return }
|
||||
nativeInput.focus(); nativeInput.click()
|
||||
}
|
||||
|
||||
// ── label helpers ──
|
||||
const getMovementTypeLabel = (movementType: string): string => {
|
||||
const map: Record<string, string> = {
|
||||
in: '其他入库', out: '其他出库', adjust: '库存调整',
|
||||
purchase_in: '采购入库', return_from_production: '生产退料入库',
|
||||
outsource_return: '外协回库', finish_in: '完工入库',
|
||||
issue_to_production: '生产领料出库', outsource_send: '外协发料出库',
|
||||
shipment_out: '销售出库', scrap_out: '报废出库'
|
||||
}
|
||||
return map[movementType] || movementType
|
||||
}
|
||||
|
||||
const getMovementBadgeClass = (movementType: string): string => {
|
||||
if (['purchase_in', 'return_from_production', 'outsource_return', 'finish_in', 'in'].includes(movementType)) return 'badge-success'
|
||||
if (['issue_to_production', 'outsource_send', 'shipment_out', 'scrap_out', 'out'].includes(movementType)) return 'badge-error'
|
||||
return 'badge-warning'
|
||||
}
|
||||
|
||||
const getPurchaseOrderStatusLabel = (status: string): string => {
|
||||
const map: Record<string, string> = { draft: '已下单', pending: '已下单', partial_received: '部分收货', received: '已收货', paid: '已付款', cancelled: '已作废' }
|
||||
return map[status] || status
|
||||
}
|
||||
|
||||
const isPurchaseOrderLocked = (status: string): boolean => ['received', 'paid', 'cancelled'].includes(status)
|
||||
|
||||
const getSalesOrderStatusLabel = (status: string): string => {
|
||||
const map: Record<string, string> = { manufacturing: '制造中', delivered: '已交付', paid: '已收款', cancelled: '已作废' }
|
||||
return map[status] || status
|
||||
}
|
||||
|
||||
const getDeliveryStatusLabel = (ds: string): string => {
|
||||
const map: Record<string, string> = { manufacturing: '制造中', delivered: '已交付', cancelled: '已作废' }
|
||||
return map[ds] || ds
|
||||
}
|
||||
|
||||
const getPaymentStatusLabel = (ps: string): string => {
|
||||
const map: Record<string, string> = { unpaid: '未收款', paid: '已收款' }
|
||||
return map[ps] || ps
|
||||
}
|
||||
|
||||
const getReceiptStatusLabel = (rs: string): string => {
|
||||
const map: Record<string, string> = { pending: '已下单', partial_received: '部分收货', received: '已收货', cancelled: '已作废' }
|
||||
return map[rs] || rs
|
||||
}
|
||||
|
||||
// ── data loading ──
|
||||
const checkBackendHealth = async () => {
|
||||
try {
|
||||
const resp = await fetch('/health', { method: 'GET' })
|
||||
if (!resp.ok) { backendDbReady.value = false; backendDbMessage.value = '后端服务异常，暂无法加载业务数据'; return }
|
||||
const health = await resp.json().catch(() => null)
|
||||
if (health && health.database_connected === false) { backendDbReady.value = false; backendDbMessage.value = '数据库未连接，当前仅可浏览界面，业务数据暂不可用'; return }
|
||||
backendDbReady.value = true; backendDbMessage.value = ''
|
||||
} catch { backendDbReady.value = false; backendDbMessage.value = '无法连接后端服务' }
|
||||
}
|
||||
|
||||
const loadDashboard = async () => {
|
||||
loading.value = true
|
||||
try { dashboard.value = await apiRequest('/api/dashboard') }
|
||||
catch (e) { handleApiError(e, '加载仪表盘') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadFinishedProducts = async () => {
|
||||
loading.value = true
|
||||
try { finishedProducts.value = await apiRequest('/api/products?item_type=finished&limit=100') }
|
||||
catch (e) { handleApiError(e, '加载成品') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadProducts = async () => { await loadFinishedProducts() }
|
||||
|
||||
const loadMaterials = async () => {
|
||||
loading.value = true
|
||||
try { materials.value = await apiRequest('/api/products?item_type=material&limit=100') }
|
||||
catch (e) { handleApiError(e, '加载物料') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadWarehouses = async () => {
|
||||
loading.value = true
|
||||
try { warehouses.value = await apiRequest('/api/warehouses') }
|
||||
catch (e) { handleApiError(e, '加载仓库') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const ensureStockBaseData = async () => {
|
||||
if (!materials.value.length) await loadMaterials()
|
||||
if (!warehouses.value.length) await loadWarehouses()
|
||||
if (!warehouses.value.length) {
|
||||
try {
|
||||
await apiRequest('/api/warehouses', { method: 'POST', body: JSON.stringify({ name: '默认仓库' }) })
|
||||
await loadWarehouses()
|
||||
addNotification('已自动创建默认仓库', 'success')
|
||||
} catch (e) { handleApiError(e, '自动创建默认仓库') }
|
||||
}
|
||||
}
|
||||
|
||||
const loadSuppliers = async () => {
|
||||
loading.value = true
|
||||
try { suppliers.value = await apiRequest('/api/suppliers') }
|
||||
catch (e) { handleApiError(e, '加载供应商') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadProductionOrders = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const [orders, wh] = await Promise.all([apiRequest('/api/sales-orders?limit=100'), apiRequest('/api/warehouses')])
|
||||
productionOrders.value = orders?.items || []
|
||||
warehouses.value = wh || []
|
||||
if (!productionWarehouseId.value) {
|
||||
productionWarehouseId.value = warehouses.value.find((w: any) => w.is_default)?.id || warehouses.value[0]?.id || null
|
||||
}
|
||||
} catch (e) { handleApiError(e, '加载按单生产数据') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadPurchaseOrders = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const [orders, wh] = await Promise.all([apiRequest('/api/purchase-orders?limit=100'), apiRequest('/api/warehouses')])
|
||||
purchaseOrders.value = orders?.items || []
|
||||
warehouses.value = wh || []
|
||||
if (!purchaseWarehouseId.value) {
|
||||
purchaseWarehouseId.value = warehouses.value.find((w: any) => w.is_default)?.id || warehouses.value[0]?.id || null
|
||||
}
|
||||
} catch (e) { handleApiError(e, '加载采购订单') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadCustomers = async () => {
|
||||
loading.value = true
|
||||
try { customers.value = await apiRequest('/api/customers') }
|
||||
catch (e) { handleApiError(e, '加载客户') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadInventory = async () => {
|
||||
loading.value = true
|
||||
try { inventory.value = (await apiRequest('/api/inventory'))?.items || [] }
|
||||
catch (e) { handleApiError(e, '加载库存') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadMovements = async () => {
|
||||
loading.value = true
|
||||
try { movements.value = (await apiRequest('/api/stock-movements'))?.items || [] }
|
||||
catch (e) { handleApiError(e, '加载变动记录') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const loadFinance = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const selectedYear = Number(financePeriod.year) || new Date().getFullYear()
|
||||
const selectedQuarter = financePeriod.quarter ? Number(financePeriod.quarter) : null
|
||||
const periodQuery = selectedQuarter ? `year=${selectedYear}&quarter=${selectedQuarter}` : `year=${selectedYear}`
|
||||
const [summary, transactions, recv, pay, custStmt, suppStmt, custProdStmt, suppProdStmt] = await Promise.all([
|
||||
apiRequest(`/api/finance/summary?${periodQuery}`),
|
||||
apiRequest(`/api/finance/transactions?status=confirmed&limit=20&${periodQuery}`),
|
||||
apiRequest(`/api/finance/receivables?limit=20&${periodQuery}`),
|
||||
apiRequest(`/api/finance/payables?limit=20&${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-statement/customer?${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-statement/supplier?${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-product-statement/customer?${periodQuery}`),
|
||||
apiRequest(`/api/finance/partner-product-statement/supplier?${periodQuery}`)
|
||||
])
|
||||
financeSummary.value = summary
|
||||
financeTransactions.value = transactions?.items || []
|
||||
receivables.value = recv
|
||||
payables.value = pay
|
||||
customerFinanceStatement.value = custStmt.items || []
|
||||
supplierFinanceStatement.value = suppStmt.items || []
|
||||
customerProductStatement.value = custProdStmt.items || []
|
||||
supplierProductStatement.value = suppProdStmt.items || []
|
||||
} catch (e) { handleApiError(e, '加载财务数据') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
|
||||
const refreshFinanceByPeriod = () => { if (activeTab.value === 'finance') loadFinance() }
|
||||
|
||||
const switchTab = (tab: string) => { activeTab.value = tab }
|
||||
|
||||
const closeModal = () => {
|
||||
showModal.value = false; modalType.value = ''; editingItem.value = null
|
||||
productBomItems.value = []; purchaseReceiveItems.value = []; form.value = {}
|
||||
destroyPickers()
|
||||
}
|
||||
|
||||
const modalTitle = computed(() => {
|
||||
const prefix = editingItem.value ? '编辑' : '新增'
|
||||
const typeMap: Record<string, string> = {
|
||||
product: form.value.item_type === 'finished' ? '成品' : '物料',
|
||||
inventoryItem: '物料库存', salesOrder: '销售订单', purchaseOrder: '采购订单',
|
||||
purchaseReceive: '采购到货入库', supplier: '供应商', customer: '客户'
|
||||
}
|
||||
return prefix + (typeMap[modalType.value] || '')
|
||||
})
|
||||
|
||||
const menuGroups = [
|
||||
{ key: 'overview', title: '概览', items: [{ key: 'dashboard', label: '仪表盘' }] },
|
||||
{ key: 'sales', title: '销售', items: [{ key: 'sales_orders', label: '销售订单管理' }] },
|
||||
{ key: 'purchase', title: '采购', items: [{ key: 'purchases', label: '采购订单管理' }] },
|
||||
{ key: 'product', title: '产品', items: [{ key: 'products', label: '成品管理' }, { key: 'materials', label: '物料管理' }] },
|
||||
{ key: 'partner', title: '往来单位', items: [{ key: 'customers', label: '客户管理' }, { key: 'suppliers', label: '供应商管理' }] },
|
||||
{ key: 'warehouse', title: '仓库', items: [{ key: 'inventory', label: '库存管理' }, { key: 'movements', label: '库存变动记录' }] },
|
||||
{ key: 'finance', title: '财务', items: [{ key: 'finance', label: '财务概览' }] }
|
||||
]
|
||||
|
||||
const openGroups = reactive<Record<string, boolean>>(
|
||||
Object.fromEntries(menuGroups.map(g => [g.key, true]))
|
||||
)
|
||||
|
||||
const toggleGroup = (groupKey: string) => { openGroups[groupKey] = !openGroups[groupKey] }
|
||||
|
||||
const activeMenu = computed(() => {
|
||||
for (const group of menuGroups) {
|
||||
const item = group.items.find(i => i.key === activeTab.value)
|
||||
if (item) return { group, item }
|
||||
}
|
||||
return null
|
||||
})
|
||||
|
||||
const handleMenuClick = (itemKey: string) => { switchTab(itemKey) }
|
||||
const switchProductCategory = (category: string) => { productCategory.value = category }
|
||||
|
||||
return {
|
||||
// state refs (new Pinia style)
|
||||
activeTab, backendDbReady, backendDbMessage, productCategory, dashboard,
|
||||
financeSummary, financePeriod, financeTransactions, receivables, payables,
|
||||
customerFinanceStatement, supplierFinanceStatement, customerProductStatement, supplierProductStatement,
|
||||
products, materials, finishedProducts, purchaseOrders, purchaseWarehouseId, purchaseReceiveItems,
|
||||
productionOrders, productionPlan, productionWarehouseId, suppliers, customers, warehouses,
|
||||
inventory, movements, loading, showModal, modalType, editingItem, productBomItems,
|
||||
materialConsumptionItems, showMaterialConsumptionModal, consumedMaterials,
|
||||
restockItems, showRestockModal, form,
|
||||
// legacy state object (backward compat)
|
||||
state,
|
||||
// refs
|
||||
deliveryDateInput, expectedDateInput, deliveryDateNativeInput, expectedDateNativeInput,
|
||||
// computed
|
||||
menuGroups, openGroups, activeMenu, modalTitle,
|
||||
// actions
|
||||
parseDateTimeLocal, toPickerValue, toApiDateTime, toNativeValue, fromNativeValue,
|
||||
destroyPickers, initPickers, openDateTimePicker,
|
||||
getMovementTypeLabel, getMovementBadgeClass, getPurchaseOrderStatusLabel, isPurchaseOrderLocked,
|
||||
getSalesOrderStatusLabel, getDeliveryStatusLabel, getPaymentStatusLabel, getReceiptStatusLabel,
|
||||
checkBackendHealth, loadDashboard, loadFinishedProducts, loadProducts, loadMaterials,
|
||||
loadWarehouses, ensureStockBaseData, loadSuppliers, loadProductionOrders, loadPurchaseOrders,
|
||||
loadCustomers, loadInventory, loadMovements, loadFinance, refreshFinanceByPeriod,
|
||||
switchTab, closeModal, toggleGroup, handleMenuClick, switchProductCategory,
|
||||
formatCurrency, formatNumber, formatDateTime, formatDate
|
||||
}
|
||||
})
|
||||
+1176
-6
File diff suppressed because it is too large
Load Diff
+381
-74
@@ -872,6 +872,55 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/products/from-task/{task_id}": {
|
||||
"post": {
|
||||
"tags": [
|
||||
"进销存",
|
||||
"产品管理"
|
||||
],
|
||||
"summary": "Create Product From Task",
|
||||
"description": "从模具分析任务创建进销存成品，回写 stp_files.product_id（P2-1）",
|
||||
"operationId": "create_product_from_task_api_products_from_task__task_id__post",
|
||||
"security": [
|
||||
{
|
||||
"OAuth2PasswordBearer": []
|
||||
}
|
||||
],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "task_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Task Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"201": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/ProductResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/products/{product_id}": {
|
||||
"put": {
|
||||
"tags": [
|
||||
@@ -3267,6 +3316,54 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/purchase-demands/calculate": {
|
||||
"post": {
|
||||
"tags": [
|
||||
"进销存",
|
||||
"采购需求推导"
|
||||
],
|
||||
"summary": "Calculate Purchase Demands",
|
||||
"description": "根据销售订单 ID 列表，自动推导采购需求（BOM 展开 → 库存对比 → 供应商推荐）",
|
||||
"operationId": "calculate_purchase_demands_api_purchase_demands_calculate_post",
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/PurchaseDemandCalculateRequest"
|
||||
}
|
||||
}
|
||||
},
|
||||
"required": true
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/PurchaseDemandResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"security": [
|
||||
{
|
||||
"OAuth2PasswordBearer": []
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"/api/dashboard": {
|
||||
"get": {
|
||||
"tags": [
|
||||
@@ -4161,6 +4258,91 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"/api/batch-upload": {
|
||||
"post": {
|
||||
"summary": "Batch Upload",
|
||||
"description": "批量上传多个 STP 文件，每个文件创建独立分析任务，用 batch_id 聚合。",
|
||||
"operationId": "batch_upload_api_batch_upload_post",
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"multipart/form-data": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/Body_batch_upload_api_batch_upload_post"
|
||||
}
|
||||
}
|
||||
},
|
||||
"required": true
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"security": [
|
||||
{
|
||||
"OAuth2PasswordBearer": []
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"/api/batch/{batch_id}": {
|
||||
"get": {
|
||||
"summary": "Get Batch Status",
|
||||
"description": "聚合查询批量任务进度",
|
||||
"operationId": "get_batch_status_api_batch__batch_id__get",
|
||||
"security": [
|
||||
{
|
||||
"OAuth2PasswordBearer": []
|
||||
}
|
||||
],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "batch_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Batch Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/status/{task_id}": {
|
||||
"post": {
|
||||
"summary": "Get Status",
|
||||
@@ -4235,80 +4417,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/result/{task_id}": {
|
||||
"post": {
|
||||
"summary": "Result Page",
|
||||
"description": "结果详情页面",
|
||||
"operationId": "result_page_api_result__task_id__post",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "task_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Task Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"get": {
|
||||
"summary": "Result Page",
|
||||
"description": "结果详情页面",
|
||||
"operationId": "result_page_api_result__task_id__get",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "task_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Task Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/history": {
|
||||
"get": {
|
||||
"summary": "Get File History",
|
||||
@@ -4651,6 +4759,48 @@
|
||||
},
|
||||
"components": {
|
||||
"schemas": {
|
||||
"Body_batch_upload_api_batch_upload_post": {
|
||||
"properties": {
|
||||
"files": {
|
||||
"items": {
|
||||
"type": "string",
|
||||
"contentMediaType": "application/octet-stream"
|
||||
},
|
||||
"type": "array",
|
||||
"title": "Files"
|
||||
},
|
||||
"material": {
|
||||
"type": "string",
|
||||
"title": "Material",
|
||||
"default": "ABS"
|
||||
},
|
||||
"draft_angle": {
|
||||
"type": "number",
|
||||
"title": "Draft Angle",
|
||||
"default": 2.0
|
||||
},
|
||||
"shrinkage_rate": {
|
||||
"type": "number",
|
||||
"title": "Shrinkage Rate",
|
||||
"default": 0.5
|
||||
},
|
||||
"parting_precision": {
|
||||
"type": "number",
|
||||
"title": "Parting Precision",
|
||||
"default": 0.1
|
||||
},
|
||||
"cavity_match": {
|
||||
"type": "integer",
|
||||
"title": "Cavity Match",
|
||||
"default": 95
|
||||
}
|
||||
},
|
||||
"type": "object",
|
||||
"required": [
|
||||
"files"
|
||||
],
|
||||
"title": "Body_batch_upload_api_batch_upload_post"
|
||||
},
|
||||
"Body_login_api_auth_login_post": {
|
||||
"properties": {
|
||||
"grant_type": {
|
||||
@@ -6811,6 +6961,163 @@
|
||||
],
|
||||
"title": "ProductionMaterialPlanItemResponse"
|
||||
},
|
||||
"PurchaseDemandCalculateRequest": {
|
||||
"properties": {
|
||||
"sales_order_ids": {
|
||||
"items": {
|
||||
"type": "integer"
|
||||
},
|
||||
"type": "array",
|
||||
"minItems": 1,
|
||||
"title": "Sales Order Ids",
|
||||
"description": "销售订单ID列表"
|
||||
}
|
||||
},
|
||||
"type": "object",
|
||||
"required": [
|
||||
"sales_order_ids"
|
||||
],
|
||||
"title": "PurchaseDemandCalculateRequest",
|
||||
"description": "计算采购需求的请求体"
|
||||
},
|
||||
"PurchaseDemandItemResponse": {
|
||||
"properties": {
|
||||
"material_id": {
|
||||
"type": "integer",
|
||||
"title": "Material Id"
|
||||
},
|
||||
"material_sku": {
|
||||
"type": "string",
|
||||
"title": "Material Sku"
|
||||
},
|
||||
"material_name": {
|
||||
"type": "string",
|
||||
"title": "Material Name"
|
||||
},
|
||||
"required_quantity": {
|
||||
"type": "string",
|
||||
"pattern": "^(?!^[-+.]*$)[+-]?0*\\d*\\.?\\d*$",
|
||||
"title": "Required Quantity",
|
||||
"description": "BOM 需求量"
|
||||
},
|
||||
"available_quantity": {
|
||||
"type": "string",
|
||||
"pattern": "^(?!^[-+.]*$)[+-]?0*\\d*\\.?\\d*$",
|
||||
"title": "Available Quantity",
|
||||
"description": "当前库存量"
|
||||
},
|
||||
"shortage_quantity": {
|
||||
"type": "string",
|
||||
"pattern": "^(?!^[-+.]*$)[+-]?0*\\d*\\.?\\d*$",
|
||||
"title": "Shortage Quantity",
|
||||
"description": "缺口数量 = required - available"
|
||||
},
|
||||
"unit_cost": {
|
||||
"type": "string",
|
||||
"pattern": "^(?!^[-+.]*$)[+-]?0*\\d*\\.?\\d*$",
|
||||
"title": "Unit Cost",
|
||||
"description": "物料单价"
|
||||
},
|
||||
"estimated_cost": {
|
||||
"type": "string",
|
||||
"pattern": "^(?!^[-+.]*$)[+-]?0*\\d*\\.?\\d*$",
|
||||
"title": "Estimated Cost",
|
||||
"description": "预计采购金额 = shortage × unit_cost"
|
||||
},
|
||||
"suggested_supplier_id": {
|
||||
"anyOf": [
|
||||
{
|
||||
"type": "integer"
|
||||
},
|
||||
{
|
||||
"type": "null"
|
||||
}
|
||||
],
|
||||
"title": "Suggested Supplier Id",
|
||||
"description": "建议供应商ID"
|
||||
},
|
||||
"suggested_supplier_name": {
|
||||
"anyOf": [
|
||||
{
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"type": "null"
|
||||
}
|
||||
],
|
||||
"title": "Suggested Supplier Name",
|
||||
"description": "建议供应商名称"
|
||||
},
|
||||
"supplier_lead_time": {
|
||||
"anyOf": [
|
||||
{
|
||||
"type": "integer"
|
||||
},
|
||||
{
|
||||
"type": "null"
|
||||
}
|
||||
],
|
||||
"title": "Supplier Lead Time",
|
||||
"description": "供应商交货周期(天)"
|
||||
}
|
||||
},
|
||||
"type": "object",
|
||||
"required": [
|
||||
"material_id",
|
||||
"material_sku",
|
||||
"material_name",
|
||||
"required_quantity",
|
||||
"available_quantity",
|
||||
"shortage_quantity",
|
||||
"unit_cost",
|
||||
"estimated_cost"
|
||||
],
|
||||
"title": "PurchaseDemandItemResponse",
|
||||
"description": "单个物料的采购建议"
|
||||
},
|
||||
"PurchaseDemandResponse": {
|
||||
"properties": {
|
||||
"items": {
|
||||
"items": {
|
||||
"$ref": "#/components/schemas/PurchaseDemandItemResponse"
|
||||
},
|
||||
"type": "array",
|
||||
"title": "Items"
|
||||
},
|
||||
"total_estimated_cost": {
|
||||
"type": "string",
|
||||
"pattern": "^(?!^[-+.]*$)[+-]?0*\\d*\\.?\\d*$",
|
||||
"title": "Total Estimated Cost",
|
||||
"description": "预计采购总金额",
|
||||
"default": "0"
|
||||
},
|
||||
"shortage_count": {
|
||||
"type": "integer",
|
||||
"title": "Shortage Count",
|
||||
"description": "缺货物料种类数",
|
||||
"default": 0
|
||||
},
|
||||
"source_order_ids": {
|
||||
"items": {
|
||||
"type": "integer"
|
||||
},
|
||||
"type": "array",
|
||||
"title": "Source Order Ids",
|
||||
"description": "来源销售订单ID"
|
||||
},
|
||||
"source_order_nos": {
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": "array",
|
||||
"title": "Source Order Nos",
|
||||
"description": "来源销售订单编号"
|
||||
}
|
||||
},
|
||||
"type": "object",
|
||||
"title": "PurchaseDemandResponse",
|
||||
"description": "采购需求计算结果"
|
||||
},
|
||||
"PurchaseOrderCreate": {
|
||||
"properties": {
|
||||
"supplier_id": {
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
[pytest]
|
||||
testpaths = tests
|
||||
asyncio_mode = auto
|
||||
@@ -45,7 +45,6 @@ aiohttp>=3.13.4
|
||||
# 消息队列
|
||||
# ============================================
|
||||
celery[redis]>=5.3.0
|
||||
kafka-python>=2.0.2
|
||||
redis>=4.5.0
|
||||
|
||||
# ============================================
|
||||
|
||||
@@ -19,6 +19,7 @@ def process_stp_task(self, task_id: str, file_path: str, stp_file_id: int,
|
||||
# - RustFS(Minio) 为同步客户端，不绑定循环，连一次后跨任务复用。
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
from moldinsight.storage.rustfs_storage import rustfs_manager
|
||||
from shared.database.database import db_manager
|
||||
|
||||
await redis_task_manager.reconnect()
|
||||
if not rustfs_manager.is_connected:
|
||||
@@ -28,6 +29,9 @@ def process_stp_task(self, task_id: str, file_path: str, stp_file_id: int,
|
||||
secret_key=settings.RUSTFS_SECRET_KEY,
|
||||
timeout=settings.RUSTFS_TIMEOUT,
|
||||
)
|
||||
# Celery worker 使用独立连接池配置（较小池）
|
||||
if not db_manager.is_connected:
|
||||
await db_manager.connect(role="celery")
|
||||
|
||||
await processing_service.process_file_with_storage(
|
||||
task_id, file_path, stp_file_id, process_params
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
"""
|
||||
inventory 入口 — 使用 shared.app_factory.create_app() 构建
|
||||
"""
|
||||
import os, sys
|
||||
from pathlib import Path
|
||||
|
||||
@@ -6,73 +9,21 @@ sys.path.insert(0, str(src_root))
|
||||
|
||||
os.chdir(Path(__file__).parent.parent.parent)
|
||||
|
||||
from fastapi import FastAPI, Request
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.responses import JSONResponse, FileResponse
|
||||
import asyncio, time
|
||||
from shared.app_factory import create_app
|
||||
|
||||
from shared.config.settings import settings
|
||||
from shared.services.auth_routes import router as auth_router
|
||||
from shared.utils.logger import setup_logging, get_logger
|
||||
from shared.database.init_db import init_database
|
||||
|
||||
setup_logging()
|
||||
logger = get_logger(__name__)
|
||||
|
||||
app = FastAPI(title="Gemold - 进销存管理系统", version="4.0.0")
|
||||
|
||||
app.add_middleware(CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"])
|
||||
|
||||
@app.middleware("http")
|
||||
async def log_requests(request: Request, call_next):
|
||||
start_time = time.time()
|
||||
response = await call_next(request)
|
||||
duration = time.time() - start_time
|
||||
if response.status_code >= 400:
|
||||
logger.warning(f"[HTTP] {request.method} {request.url.path} -> {response.status_code} ({duration:.2f}s)")
|
||||
return response
|
||||
|
||||
@app.on_event("startup")
|
||||
async def startup_event():
|
||||
success = await init_database(keep_connected=True)
|
||||
print(f"[{'OK' if success else 'FAIL'}] 数据库初始化")
|
||||
def _register_routers(app):
|
||||
"""注册 inventory 业务路由"""
|
||||
try:
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
await redis_task_manager.connect()
|
||||
print(f"[{'OK' if redis_task_manager.is_connected else 'WARN'}] Redis")
|
||||
from inventory.api import inventory_router
|
||||
app.include_router(inventory_router)
|
||||
except Exception as e:
|
||||
print(f"[WARN] Redis异常: {e}")
|
||||
print(f"[WARN] Inventory 路由: {e}")
|
||||
|
||||
@app.on_event("shutdown")
|
||||
async def shutdown_event():
|
||||
try:
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
await redis_task_manager.disconnect()
|
||||
except: pass
|
||||
|
||||
app.mount("/static", StaticFiles(directory=os.path.join(os.getcwd(), "static")), name="static")
|
||||
|
||||
app.include_router(auth_router)
|
||||
|
||||
try:
|
||||
from inventory.api import inventory_router
|
||||
app.include_router(inventory_router)
|
||||
except Exception as e:
|
||||
print(f"[WARN] Inventory 路由: {e}")
|
||||
|
||||
@app.get("/health")
|
||||
async def health():
|
||||
from shared.database.database import db_manager
|
||||
from sqlalchemy import text
|
||||
db_ok = False; db_error = None
|
||||
try:
|
||||
if not db_manager.is_connected: await db_manager.connect()
|
||||
async with db_manager.engine.begin() as conn: await conn.execute(text("SELECT 1"))
|
||||
db_ok = True
|
||||
except Exception as e: db_error = str(e)
|
||||
return {"status": "healthy", "service": "inventory", "version": "4.0.0", "database_connected": db_ok, "database_error": db_error}
|
||||
|
||||
@app.get("/{full_path:path}")
|
||||
async def spa_fallback(full_path: str):
|
||||
return FileResponse(os.path.join(os.getcwd(), "static", "index.html"))
|
||||
app = create_app(
|
||||
title="Gemold - 进销存管理系统",
|
||||
service_name="inventory",
|
||||
mount_html=False,
|
||||
register_routers=_register_routers,
|
||||
)
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
"""
|
||||
moldinsight 入口 — 使用 shared.app_factory.create_app() 构建
|
||||
"""
|
||||
import os, sys
|
||||
from pathlib import Path
|
||||
|
||||
@@ -6,83 +9,21 @@ sys.path.insert(0, str(src_root))
|
||||
|
||||
os.chdir(Path(__file__).parent.parent.parent)
|
||||
|
||||
from fastapi import FastAPI, Request
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.responses import JSONResponse, FileResponse
|
||||
import asyncio, time
|
||||
from shared.app_factory import create_app
|
||||
|
||||
from shared.config.settings import settings
|
||||
from shared.services.auth_routes import router as auth_router
|
||||
from shared.utils.logger import setup_logging, get_logger
|
||||
from shared.database.init_db import init_database
|
||||
|
||||
setup_logging()
|
||||
logger = get_logger(__name__)
|
||||
|
||||
app = FastAPI(title="Gemold - 模具分析引擎", version="4.0.0")
|
||||
|
||||
app.add_middleware(CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"])
|
||||
|
||||
@app.middleware("http")
|
||||
async def log_requests(request: Request, call_next):
|
||||
start_time = time.time()
|
||||
response = await call_next(request)
|
||||
duration = time.time() - start_time
|
||||
if response.status_code >= 400:
|
||||
logger.warning(f"[HTTP] {request.method} {request.url.path} -> {response.status_code} ({duration:.2f}s)")
|
||||
return response
|
||||
|
||||
@app.on_event("startup")
|
||||
async def startup_event():
|
||||
success = await init_database(keep_connected=True)
|
||||
print(f"[{'OK' if success else 'FAIL'}] 数据库初始化")
|
||||
def _register_routers(app):
|
||||
"""注册 moldinsight 业务路由"""
|
||||
try:
|
||||
from moldinsight.storage.rustfs_storage import rustfs_manager
|
||||
await rustfs_manager.connect(endpoint=settings.RUSTFS_ENDPOINT, access_key=settings.RUSTFS_ACCESS_KEY, secret_key=settings.RUSTFS_SECRET_KEY, timeout=settings.RUSTFS_TIMEOUT)
|
||||
print("[OK] RustFS连接成功")
|
||||
from moldinsight.api import router as moldinsight_router
|
||||
app.include_router(moldinsight_router, prefix="/api")
|
||||
except Exception as e:
|
||||
print(f"[WARN] RustFS连接失败: {e}")
|
||||
try:
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
await redis_task_manager.connect()
|
||||
print(f"[{'OK' if redis_task_manager.is_connected else 'WARN'}] Redis")
|
||||
except Exception as e:
|
||||
print(f"[WARN] Redis异常: {e}")
|
||||
print(f"[WARN] MoldInsight 路由: {e}")
|
||||
|
||||
@app.on_event("shutdown")
|
||||
async def shutdown_event():
|
||||
try:
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
await redis_task_manager.disconnect()
|
||||
except: pass
|
||||
|
||||
UPLOAD_DIR = Path("uploads"); UPLOAD_DIR.mkdir(exist_ok=True)
|
||||
Path("html_output").mkdir(exist_ok=True)
|
||||
|
||||
app.mount("/static", StaticFiles(directory=os.path.join(os.getcwd(), "static")), name="static")
|
||||
app.mount("/html", StaticFiles(directory=os.path.join(os.getcwd(), "html_output")), name="html")
|
||||
|
||||
app.include_router(auth_router)
|
||||
|
||||
try:
|
||||
from moldinsight.api import router as moldinsight_router
|
||||
app.include_router(moldinsight_router, prefix="/api")
|
||||
except Exception as e:
|
||||
print(f"[WARN] MoldInsight 路由: {e}")
|
||||
|
||||
@app.get("/health")
|
||||
async def health():
|
||||
from shared.database.database import db_manager
|
||||
from sqlalchemy import text
|
||||
db_ok = False; db_error = None
|
||||
try:
|
||||
if not db_manager.is_connected: await db_manager.connect()
|
||||
async with db_manager.engine.begin() as conn: await conn.execute(text("SELECT 1"))
|
||||
db_ok = True
|
||||
except Exception as e: db_error = str(e)
|
||||
return {"status": "healthy", "service": "moldinsight", "version": "4.0.0", "database_connected": db_ok, "database_error": db_error}
|
||||
|
||||
@app.get("/{full_path:path}")
|
||||
async def spa_fallback(full_path: str):
|
||||
return FileResponse(os.path.join(os.getcwd(), "static", "index.html"))
|
||||
app = create_app(
|
||||
title="Gemold - 模具分析引擎",
|
||||
service_name="moldinsight",
|
||||
mount_html=True,
|
||||
register_routers=_register_routers,
|
||||
)
|
||||
|
||||
@@ -26,6 +26,7 @@ from .sales_order_routes import router as sales_order_router
|
||||
from .dashboard_routes import router as dashboard_router
|
||||
from .finance_routes import router as finance_router
|
||||
from .material_routes import router as material_router
|
||||
from .purchase_demand_routes import router as purchase_demand_router
|
||||
|
||||
inventory_router = APIRouter(prefix="/api", tags=["进销存"])
|
||||
|
||||
@@ -38,6 +39,7 @@ inventory_router.include_router(stock_movement_router)
|
||||
inventory_router.include_router(purchase_order_router)
|
||||
inventory_router.include_router(sales_order_router)
|
||||
inventory_router.include_router(material_router)
|
||||
inventory_router.include_router(purchase_demand_router)
|
||||
inventory_router.include_router(dashboard_router)
|
||||
inventory_router.include_router(finance_router)
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ async def create_customer(
|
||||
|
||||
customer = Customer(**data)
|
||||
db_session.add(customer)
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(customer)
|
||||
return CustomerResponse.from_orm(customer)
|
||||
|
||||
@@ -71,7 +71,7 @@ async def update_customer(
|
||||
for key, value in customer_data.dict().items():
|
||||
setattr(customer, key, value)
|
||||
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(customer)
|
||||
return CustomerResponse.from_orm(customer)
|
||||
|
||||
@@ -88,5 +88,5 @@ async def delete_customer(
|
||||
raise HTTPException(status_code=404, detail="客户不存在")
|
||||
|
||||
customer.is_active = False
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
return {"message": "客户已删除"}
|
||||
|
||||
@@ -63,12 +63,12 @@ async def add_material_price_history(
|
||||
remark=price_data.remark
|
||||
)
|
||||
db_session.add(price_history)
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(price_history)
|
||||
|
||||
# 更新产品的成本价格为最新价格
|
||||
product.cost_price = price_data.price
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
|
||||
return MaterialPriceHistoryResponse(
|
||||
id=price_history.id,
|
||||
@@ -212,7 +212,7 @@ async def add_material_supplier(
|
||||
min_order_quantity=supplier_data.min_order_quantity
|
||||
)
|
||||
db_session.add(material_supplier)
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(material_supplier)
|
||||
|
||||
return MaterialSupplierResponse(
|
||||
@@ -281,7 +281,7 @@ async def remove_material_supplier(
|
||||
raise HTTPException(status_code=404, detail="物料供应商关联不存在")
|
||||
|
||||
await db_session.delete(material_supplier)
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
|
||||
return {"message": "物料供应商关联已删除"}
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ async def create_product(
|
||||
product_dict["max_stock"] = 0
|
||||
product = Product(**product_dict)
|
||||
db_session.add(product)
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(product)
|
||||
return _build_product_response(product, 0)
|
||||
|
||||
@@ -178,7 +178,7 @@ async def create_product_from_task(
|
||||
db_session.add(product)
|
||||
await db_session.flush()
|
||||
stp_file.product_id = product.id
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(product)
|
||||
return _build_product_response(product, 0)
|
||||
|
||||
@@ -205,7 +205,7 @@ async def update_product(
|
||||
for key, value in product_dict.items():
|
||||
setattr(product, key, value)
|
||||
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(product)
|
||||
material_cost_map = await _calculate_material_cost_map(db_session, [product.id])
|
||||
return _build_product_response(product, material_cost_map.get(product.id, 0))
|
||||
@@ -223,7 +223,7 @@ async def delete_product(
|
||||
raise HTTPException(status_code=404, detail="产品不存在")
|
||||
|
||||
product.is_active = False
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
return {"message": "产品已删除"}
|
||||
|
||||
|
||||
@@ -321,5 +321,5 @@ async def replace_product_bom(
|
||||
)
|
||||
)
|
||||
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
return await get_product_bom(product_id, db_session, current_user)
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
"""采购需求推导路由层 - 薄路由
|
||||
|
||||
业务逻辑下沉至 inventory.services.purchase_demand_service，路由只做参数校验与响应组装。
|
||||
路由前缀: /api/purchase-demands
|
||||
"""
|
||||
from fastapi import APIRouter, Depends
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from shared.database.database import get_db_session
|
||||
from shared.services.auth_service import get_current_active_user
|
||||
from shared.models.database import User
|
||||
from ..schemas import (
|
||||
PurchaseDemandCalculateRequest,
|
||||
PurchaseDemandResponse,
|
||||
)
|
||||
from ..services.purchase_demand_service import purchase_demand_service
|
||||
|
||||
router = APIRouter(prefix="/purchase-demands", tags=["采购需求推导"])
|
||||
|
||||
|
||||
@router.post("/calculate", response_model=PurchaseDemandResponse)
|
||||
async def calculate_purchase_demands(
|
||||
payload: PurchaseDemandCalculateRequest,
|
||||
db_session: AsyncSession = Depends(get_db_session),
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
"""根据销售订单 ID 列表，自动推导采购需求（BOM 展开 → 库存对比 → 供应商推荐）"""
|
||||
return await purchase_demand_service.calculate_demands(db_session, payload.sales_order_ids)
|
||||
@@ -51,7 +51,7 @@ async def create_supplier(
|
||||
|
||||
supplier = Supplier(**data)
|
||||
db_session.add(supplier)
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(supplier)
|
||||
return SupplierResponse.from_orm(supplier)
|
||||
|
||||
@@ -71,7 +71,7 @@ async def update_supplier(
|
||||
for key, value in supplier_data.dict().items():
|
||||
setattr(supplier, key, value)
|
||||
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(supplier)
|
||||
return SupplierResponse.from_orm(supplier)
|
||||
|
||||
@@ -88,5 +88,5 @@ async def delete_supplier(
|
||||
raise HTTPException(status_code=404, detail="供应商不存在")
|
||||
|
||||
supplier.is_active = False
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
return {"message": "供应商已删除"}
|
||||
|
||||
@@ -44,6 +44,6 @@ async def create_warehouse(
|
||||
|
||||
warehouse = Warehouse(**data)
|
||||
db_session.add(warehouse)
|
||||
await db_session.commit()
|
||||
await db_session.flush()
|
||||
await db_session.refresh(warehouse)
|
||||
return WarehouseResponse.from_orm(warehouse)
|
||||
|
||||
@@ -56,6 +56,11 @@ from .material_schemas import (
|
||||
MaterialSupplierResponse,
|
||||
MaterialPriceTrendResponse
|
||||
)
|
||||
from .purchase_demand_schemas import (
|
||||
PurchaseDemandCalculateRequest,
|
||||
PurchaseDemandItemResponse,
|
||||
PurchaseDemandResponse
|
||||
)
|
||||
|
||||
from .common_schemas import PaginatedResponse
|
||||
|
||||
@@ -81,4 +86,5 @@ __all__ = [
|
||||
"PartnerProductStatementItemResponse", "FinancePartnerProductStatementResponse",
|
||||
"MaterialPriceHistoryCreate", "MaterialPriceHistoryResponse",
|
||||
"MaterialSupplierCreate", "MaterialSupplierResponse", "MaterialPriceTrendResponse",
|
||||
"PurchaseDemandCalculateRequest", "PurchaseDemandItemResponse", "PurchaseDemandResponse",
|
||||
]
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
"""采购需求推导相关数据模型
|
||||
|
||||
销售订单 → BOM 展开 → 物料需求 → 对比库存 → 生成采购建议
|
||||
"""
|
||||
from pydantic import BaseModel, Field
|
||||
from decimal import Decimal
|
||||
from typing import Optional, List
|
||||
|
||||
|
||||
class PurchaseDemandCalculateRequest(BaseModel):
|
||||
"""计算采购需求的请求体"""
|
||||
sales_order_ids: List[int] = Field(..., min_length=1, description="销售订单ID列表")
|
||||
|
||||
|
||||
class PurchaseDemandItemResponse(BaseModel):
|
||||
"""单个物料的采购建议"""
|
||||
material_id: int
|
||||
material_sku: str
|
||||
material_name: str
|
||||
required_quantity: Decimal = Field(..., description="BOM 需求量")
|
||||
available_quantity: Decimal = Field(..., description="当前库存量")
|
||||
shortage_quantity: Decimal = Field(..., description="缺口数量 = required - available")
|
||||
unit_cost: Decimal = Field(..., description="物料单价")
|
||||
estimated_cost: Decimal = Field(..., description="预计采购金额 = shortage × unit_cost")
|
||||
suggested_supplier_id: Optional[int] = Field(None, description="建议供应商ID")
|
||||
suggested_supplier_name: Optional[str] = Field(None, description="建议供应商名称")
|
||||
supplier_lead_time: Optional[int] = Field(None, description="供应商交货周期(天)")
|
||||
|
||||
|
||||
class PurchaseDemandResponse(BaseModel):
|
||||
"""采购需求计算结果"""
|
||||
items: List[PurchaseDemandItemResponse] = Field(default_factory=list)
|
||||
total_estimated_cost: Decimal = Field(default=Decimal("0"), description="预计采购总金额")
|
||||
shortage_count: int = Field(default=0, description="缺货物料种类数")
|
||||
source_order_ids: List[int] = Field(default_factory=list, description="来源销售订单ID")
|
||||
source_order_nos: List[str] = Field(default_factory=list, description="来源销售订单编号")
|
||||
@@ -0,0 +1,183 @@
|
||||
"""采购需求自动推导服务
|
||||
|
||||
销售订单确认 → 按 BOM 展开物料需求 → 对比当前库存 → 自动生成采购建议（缺多少、建议供应商、预计金额）
|
||||
"""
|
||||
from math import ceil
|
||||
from decimal import Decimal
|
||||
from typing import List
|
||||
|
||||
from fastapi import HTTPException
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, func
|
||||
|
||||
from shared.models.database import (
|
||||
Product,
|
||||
ProductMaterial,
|
||||
SalesOrder,
|
||||
SalesOrderItem,
|
||||
Inventory,
|
||||
MaterialSupplier,
|
||||
Supplier,
|
||||
)
|
||||
from ..schemas.purchase_demand_schemas import (
|
||||
PurchaseDemandItemResponse,
|
||||
PurchaseDemandResponse,
|
||||
)
|
||||
|
||||
|
||||
class PurchaseDemandService:
|
||||
"""采购需求推导服务"""
|
||||
|
||||
@staticmethod
|
||||
async def calculate_demands(
|
||||
db_session: AsyncSession,
|
||||
sales_order_ids: List[int],
|
||||
) -> PurchaseDemandResponse:
|
||||
"""
|
||||
核心算法：
|
||||
1. 批量查询销售订单 + 明细项
|
||||
2. 按 BOM 展开所有成品所需的物料（含损耗率）
|
||||
3. 聚合跨订单的同一物料需求量
|
||||
4. 对比当前库存，计算缺口
|
||||
5. 查询 MaterialSupplier 推荐主供应商
|
||||
"""
|
||||
# ── 1. 查询销售订单 ──
|
||||
order_result = await db_session.execute(
|
||||
select(SalesOrder).where(SalesOrder.id.in_(sales_order_ids))
|
||||
)
|
||||
orders = order_result.scalars().all()
|
||||
if not orders:
|
||||
raise HTTPException(status_code=404, detail="未找到有效的销售订单")
|
||||
|
||||
order_ids_found = [o.id for o in orders]
|
||||
order_nos = [o.order_no for o in orders]
|
||||
|
||||
# ── 2. 查询订单明细（成品列表） ──
|
||||
item_result = await db_session.execute(
|
||||
select(SalesOrderItem).where(SalesOrderItem.order_id.in_(order_ids_found))
|
||||
)
|
||||
order_items = item_result.scalars().all()
|
||||
if not order_items:
|
||||
return PurchaseDemandResponse(
|
||||
source_order_ids=order_ids_found,
|
||||
source_order_nos=order_nos,
|
||||
)
|
||||
|
||||
# ── 3. 按 BOM 展开物料需求 ──
|
||||
finished_ids = list({int(i.product_id) for i in order_items})
|
||||
bom_result = await db_session.execute(
|
||||
select(ProductMaterial, Product)
|
||||
.join(Product, ProductMaterial.material_product_id == Product.id)
|
||||
.where(ProductMaterial.finished_product_id.in_(finished_ids))
|
||||
.where(Product.is_active == True)
|
||||
.where(Product.item_type == "material")
|
||||
)
|
||||
bom_rows = bom_result.all()
|
||||
if not bom_rows:
|
||||
return PurchaseDemandResponse(
|
||||
source_order_ids=order_ids_found,
|
||||
source_order_nos=order_nos,
|
||||
)
|
||||
|
||||
# 按 finished_product_id 分组 BOM
|
||||
bom_by_finished: dict = {}
|
||||
for bom, material in bom_rows:
|
||||
bom_by_finished.setdefault(int(bom.finished_product_id), []).append((bom, material))
|
||||
|
||||
# 聚合需求量：material_id → { material, required_qty }
|
||||
required_qty_map: dict = {}
|
||||
for order_item in order_items:
|
||||
bom_items = bom_by_finished.get(int(order_item.product_id)) or []
|
||||
for bom, material in bom_items:
|
||||
qty = (
|
||||
Decimal(str(order_item.quantity))
|
||||
* Decimal(str(bom.quantity or 0))
|
||||
* (1 + Decimal(str(bom.loss_rate or 0)))
|
||||
)
|
||||
entry = required_qty_map.setdefault(
|
||||
material.id,
|
||||
{"material": material, "required_qty": Decimal("0")},
|
||||
)
|
||||
entry["required_qty"] += qty
|
||||
|
||||
if not required_qty_map:
|
||||
return PurchaseDemandResponse(
|
||||
source_order_ids=order_ids_found,
|
||||
source_order_nos=order_nos,
|
||||
)
|
||||
|
||||
# ── 4. 对比当前库存 ──
|
||||
material_ids = list(required_qty_map.keys())
|
||||
stock_result = await db_session.execute(
|
||||
select(Inventory.product_id, func.coalesce(func.sum(Inventory.quantity), 0))
|
||||
.where(Inventory.product_id.in_(material_ids))
|
||||
.group_by(Inventory.product_id)
|
||||
)
|
||||
stock_map = {row[0]: Decimal(str(row[1] or 0)) for row in stock_result.all()}
|
||||
|
||||
# ── 5. 查询物料-供应商关联（推荐主供应商） ──
|
||||
ms_result = await db_session.execute(
|
||||
select(MaterialSupplier, Supplier)
|
||||
.join(Supplier, MaterialSupplier.supplier_id == Supplier.id)
|
||||
.where(MaterialSupplier.product_id.in_(material_ids))
|
||||
.where(Supplier.is_active == True)
|
||||
.order_by(MaterialSupplier.is_primary.desc(), MaterialSupplier.id.asc())
|
||||
)
|
||||
ms_rows = ms_result.all()
|
||||
# 每个物料取第一个（优先 is_primary=True）
|
||||
supplier_map: dict = {}
|
||||
for ms, supplier in ms_rows:
|
||||
if ms.product_id not in supplier_map:
|
||||
supplier_map[ms.product_id] = {
|
||||
"supplier_id": supplier.id,
|
||||
"supplier_name": supplier.name,
|
||||
"lead_time": ms.lead_time,
|
||||
}
|
||||
|
||||
# ── 6. 组装响应 ──
|
||||
items: List[PurchaseDemandItemResponse] = []
|
||||
total_estimated_cost = Decimal("0")
|
||||
shortage_count = 0
|
||||
|
||||
for material_id, entry in required_qty_map.items():
|
||||
material = entry["material"]
|
||||
required_qty = int(ceil(entry["required_qty"]))
|
||||
available_qty = stock_map.get(material_id, Decimal("0"))
|
||||
shortage_qty = max(required_qty - int(available_qty), 0)
|
||||
unit_cost = Decimal(str(material.cost_price or 0))
|
||||
estimated_cost = Decimal(str(shortage_qty)) * unit_cost
|
||||
total_estimated_cost += estimated_cost
|
||||
|
||||
if shortage_qty > 0:
|
||||
shortage_count += 1
|
||||
|
||||
suggested = supplier_map.get(material_id)
|
||||
items.append(
|
||||
PurchaseDemandItemResponse(
|
||||
material_id=material.id,
|
||||
material_sku=material.sku,
|
||||
material_name=material.name,
|
||||
required_quantity=Decimal(str(required_qty)),
|
||||
available_quantity=available_qty,
|
||||
shortage_quantity=Decimal(str(shortage_qty)),
|
||||
unit_cost=unit_cost,
|
||||
estimated_cost=estimated_cost,
|
||||
suggested_supplier_id=suggested["supplier_id"] if suggested else None,
|
||||
suggested_supplier_name=suggested["supplier_name"] if suggested else None,
|
||||
supplier_lead_time=suggested["lead_time"] if suggested else None,
|
||||
)
|
||||
)
|
||||
|
||||
# 按缺口数量降序排列（最缺的排最前）
|
||||
items.sort(key=lambda x: (x.shortage_quantity, x.estimated_cost), reverse=True)
|
||||
|
||||
return PurchaseDemandResponse(
|
||||
items=items,
|
||||
total_estimated_cost=total_estimated_cost,
|
||||
shortage_count=shortage_count,
|
||||
source_order_ids=order_ids_found,
|
||||
source_order_nos=order_nos,
|
||||
)
|
||||
|
||||
|
||||
purchase_demand_service = PurchaseDemandService()
|
||||
@@ -476,6 +476,8 @@ class SalesOrderService:
|
||||
current_user: User,
|
||||
) -> SalesOrderResponse:
|
||||
order, customer = await _get_sales_order_with_customer(db_session, order_id)
|
||||
if order.status == "delivered":
|
||||
raise HTTPException(status_code=400, detail="已交付的销售订单禁止修改")
|
||||
if order.status == "paid":
|
||||
raise HTTPException(status_code=400, detail="已收款的销售订单禁止修改")
|
||||
try:
|
||||
|
||||
+5
-1
@@ -1,4 +1,8 @@
|
||||
# main.py
|
||||
# main.py — 已废弃，保留向后兼容
|
||||
# 推荐使用入口：
|
||||
# - src/entrypoints/moldinsight.py (模具分析服务)
|
||||
# - src/entrypoints/inventory.py (进销存服务)
|
||||
# 两者均基于 shared.app_factory.create_app() 构建，消除重复代码。
|
||||
import sys
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
@@ -21,6 +21,7 @@ def _safe_include(module_path: str, label: str):
|
||||
|
||||
_safe_include("moldinsight.api.health_router", "健康检查")
|
||||
_safe_include("moldinsight.api.upload_router", "上传")
|
||||
_safe_include("moldinsight.api.batch_router", "批量")
|
||||
_safe_include("moldinsight.api.task_router", "任务")
|
||||
_safe_include("moldinsight.api.history_router", "历史")
|
||||
_safe_include("moldinsight.api.debug_router", "调试")
|
||||
|
||||
@@ -307,7 +307,7 @@ async def estimate_cost(
|
||||
request: Request,
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
"""LLM 模具成本估算（P2-2：真 AI 落地，需启用 LLM）"""
|
||||
"""模具成本估算：优先使用 LLM，未启用时降级为规则式估算"""
|
||||
body = await request.json()
|
||||
task_id = body.get("task_id")
|
||||
if not task_id:
|
||||
@@ -323,11 +323,17 @@ async def estimate_cost(
|
||||
"geometry_data": task_data.get("geometry_data", {}),
|
||||
"metadata": {"selected_material": task_data.get("material")},
|
||||
}
|
||||
# 优先使用 LLM
|
||||
from moldinsight.services.llm_service import llm_service
|
||||
result = await llm_service.estimate_cost(analysis_result, detailed_context)
|
||||
if result is None:
|
||||
raise HTTPException(503, "成本估算不可用（LLM 未启用或生成失败）")
|
||||
return {"status": "success", "data": result}
|
||||
if result is not None:
|
||||
result["source"] = "ai"
|
||||
return {"status": "success", "data": result}
|
||||
|
||||
# LLM 未启用或失败，降级为规则估算
|
||||
from moldinsight.services.cost_estimate_service import estimate_cost_by_rules
|
||||
rules_result = estimate_cost_by_rules(analysis_result, detailed_context)
|
||||
return {"status": "success", "data": rules_result}
|
||||
|
||||
|
||||
@router.post("/design-cam")
|
||||
|
||||
@@ -0,0 +1,226 @@
|
||||
"""
|
||||
moldinsight/api/batch_router.py — 批量分析端点
|
||||
|
||||
- POST /api/batch-upload 批量上传多文件，返回 batch_id + 各 task_id
|
||||
- GET /api/batch/{batch_id} 聚合查询批量任务进度
|
||||
"""
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from typing import List, Dict, Any
|
||||
|
||||
from fastapi import APIRouter, UploadFile, File, Form, HTTPException, Depends
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from shared.database.database import get_db_session
|
||||
from shared.services.auth_service import get_current_active_user
|
||||
from shared.models.database import User
|
||||
from shared.models.schemas import ProcessingStatus, create_task_info
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
from shared.utils.file_handler import FileHandler
|
||||
from shared.utils.logger import get_logger
|
||||
from moldinsight.services.storage_integration_rustfs import StorageIntegrationService
|
||||
|
||||
try:
|
||||
from celery_tasks import process_stp_task
|
||||
_use_celery = True
|
||||
except ImportError:
|
||||
process_stp_task = None
|
||||
_use_celery = False
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
file_handler = FileHandler()
|
||||
|
||||
# ─── 批量元数据 Redis key 约定 ──────────────────────────────────────
|
||||
_BATCH_KEY_PREFIX = "batch:"
|
||||
_BATCH_TTL = 86400 # 24h
|
||||
|
||||
|
||||
def _batch_redis_key(batch_id: str) -> str:
|
||||
return f"{_BATCH_KEY_PREFIX}{batch_id}"
|
||||
|
||||
|
||||
@router.post("/batch-upload")
|
||||
async def batch_upload(
|
||||
files: List[UploadFile] = File(...),
|
||||
material: str = Form("ABS"),
|
||||
draft_angle: float = Form(2.0),
|
||||
shrinkage_rate: float = Form(0.5),
|
||||
parting_precision: float = Form(0.1),
|
||||
cavity_match: int = Form(95),
|
||||
db_session: AsyncSession = Depends(get_db_session),
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
"""批量上传多个 STP 文件，每个文件创建独立分析任务，用 batch_id 聚合。"""
|
||||
if not files:
|
||||
raise HTTPException(400, "请至少上传一个文件")
|
||||
if len(files) > 20:
|
||||
raise HTTPException(400, "单次批量上传最多 20 个文件")
|
||||
|
||||
process_params = {
|
||||
"material": material,
|
||||
"draft_angle": float(draft_angle),
|
||||
"shrinkage_rate": float(shrinkage_rate),
|
||||
"parting_precision": float(parting_precision),
|
||||
"cavity_match": int(cavity_match),
|
||||
}
|
||||
|
||||
batch_id = str(uuid.uuid4())
|
||||
tasks: List[Dict[str, Any]] = []
|
||||
storage_service = StorageIntegrationService()
|
||||
|
||||
for file in files:
|
||||
# 文件类型检查
|
||||
if not file.filename.lower().endswith(('.stp', '.step')):
|
||||
tasks.append({
|
||||
"filename": file.filename,
|
||||
"task_id": None,
|
||||
"status": "rejected",
|
||||
"error": "不支持的文件类型",
|
||||
})
|
||||
continue
|
||||
|
||||
task_id = str(uuid.uuid4())
|
||||
try:
|
||||
file_path, file_size, file_meta = await file_handler.save_uploaded_file(file)
|
||||
|
||||
stp_file = await storage_service.save_stp_file(
|
||||
session=db_session,
|
||||
file_path=file_path,
|
||||
original_filename=file_meta["safe_original_name"],
|
||||
user_id=current_user.id,
|
||||
)
|
||||
|
||||
await storage_service.create_processing_task(
|
||||
db_session, task_id, stp_file.id, parameters=process_params,
|
||||
)
|
||||
|
||||
task_info = create_task_info(
|
||||
task_id=task_id,
|
||||
status=ProcessingStatus.PROCESSING,
|
||||
filename=file.filename,
|
||||
file_path=str(file_path),
|
||||
file_size=file_size,
|
||||
upload_time=str(datetime.now()),
|
||||
)
|
||||
task_info["material"] = material
|
||||
task_info["parameters"] = process_params
|
||||
task_info["batch_id"] = batch_id
|
||||
await redis_task_manager.set_task(task_id, task_info)
|
||||
|
||||
# 调度处理
|
||||
if _use_celery:
|
||||
process_stp_task.delay(task_id, str(file_path), stp_file.id, process_params)
|
||||
else:
|
||||
import asyncio
|
||||
from moldinsight.services.processing_service import processing_service
|
||||
asyncio.create_task(processing_service.process_file_with_storage(
|
||||
task_id, str(file_path), stp_file.id, process_params
|
||||
))
|
||||
|
||||
tasks.append({
|
||||
"filename": file.filename,
|
||||
"task_id": task_id,
|
||||
"status": "processing",
|
||||
"stp_file_id": stp_file.id,
|
||||
})
|
||||
logger.info(
|
||||
f"[BATCH] batch_id={batch_id} task_id={task_id} "
|
||||
f"file={file.filename} user={current_user.username}"
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.warning(f"[BATCH] 文件 {file.filename} 上传失败: {exc}")
|
||||
tasks.append({
|
||||
"filename": file.filename,
|
||||
"task_id": task_id,
|
||||
"status": "error",
|
||||
"error": str(exc),
|
||||
})
|
||||
|
||||
# 将 batch 元数据写入 Redis
|
||||
batch_meta = {
|
||||
"batch_id": batch_id,
|
||||
"user_id": current_user.id,
|
||||
"created_at": str(datetime.now()),
|
||||
"task_ids": [t["task_id"] for t in tasks if t.get("task_id")],
|
||||
"total": len(tasks),
|
||||
"params": process_params,
|
||||
}
|
||||
await redis_task_manager.redis_client.set(
|
||||
_batch_redis_key(batch_id),
|
||||
__import__("json").dumps(batch_meta),
|
||||
ex=_BATCH_TTL,
|
||||
)
|
||||
|
||||
return {
|
||||
"batch_id": batch_id,
|
||||
"total": len(tasks),
|
||||
"accepted": sum(1 for t in tasks if t.get("status") != "rejected"),
|
||||
"tasks": tasks,
|
||||
}
|
||||
|
||||
|
||||
@router.get("/batch/{batch_id}")
|
||||
async def get_batch_status(
|
||||
batch_id: str,
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
"""聚合查询批量任务进度"""
|
||||
import json
|
||||
|
||||
raw = await redis_task_manager.redis_client.get(_batch_redis_key(batch_id))
|
||||
if not raw:
|
||||
raise HTTPException(404, "批量任务不存在或已过期")
|
||||
|
||||
batch_meta = json.loads(raw)
|
||||
|
||||
# 权限检查
|
||||
if batch_meta.get("user_id") and batch_meta["user_id"] != current_user.id:
|
||||
raise HTTPException(403, "无权访问该批量任务")
|
||||
|
||||
task_ids = batch_meta.get("task_ids", [])
|
||||
task_statuses = []
|
||||
completed = 0
|
||||
failed = 0
|
||||
processing = 0
|
||||
|
||||
for tid in task_ids:
|
||||
task_data = await redis_task_manager.get_task(tid)
|
||||
if not task_data:
|
||||
task_statuses.append({"task_id": tid, "status": "unknown"})
|
||||
continue
|
||||
status = task_data.get("status", "unknown")
|
||||
progress = task_data.get("progress", 0)
|
||||
filename = task_data.get("filename", "")
|
||||
error = task_data.get("error", "")
|
||||
html_file = task_data.get("html_file", "")
|
||||
|
||||
if status == ProcessingStatus.COMPLETED:
|
||||
completed += 1
|
||||
elif status == ProcessingStatus.FAILED:
|
||||
failed += 1
|
||||
else:
|
||||
processing += 1
|
||||
|
||||
task_statuses.append({
|
||||
"task_id": tid,
|
||||
"status": status,
|
||||
"progress": progress,
|
||||
"filename": filename,
|
||||
"error": error,
|
||||
"html_file": html_file,
|
||||
})
|
||||
|
||||
total = len(task_ids)
|
||||
return {
|
||||
"batch_id": batch_id,
|
||||
"created_at": batch_meta.get("created_at"),
|
||||
"total": total,
|
||||
"completed": completed,
|
||||
"failed": failed,
|
||||
"processing": processing,
|
||||
"progress_percent": round((completed + failed) / max(total, 1) * 100, 1),
|
||||
"tasks": task_statuses,
|
||||
}
|
||||
@@ -34,46 +34,3 @@ async def get_status(task_id: str, db_session: AsyncSession = Depends(get_db_ses
|
||||
except Exception as e:
|
||||
logger.error(f"获取任务状态失败: {e}")
|
||||
raise HTTPException(500, f"获取任务状态失败: {str(e)}")
|
||||
|
||||
|
||||
@router.get("/result/{task_id}")
|
||||
@router.post("/result/{task_id}")
|
||||
async def result_page(request: Request, task_id: str, db_session: AsyncSession = Depends(get_db_session)):
|
||||
"""结果详情页面"""
|
||||
# 从数据库查询任务详情
|
||||
result = await db_session.execute(
|
||||
select(ProcessingTask, STPFile)
|
||||
.join(STPFile, ProcessingTask.stp_file_id == STPFile.id)
|
||||
.where(ProcessingTask.task_id == task_id)
|
||||
)
|
||||
|
||||
task_record = result.first()
|
||||
|
||||
if not task_record:
|
||||
raise HTTPException(404, "任务不存在")
|
||||
|
||||
task, stp_file = task_record
|
||||
|
||||
# 构建任务详情数据
|
||||
task_data = {
|
||||
"task_id": task.task_id,
|
||||
"filename": stp_file.original_filename if stp_file else "",
|
||||
"file_size": stp_file.file_size if stp_file else 0,
|
||||
"status": task.status,
|
||||
"progress": task.progress,
|
||||
"current_step": task.current_step,
|
||||
"created_at": task.created_time.isoformat() if task.created_time else "",
|
||||
"completed_at": task.completed_time.isoformat() if task.completed_time else "",
|
||||
"error": task.error_message if task.error_message else ""
|
||||
}
|
||||
|
||||
from fastapi.templating import Jinja2Templates
|
||||
import os
|
||||
templates_dir = os.path.join(os.getcwd(), "templates")
|
||||
templates = Jinja2Templates(directory=templates_dir)
|
||||
return templates.TemplateResponse("result.html", {
|
||||
"request": request,
|
||||
"task": task_data,
|
||||
"pythonocc_available": True,
|
||||
"version": "3.0.0"
|
||||
})
|
||||
|
||||
@@ -0,0 +1,237 @@
|
||||
"""
|
||||
moldinsight/services/cost_estimate_service.py — 规则式成本估算
|
||||
|
||||
当 LLM 未启用时作为兜底，基于几何参数 + 材料库 + 模具尺寸
|
||||
计算材料费 / 加工费，完全不依赖 LLM。
|
||||
"""
|
||||
|
||||
from typing import Dict, Any, Optional
|
||||
|
||||
|
||||
# ─── 模具钢材料单价参考（元/kg，含税） ──────────────────────────────
|
||||
_MOLD_STEEL_PRICE = {
|
||||
"铝合金7075": 45,
|
||||
"P20": 25,
|
||||
"718H": 35,
|
||||
"NAK80": 55,
|
||||
"S136": 70,
|
||||
"H13": 40,
|
||||
"default": 30,
|
||||
}
|
||||
|
||||
# ─── 加工复杂度系数 ────────────────────────────────────────────────────
|
||||
_COMPLEXITY_FACTOR = {
|
||||
"low": 1.0,
|
||||
"medium": 1.3,
|
||||
"high": 1.7,
|
||||
"very_high": 2.2,
|
||||
}
|
||||
|
||||
# 侧向机构附加费用（元/个）
|
||||
_SIDE_ACTION_COST = {
|
||||
"slider": 8000, # 滑块
|
||||
"lifter": 6000, # 斜顶
|
||||
"mixed": 7000, # 混合
|
||||
}
|
||||
|
||||
# 型腔加工基础费用（元/型腔）
|
||||
_CAVITY_MACHINING_BASE = 25000
|
||||
|
||||
# 模架基础费用（元）
|
||||
_BASE_MOLD_FRAME = {
|
||||
"small": 15000, # 长宽 < 250mm
|
||||
"medium": 25000, # 长宽 250-400mm
|
||||
"large": 45000, # 长宽 > 400mm
|
||||
}
|
||||
|
||||
|
||||
def estimate_cost_by_rules(
|
||||
analysis_result: Dict[str, Any],
|
||||
detailed_cavity_json: Optional[Dict[str, Any]] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""规则式模具成本估算。
|
||||
|
||||
返回结构与 LLM estimate_cost 一致，前端可无缝展示。
|
||||
"""
|
||||
ctx = _extract_context(analysis_result, detailed_cavity_json)
|
||||
|
||||
# ── 模具材料费 ──────────────────────────────────────────────
|
||||
mold_weight_kg = _estimate_mold_weight(ctx)
|
||||
steel_price = _MOLD_STEEL_PRICE.get(ctx["mold_material"], _MOLD_STEEL_PRICE["default"])
|
||||
material_cost = int(mold_weight_kg * steel_price)
|
||||
|
||||
# ── 加工费 ─────────────────────────────────────────────────
|
||||
cavity_count = ctx["cavity_count"]
|
||||
complexity_key = ctx["complexity"]
|
||||
complexity_factor = _COMPLEXITY_FACTOR.get(complexity_key, 1.3)
|
||||
machining_cost = int(
|
||||
_CAVITY_MACHINING_BASE * cavity_count * complexity_factor
|
||||
+ _BASE_MOLD_FRAME[ctx["mold_frame_size"]]
|
||||
)
|
||||
|
||||
# ── 侧向机构附加费 ─────────────────────────────────────────
|
||||
side_action_extra = 0
|
||||
side_action_parts = []
|
||||
slider_count = ctx["slider_count"]
|
||||
lifter_count = ctx["lifter_count"]
|
||||
if slider_count > 0:
|
||||
side_action_extra += slider_count * _SIDE_ACTION_COST["slider"]
|
||||
side_action_parts.append(f"{slider_count} 个滑块")
|
||||
if lifter_count > 0:
|
||||
side_action_extra += lifter_count * _SIDE_ACTION_COST["lifter"]
|
||||
side_action_parts.append(f"{lifter_count} 个斜顶")
|
||||
|
||||
complexity_label = (
|
||||
f"{complexity_factor:.1f}"
|
||||
+ (f"（含 {', '.join(side_action_parts)}）" if side_action_parts else "")
|
||||
)
|
||||
|
||||
# ── 合计 ───────────────────────────────────────────────────
|
||||
mold_subtotal = material_cost + machining_cost + side_action_extra
|
||||
|
||||
# ── 单件成本 ───────────────────────────────────────────────
|
||||
part_weight_g = ctx["part_weight_g"]
|
||||
cycle_time_s = ctx["cycle_time_s"]
|
||||
# 材料费：塑料粒 ~30 元/kg 均值
|
||||
material_price_per_kg = 30
|
||||
part_material_cost = (part_weight_g / 1000) * material_price_per_kg
|
||||
# 机时分摊：假设机时费 60 元/h
|
||||
machine_hourly_rate = 60
|
||||
part_cycle_cost = (cycle_time_s / 3600) * machine_hourly_rate * (1 / max(cavity_count, 1))
|
||||
# 人工 + 能耗分摊 ~15%
|
||||
part_overhead = (part_material_cost + part_cycle_cost) * 0.15
|
||||
cost_per_part = round(part_material_cost + part_cycle_cost + part_overhead, 2)
|
||||
|
||||
return {
|
||||
"mold_cost": {
|
||||
"material": f"¥{material_cost:,}（{ctx['mold_material']}，约 {mold_weight_kg:.0f} kg）",
|
||||
"machining": f"¥{machining_cost:,}（含 CNC/EDM/线切割，{cavity_count} 腔）",
|
||||
"complexity_factor": complexity_label,
|
||||
"subtotal": f"¥{mold_subtotal:,}",
|
||||
},
|
||||
"part_cost": {
|
||||
"material": f"¥{part_material_cost:.2f}（{ctx['material_name']}，约 {part_weight_g:.1f} g）",
|
||||
"cycle_time": f"{cycle_time_s} s",
|
||||
"cost_per_part": f"¥{cost_per_part:.2f}",
|
||||
},
|
||||
"total_mold_cost": f"¥{mold_subtotal:,}",
|
||||
"cost_per_part": f"¥{cost_per_part:.2f}",
|
||||
"confidence": 0.55,
|
||||
"assumptions": [
|
||||
"假设模具寿命 50 万模次",
|
||||
f"模具钢：{ctx['mold_material']}（{steel_price} 元/kg）",
|
||||
f"型腔数：{cavity_count}",
|
||||
f"机时费：{machine_hourly_rate} 元/h",
|
||||
"塑料粒均价 30 元/kg",
|
||||
"人工+能耗分摊 15%",
|
||||
"规则估算，仅供参考",
|
||||
],
|
||||
"source": "rules",
|
||||
}
|
||||
|
||||
|
||||
def _extract_context(
|
||||
analysis_result: Dict[str, Any],
|
||||
detailed_cavity_json: Optional[Dict[str, Any]],
|
||||
) -> Dict[str, Any]:
|
||||
"""从分析结果提取成本估算所需上下文"""
|
||||
geometry = analysis_result.get("geometry_data", {})
|
||||
bbox = geometry.get("bounding_box", {})
|
||||
dims = bbox.get("dimensions", [0, 0, 0])
|
||||
volume_mm3 = geometry.get("volume", 0) or 0
|
||||
|
||||
schemes = (detailed_cavity_json or {}).get("candidate_schemes", [])
|
||||
best = schemes[0] if schemes else {}
|
||||
cavity_data = best.get("cavity_data", {}) if isinstance(best, dict) else {}
|
||||
mfg_info = cavity_data.get("manufacturing_info", {})
|
||||
metadata = cavity_data.get("metadata", {})
|
||||
|
||||
# 型腔数
|
||||
cavity_count = (cavity_data.get("mold_cavities", {}) or {}).get("cavity_count", 1)
|
||||
|
||||
# 模具材料
|
||||
mold_material = mfg_info.get("mold_material", "P20")
|
||||
|
||||
# 模具尺寸
|
||||
mold_size = mfg_info.get("estimated_mold_size", {})
|
||||
length = mold_size.get("length", 300)
|
||||
width = mold_size.get("width", 300)
|
||||
max_dim = max(length, width)
|
||||
if max_dim < 250:
|
||||
mold_frame_size = "small"
|
||||
elif max_dim < 400:
|
||||
mold_frame_size = "medium"
|
||||
else:
|
||||
mold_frame_size = "large"
|
||||
|
||||
# 复杂度
|
||||
side_actions = cavity_data.get("side_actions", {}) or {}
|
||||
summary = side_actions.get("summary", {})
|
||||
slider_count = summary.get("total_slider_count", 0) or 0
|
||||
lifter_count = summary.get("total_lifter_count", 0) or 0
|
||||
total_mechanism = slider_count + lifter_count
|
||||
if total_mechanism == 0:
|
||||
complexity = "low"
|
||||
elif total_mechanism <= 2:
|
||||
complexity = "medium"
|
||||
elif total_mechanism <= 4:
|
||||
complexity = "high"
|
||||
else:
|
||||
complexity = "very_high"
|
||||
|
||||
# 产品重量
|
||||
material_name = metadata.get("selected_material", "ABS")
|
||||
density = 1.05 # ABS 默认密度
|
||||
part_weight_g = (volume_mm3 / 1000) * density
|
||||
|
||||
# 成型周期
|
||||
cycle_time_raw = mfg_info.get("estimated_cycle_time", "30")
|
||||
try:
|
||||
cycle_time_s = int(str(cycle_time_raw).replace("秒", "").strip())
|
||||
except (ValueError, TypeError):
|
||||
cycle_time_s = 30
|
||||
|
||||
return {
|
||||
"dims": dims,
|
||||
"volume_mm3": volume_mm3,
|
||||
"cavity_count": cavity_count,
|
||||
"mold_material": mold_material,
|
||||
"mold_frame_size": mold_frame_size,
|
||||
"complexity": complexity,
|
||||
"slider_count": slider_count,
|
||||
"lifter_count": lifter_count,
|
||||
"material_name": material_name,
|
||||
"part_weight_g": part_weight_g,
|
||||
"cycle_time_s": cycle_time_s,
|
||||
}
|
||||
|
||||
|
||||
def _estimate_mold_weight(ctx: Dict[str, Any]) -> float:
|
||||
"""基于模具尺寸估算重量（kg），假设钢材密度 7.85 g/cm³"""
|
||||
cavity_count = ctx["cavity_count"]
|
||||
dims = ctx["dims"]
|
||||
dim_x = max(dims[0] if len(dims) > 0 else 120, 120)
|
||||
dim_y = max(dims[1] if len(dims) > 1 else 100, 100)
|
||||
dim_z = max(dims[2] if len(dims) > 2 else 60, 60)
|
||||
|
||||
edge_margin = 50
|
||||
if cavity_count == 1:
|
||||
length = dim_x + 2 * edge_margin
|
||||
width = dim_y + 2 * edge_margin
|
||||
elif cavity_count == 2:
|
||||
length = 2 * dim_x + 30 + 2 * edge_margin
|
||||
width = dim_y + 2 * edge_margin
|
||||
elif cavity_count == 4:
|
||||
length = 2 * dim_x + 30 + 2 * edge_margin
|
||||
width = 2 * dim_y + 30 + 2 * edge_margin
|
||||
else:
|
||||
length = 4 * dim_x + 90 + 2 * edge_margin
|
||||
width = 2 * dim_y + 30 + 2 * edge_margin
|
||||
|
||||
height = dim_z + 80 # 含冷却系统
|
||||
|
||||
# 体积 mm³ → cm³，再乘钢材密度 7.85 g/cm³，再转 kg
|
||||
# 模架不是实心钢块，取 40% 填充率
|
||||
volume_cm3 = (length * width * height) / 1000
|
||||
weight_kg = volume_cm3 * 7.85 * 0.40 / 1000
|
||||
return max(weight_kg, 50) # 最小 50 kg
|
||||
@@ -13,9 +13,6 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from moldinsight.core.stp_parser import STPParser
|
||||
from moldinsight.core.geometry_analyzer import GeometryAnalyzer
|
||||
from moldinsight.core.mold_generator import MoldCavityGenerator
|
||||
from moldinsight.core.aluminum_foam_mold import AluminumFoamMoldGenerator
|
||||
from moldinsight.core.mold_quality_inspector import AluminumFoamMoldQualityInspector
|
||||
from moldinsight.core.mesh_generator import MeshGenerator
|
||||
from moldinsight.core.multi_scheme_planner import MultiSchemeMoldPlanner
|
||||
from moldinsight.core.cad_exporter import CADExporter
|
||||
@@ -38,9 +35,6 @@ class ProcessingService:
|
||||
def __init__(self):
|
||||
self.stp_parser = STPParser()
|
||||
self.geometry_analyzer = GeometryAnalyzer()
|
||||
self.mold_generator = MoldCavityGenerator(shrinkage_rate=0.005)
|
||||
self.aluminum_foam_generator = AluminumFoamMoldGenerator(shrinkage_rate=0.015, draft_angle=3.0)
|
||||
self.mold_quality_inspector = AluminumFoamMoldQualityInspector()
|
||||
self.mesh_generator = MeshGenerator(quality="medium")
|
||||
self.html_generator = HTMLGenerator()
|
||||
self.storage_service = StorageIntegrationService()
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
"""
|
||||
shared/app_factory.py — FastAPI 应用工厂
|
||||
|
||||
将 moldinsight.py / inventory.py 两个入口的重复引导代码
|
||||
（CORS、日志中间件、startup/shutdown、/health、SPA fallback）
|
||||
收敛到一个工厂函数，消除漂移风险。
|
||||
"""
|
||||
import os
|
||||
import time
|
||||
from pathlib import Path
|
||||
from typing import List, Optional, Callable, Awaitable
|
||||
|
||||
from fastapi import FastAPI, Request
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.responses import JSONResponse, FileResponse
|
||||
|
||||
from shared.config.settings import settings
|
||||
from shared.utils.logger import setup_logging, get_logger, generate_request_id, set_request_id
|
||||
|
||||
setup_logging()
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
def create_app(
|
||||
*,
|
||||
title: str,
|
||||
service_name: str,
|
||||
version: str = "4.0.0",
|
||||
mount_html: bool = False,
|
||||
startup_hooks: Optional[List[Callable[[], Awaitable[None]]]] = None,
|
||||
register_routers: Optional[Callable[[FastAPI], None]] = None,
|
||||
) -> FastAPI:
|
||||
"""创建标准化的 FastAPI 应用实例。
|
||||
|
||||
Args:
|
||||
title: 应用标题
|
||||
service_name: 服务名（用于 /health 响应）
|
||||
version: 版本号
|
||||
mount_html: 是否挂载 /html 静态目录（moldinsight 需要）
|
||||
startup_hooks: 额外的 startup 钩子列表（在数据库/RustFS/Redis 初始化后执行）
|
||||
register_routers: 回调函数，用于注册业务路由
|
||||
"""
|
||||
app = FastAPI(title=title, version=version)
|
||||
|
||||
# ── CORS 白名单 ──────────────────────────────────────────────
|
||||
cors_origins = settings.CORS_ORIGINS or ["*"]
|
||||
if cors_origins == ["*"]:
|
||||
logger.warning(
|
||||
"CORS 使用通配符 ['*']，生产环境请设置 CORS_ORIGINS 环境变量"
|
||||
)
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=cors_origins,
|
||||
allow_credentials=True,
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
# ── 请求日志中间件（结构化 + request_id 追踪）─────────────────
|
||||
@app.middleware("http")
|
||||
async def log_requests(request: Request, call_next):
|
||||
# 生成/提取 request_id
|
||||
rid = request.headers.get("X-Request-ID") or generate_request_id()
|
||||
set_request_id(rid)
|
||||
|
||||
start_time = time.time()
|
||||
response = await call_next(request)
|
||||
duration_ms = round((time.time() - start_time) * 1000, 1)
|
||||
|
||||
# 跳过静态资源和健康检查的详细日志
|
||||
path = request.url.path
|
||||
is_static = path.startswith("/static") or path == "/health"
|
||||
|
||||
if not is_static:
|
||||
log_level = "warning" if response.status_code >= 400 else "info"
|
||||
extra = {
|
||||
"method": request.method,
|
||||
"path": path,
|
||||
"status": response.status_code,
|
||||
"duration_ms": duration_ms,
|
||||
"client_ip": request.client.host if request.client else "-",
|
||||
}
|
||||
getattr(logger, log_level)(
|
||||
f"{request.method} {path} -> {response.status_code} ({duration_ms}ms)",
|
||||
extra=extra,
|
||||
)
|
||||
|
||||
# 注入 X-Request-ID 响应头，方便前端/运维追踪
|
||||
response.headers["X-Request-ID"] = rid
|
||||
return response
|
||||
|
||||
# ── 目录准备 ─────────────────────────────────────────────────
|
||||
Path("uploads").mkdir(exist_ok=True)
|
||||
Path("static").mkdir(exist_ok=True)
|
||||
if mount_html:
|
||||
Path("html_output").mkdir(exist_ok=True)
|
||||
|
||||
# ── 静态文件挂载 ─────────────────────────────────────────────
|
||||
app.mount(
|
||||
"/static",
|
||||
StaticFiles(directory=os.path.join(os.getcwd(), "static")),
|
||||
name="static",
|
||||
)
|
||||
if mount_html:
|
||||
app.mount(
|
||||
"/html",
|
||||
StaticFiles(directory=os.path.join(os.getcwd(), "html_output")),
|
||||
name="html",
|
||||
)
|
||||
|
||||
# ── Startup ──────────────────────────────────────────────────
|
||||
@app.on_event("startup")
|
||||
async def startup_event():
|
||||
from shared.database.init_db import init_database
|
||||
|
||||
success = await init_database(keep_connected=True)
|
||||
print(f"[{'OK' if success else 'FAIL'}] 数据库初始化")
|
||||
|
||||
# RustFS（仅 moldinsight 需要）
|
||||
if mount_html:
|
||||
try:
|
||||
from moldinsight.storage.rustfs_storage import rustfs_manager
|
||||
await rustfs_manager.connect(
|
||||
endpoint=settings.RUSTFS_ENDPOINT,
|
||||
access_key=settings.RUSTFS_ACCESS_KEY,
|
||||
secret_key=settings.RUSTFS_SECRET_KEY,
|
||||
timeout=settings.RUSTFS_TIMEOUT,
|
||||
)
|
||||
print("[OK] RustFS连接成功")
|
||||
except Exception as e:
|
||||
print(f"[WARN] RustFS连接失败: {e}")
|
||||
|
||||
# Redis
|
||||
try:
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
await redis_task_manager.connect()
|
||||
print(f"[{'OK' if redis_task_manager.is_connected else 'WARN'}] Redis")
|
||||
except Exception as e:
|
||||
print(f"[WARN] Redis异常: {e}")
|
||||
|
||||
# 额外钩子
|
||||
for hook in (startup_hooks or []):
|
||||
try:
|
||||
await hook()
|
||||
except Exception as e:
|
||||
print(f"[WARN] startup hook 异常: {e}")
|
||||
|
||||
# ── Shutdown ─────────────────────────────────────────────────
|
||||
@app.on_event("shutdown")
|
||||
async def shutdown_event():
|
||||
try:
|
||||
from shared.services.redis_task_manager import redis_task_manager
|
||||
await redis_task_manager.disconnect()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# ── 认证路由 ─────────────────────────────────────────────────
|
||||
from shared.services.auth_routes import router as auth_router
|
||||
app.include_router(auth_router)
|
||||
|
||||
# ── 业务路由注册 ─────────────────────────────────────────────
|
||||
if register_routers:
|
||||
register_routers(app)
|
||||
|
||||
# ── /health 统一端点 ─────────────────────────────────────────
|
||||
@app.get("/health")
|
||||
@app.post("/health")
|
||||
async def health():
|
||||
from shared.database.database import db_manager
|
||||
from sqlalchemy import text
|
||||
|
||||
db_ok = False
|
||||
db_error = None
|
||||
try:
|
||||
if not db_manager.is_connected:
|
||||
await db_manager.connect()
|
||||
async with db_manager.engine.begin() as conn:
|
||||
await conn.execute(text("SELECT 1"))
|
||||
db_ok = True
|
||||
except Exception as e:
|
||||
db_error = str(e)
|
||||
|
||||
return {
|
||||
"status": "healthy" if db_ok else "degraded",
|
||||
"service": service_name,
|
||||
"version": version,
|
||||
"database_connected": db_ok,
|
||||
"database_error": db_error,
|
||||
}
|
||||
|
||||
# ── SPA fallback（排除 /api 前缀，避免吞掉 API 404）────────
|
||||
@app.get("/{full_path:path}")
|
||||
async def spa_fallback(full_path: str):
|
||||
# API 路径不走 SPA fallback，让 FastAPI 正常返回 404 JSON
|
||||
if full_path.startswith("api/") or full_path.startswith("api"):
|
||||
raise _api_not_found(full_path)
|
||||
# 健康检查 / 文档路径也排除
|
||||
if full_path.startswith("docs") or full_path.startswith("openapi"):
|
||||
raise _api_not_found(full_path)
|
||||
static_index = os.path.join(os.getcwd(), "static", "index.html")
|
||||
if os.path.exists(static_index):
|
||||
return FileResponse(static_index)
|
||||
return JSONResponse({"detail": "SPA index not found"}, status_code=404)
|
||||
|
||||
return app
|
||||
|
||||
|
||||
def _api_not_found(path: str):
|
||||
"""为 API 路径生成标准 404 异常"""
|
||||
from fastapi import HTTPException
|
||||
raise HTTPException(status_code=404, detail=f"Not Found: /{path}")
|
||||
@@ -1,6 +1,6 @@
|
||||
import os
|
||||
import urllib.parse
|
||||
from typing import Dict, Any
|
||||
from typing import Dict, Any, List
|
||||
from dotenv import load_dotenv
|
||||
|
||||
load_dotenv()
|
||||
@@ -75,6 +75,11 @@ class Settings:
|
||||
self.REDIS_PASSWORD = os.getenv("REDIS_PASSWORD", "")
|
||||
self.REDIS_DB = int(os.getenv("REDIS_DB", "0"))
|
||||
|
||||
# CORS 白名单（逗号分隔，默认允许本机开发地址）
|
||||
self.CORS_ORIGINS = self._parse_cors_origins(
|
||||
os.getenv("CORS_ORIGINS", "")
|
||||
)
|
||||
|
||||
# LLM 增强分析配置（可选）
|
||||
self.LLM_ENABLED = os.getenv("LLM_ENABLED", "false").lower() == "true"
|
||||
self.LLM_API_URL = os.getenv("LLM_API_URL", "https://api.openai.com/v1")
|
||||
@@ -95,5 +100,14 @@ class Settings:
|
||||
def allowed_extensions_set(self) -> set:
|
||||
return set(ext.strip() for ext in self.ALLOWED_EXTENSIONS.split(","))
|
||||
|
||||
@staticmethod
|
||||
def _parse_cors_origins(raw: str) -> List[str]:
|
||||
"""解析 CORS_ORIGINS 环境变量，逗号分隔。
|
||||
为空时返回空列表（由 app_factory 决定是否降级为 ['*']）。
|
||||
"""
|
||||
if not raw or not raw.strip():
|
||||
return []
|
||||
return [o.strip().rstrip("/") for o in raw.split(",") if o.strip()]
|
||||
|
||||
|
||||
settings = Settings()
|
||||
|
||||
@@ -13,6 +13,24 @@ from shared.utils.logger import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
def _get_pool_config(role: str = "web") -> dict:
|
||||
"""按角色返回连接池参数。
|
||||
|
||||
web 入口：适中并发；celery worker：少量长连接。
|
||||
通过 DB_POOL_SIZE / DB_MAX_OVERFLOW 环境变量可覆盖默认值。
|
||||
"""
|
||||
defaults = {
|
||||
"web": {"pool_size": 10, "max_overflow": 20},
|
||||
"celery": {"pool_size": 5, "max_overflow": 10},
|
||||
}
|
||||
role_cfg = defaults.get(role, defaults["web"])
|
||||
# 允许环境变量覆盖
|
||||
pool_size = int(os.getenv("DB_POOL_SIZE", str(role_cfg["pool_size"])))
|
||||
max_overflow = int(os.getenv("DB_MAX_OVERFLOW", str(role_cfg["max_overflow"])))
|
||||
return {"pool_size": pool_size, "max_overflow": max_overflow}
|
||||
|
||||
|
||||
class DatabaseManager:
|
||||
"""数据库管理器"""
|
||||
|
||||
@@ -21,21 +39,27 @@ class DatabaseManager:
|
||||
self.async_session = None
|
||||
self.is_connected = False
|
||||
|
||||
async def connect(self):
|
||||
"""连接数据库"""
|
||||
async def connect(self, role: str = "web"):
|
||||
"""连接数据库
|
||||
|
||||
Args:
|
||||
role: 连接角色，"web" 或 "celery"，决定连接池大小
|
||||
"""
|
||||
if not settings.DATABASE_URL:
|
||||
logger.warning("未配置数据库连接，跳过数据库初始化")
|
||||
self.is_connected = False
|
||||
return
|
||||
|
||||
try:
|
||||
pool_cfg = _get_pool_config(role)
|
||||
# 创建异步引擎
|
||||
self.engine = create_async_engine(
|
||||
settings.DATABASE_URL,
|
||||
echo=settings.DEBUG,
|
||||
pool_size=20,
|
||||
max_overflow=30,
|
||||
pool_recycle=3600
|
||||
pool_size=pool_cfg["pool_size"],
|
||||
max_overflow=pool_cfg["max_overflow"],
|
||||
pool_recycle=3600,
|
||||
pool_pre_ping=True, # 自动检测失效连接，避免 PG 断连报错
|
||||
)
|
||||
|
||||
# 创建异步会话工厂
|
||||
@@ -50,7 +74,10 @@ class DatabaseManager:
|
||||
await conn.execute(text("SELECT 1"))
|
||||
|
||||
self.is_connected = True
|
||||
logger.info("数据库连接成功")
|
||||
logger.info(
|
||||
"数据库连接成功 (pool_size=%d, max_overflow=%d)",
|
||||
pool_cfg["pool_size"], pool_cfg["max_overflow"],
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"数据库连接失败: {e}")
|
||||
@@ -66,18 +93,22 @@ class DatabaseManager:
|
||||
|
||||
@asynccontextmanager
|
||||
async def session(self):
|
||||
"""获取数据库会话的异步上下文管理器"""
|
||||
"""获取数据库会话的异步上下文管理器（用于后台任务/Celery）"""
|
||||
if not self.is_connected:
|
||||
await self.connect()
|
||||
|
||||
session = self.async_session()
|
||||
try:
|
||||
yield session
|
||||
await session.commit()
|
||||
except Exception:
|
||||
await session.rollback()
|
||||
raise
|
||||
finally:
|
||||
await session.close()
|
||||
|
||||
async def get_session(self) -> AsyncSession:
|
||||
"""获取数据库会话"""
|
||||
"""获取数据库会话（非上下文管理器，配合 get_db_session 依赖使用）"""
|
||||
if not self.is_connected:
|
||||
await self.connect()
|
||||
|
||||
@@ -100,9 +131,20 @@ db_manager = DatabaseManager()
|
||||
|
||||
# 数据库依赖注入
|
||||
async def get_db_session():
|
||||
"""获取数据库会话的依赖函数"""
|
||||
"""获取数据库会话的依赖函数
|
||||
|
||||
统一事务边界：
|
||||
- 路由正常返回 → 自动 commit
|
||||
- 路由抛出异常 → 自动 rollback
|
||||
|
||||
路由中应使用 flush() 代替 commit()，以便在提交前仍能 refresh()。
|
||||
"""
|
||||
session = await db_manager.get_session()
|
||||
try:
|
||||
yield session
|
||||
await session.commit()
|
||||
except Exception:
|
||||
await session.rollback()
|
||||
raise
|
||||
finally:
|
||||
await session.close()
|
||||
await session.close()
|
||||
|
||||
+121
-13
@@ -1,17 +1,125 @@
|
||||
# utils/logger.py
|
||||
"""
|
||||
shared/utils/logger.py — 结构化日志 + 请求追踪
|
||||
|
||||
功能：
|
||||
- JSON 结构化日志输出（生产友好，方便 ELK/Loki 采集）
|
||||
- request_id 自动注入（通过 contextvars，跨 async 传播）
|
||||
- 向后兼容：get_logger(name) / setup_logging() API 不变
|
||||
- 支持 LOG_FORMAT 环境变量切换（json / text，默认 json）
|
||||
"""
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
import uuid
|
||||
from contextvars import ContextVar
|
||||
from datetime import datetime, timezone
|
||||
from typing import Optional
|
||||
|
||||
def setup_logging():
|
||||
"""设置日志配置"""
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
|
||||
handlers=[
|
||||
logging.StreamHandler(sys.stdout)
|
||||
]
|
||||
)
|
||||
# ── request_id 上下文变量（跨 async task 自动传播）────────────
|
||||
request_id_var: ContextVar[Optional[str]] = ContextVar("request_id", default=None)
|
||||
|
||||
def get_logger(name: str):
|
||||
"""获取日志器"""
|
||||
return logging.getLogger(name)
|
||||
|
||||
def generate_request_id() -> str:
|
||||
"""生成短 request_id（8 位 hex，便于日志阅读）"""
|
||||
return uuid.uuid4().hex[:8]
|
||||
|
||||
|
||||
def set_request_id(rid: Optional[str]) -> None:
|
||||
"""设置当前请求的 request_id"""
|
||||
request_id_var.set(rid)
|
||||
|
||||
|
||||
def get_request_id() -> Optional[str]:
|
||||
"""获取当前请求的 request_id"""
|
||||
return request_id_var.get()
|
||||
|
||||
|
||||
# ── JSON 结构化 Formatter ─────────────────────────────────────
|
||||
class JSONFormatter(logging.Formatter):
|
||||
"""将日志记录格式化为单行 JSON 字符串。
|
||||
|
||||
输出字段：
|
||||
- timestamp: ISO-8601 UTC 时间戳
|
||||
- level: 日志级别
|
||||
- logger: logger 名称
|
||||
- message: 日志消息
|
||||
- request_id: 当前请求 ID（如果有）
|
||||
- module/function/line: 代码位置
|
||||
- exc_info: 异常信息（如果有）
|
||||
"""
|
||||
|
||||
def format(self, record: logging.LogRecord) -> str:
|
||||
log_entry = {
|
||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
||||
"level": record.levelname,
|
||||
"logger": record.name,
|
||||
"message": record.getMessage(),
|
||||
"request_id": request_id_var.get(),
|
||||
"module": record.module,
|
||||
"func": record.funcName,
|
||||
"line": record.lineno,
|
||||
}
|
||||
|
||||
if record.exc_info and record.exc_info[0] is not None:
|
||||
log_entry["exc_info"] = self.formatException(record.exc_info)
|
||||
|
||||
# 支持 extra 字段（通过 logger.info("msg", extra={"key": "val"})）
|
||||
for key in ("method", "path", "status", "duration_ms", "client_ip",
|
||||
"user_agent", "user_id"):
|
||||
val = getattr(record, key, None)
|
||||
if val is not None:
|
||||
log_entry[key] = val
|
||||
|
||||
return json.dumps(log_entry, ensure_ascii=False)
|
||||
|
||||
|
||||
# ── 文本 Formatter（开发环境友好）─────────────────────────────
|
||||
class TextFormatter(logging.Formatter):
|
||||
"""带 request_id 的文本格式，适合本地开发阅读。"""
|
||||
|
||||
def __init__(self):
|
||||
super().__init__(
|
||||
fmt="%(asctime)s [%(levelname)s] %(name)s [rid=%(request_id)s] %(message)s",
|
||||
datefmt="%Y-%m-%d %H:%M:%S",
|
||||
)
|
||||
|
||||
def format(self, record: logging.LogRecord) -> str:
|
||||
if not hasattr(record, "request_id"):
|
||||
record.request_id = request_id_var.get() or "-"
|
||||
return super().format(record)
|
||||
|
||||
|
||||
# ── 公共 API ──────────────────────────────────────────────────
|
||||
def setup_logging(level: Optional[str] = None):
|
||||
"""初始化日志系统。
|
||||
|
||||
Args:
|
||||
level: 日志级别，默认从 LOG_LEVEL 环境变量读取（INFO）
|
||||
|
||||
环境变量：
|
||||
LOG_FORMAT: json（默认）或 text
|
||||
LOG_LEVEL: 日志级别（DEBUG/INFO/WARNING/ERROR）
|
||||
"""
|
||||
log_level = getattr(logging, (level or os.getenv("LOG_LEVEL", "INFO")).upper(), logging.INFO)
|
||||
log_format = os.getenv("LOG_FORMAT", "json").lower()
|
||||
|
||||
formatter = JSONFormatter() if log_format == "json" else TextFormatter()
|
||||
|
||||
handler = logging.StreamHandler(sys.stdout)
|
||||
handler.setFormatter(formatter)
|
||||
|
||||
root = logging.getLogger()
|
||||
root.setLevel(log_level)
|
||||
# 清除已有 handler 避免重复输出
|
||||
root.handlers.clear()
|
||||
root.addHandler(handler)
|
||||
|
||||
# 降低第三方库的日志级别
|
||||
for noisy in ("uvicorn.access", "uvicorn.error", "httpx", "httpcore"):
|
||||
logging.getLogger(noisy).setLevel(logging.WARNING)
|
||||
|
||||
|
||||
def get_logger(name: str) -> logging.Logger:
|
||||
"""获取带模块名的 logger（API 不变，向后兼容）。"""
|
||||
return logging.getLogger(name)
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.batch-file-list[data-v-167d79eb]{margin-top:var(--space-3);border:1px solid var(--border-color);border-radius:var(--radius-sm);padding:var(--space-2)}.batch-file-header[data-v-167d79eb]{margin-bottom:var(--space-2);justify-content:space-between;align-items:center;font-weight:600;display:flex}.batch-file-item[data-v-167d79eb]{align-items:center;gap:var(--space-2);padding:var(--space-1) 0;border-bottom:1px solid var(--border-light);display:flex}.batch-file-item .file-name[data-v-167d79eb]{text-overflow:ellipsis;white-space:nowrap;flex:1;overflow:hidden}.batch-file-item .file-size[data-v-167d79eb]{color:var(--text-secondary);white-space:nowrap;font-size:.85rem}.batch-dashboard[data-v-167d79eb]{margin-top:var(--space-4)}.batch-progress-header[data-v-167d79eb]{margin-bottom:var(--space-2);justify-content:space-between;align-items:flex-start;display:flex}.batch-progress-info h2[data-v-167d79eb]{margin:0 0 var(--space-1)}.batch-progress-info p[data-v-167d79eb]{align-items:center;gap:var(--space-2);margin:0;display:flex}
|
||||
@@ -0,0 +1 @@
|
||||
.customers-tab[data-v-36237339]{padding:0}.table-header[data-v-36237339]{margin-bottom:16px}
|
||||
@@ -0,0 +1 @@
|
||||
import{C as e,D as t,F as n,N as r,P as i,R as a,S as o,T as s,g as c,i as l,j as u,k as d,n as f,r as p,s as m,x as h,y as g}from"./index-BoystVy-.js";import{t as _}from"./useInventory-C7Zfw7oO.js";var v={class:`customers-tab`},y={class:`table-header`},b=f(e({__name:`CustomersTab`,setup(e){let{state:f,loadCustomers:b}=_(),x=i(!1),S=i(null),C=i(!1),w=r({name:``,contact_person:``,phone:``,email:``,address:``});function T(){S.value=null,w.name=``,w.contact_person=``,w.phone=``,w.email=``,w.address=``,x.value=!0}function E(e){S.value=e,w.name=e.name??``,w.contact_person=e.contact_person??``,w.phone=e.phone??``,w.email=e.email??``,w.address=e.address??``,x.value=!0}async function D(){if(!C.value){if(!w.name||!w.name.trim()){p(`请输入客户名称`,`warning`);return}C.value=!0;try{let e={name:w.name,contact_person:w.contact_person||null,phone:w.phone||null,email:w.email||null,address:w.address||null};S.value?(await m(`/api/customers/${S.value.id}`,{method:`PUT`,body:JSON.stringify(e)}),p(`客户更新成功`,`success`)):(await m(`/api/customers`,{method:`POST`,body:JSON.stringify(e)}),p(`客户已创建`,`success`)),x.value=!1,b()}catch(e){l(e,`保存客户`)}finally{C.value=!1}}}async function O(e){if(confirm(`确定要删除这个客户吗？`))try{await m(`/api/customers/${e}`,{method:`DELETE`}),p(`客户已删除`,`success`),b()}catch(e){l(e,`删除客户`)}}return s(()=>{b()}),(e,r)=>{let i=d(`t-button`),s=d(`t-table-column`),l=d(`t-table`),p=d(`t-input`),m=d(`t-form-item`),_=d(`t-form`),b=d(`t-dialog`);return t(),g(`div`,v,[c(`div`,y,[o(i,{type:`primary`,onClick:T},{default:u(()=>[...r[7]||=[h(`+ 新增客户`,-1)]]),_:1})]),o(l,{data:n(f).customers,style:{width:`100%`},loading:n(f).loading,"empty-text":`暂无客户数据`},{default:u(()=>[o(s,{prop:`code`,label:`编码`}),o(s,{prop:`name`,label:`名称`}),o(s,{prop:`contact_person`,label:`联系人`},{default:u(({row:e})=>[h(a(e.contact_person||`-`),1)]),_:1}),o(s,{prop:`phone`,label:`电话`},{default:u(({row:e})=>[h(a(e.phone||`-`),1)]),_:1}),o(s,{prop:`email`,label:`邮箱`},{default:u(({row:e})=>[h(a(e.email||`-`),1)]),_:1}),o(s,{label:`操作`,width:`180`},{default:u(({row:e})=>[o(i,{size:`small`,onClick:t=>E(e)},{default:u(()=>[...r[8]||=[h(`编辑`,-1)]]),_:1},8,[`onClick`]),o(i,{size:`small`,type:`danger`,onClick:t=>O(e.id)},{default:u(()=>[...r[9]||=[h(`删除`,-1)]]),_:1},8,[`onClick`])]),_:1})]),_:1},8,[`data`,`loading`]),o(b,{modelValue:x.value,"onUpdate:modelValue":r[6]||=e=>x.value=e,title:S.value?`编辑客户`:`新增客户`,width:`520px`,"close-on-click-modal":!1},{footer:u(()=>[o(i,{onClick:r[5]||=e=>x.value=!1,disabled:C.value},{default:u(()=>[...r[10]||=[h(`取消`,-1)]]),_:1},8,[`disabled`]),o(i,{type:`primary`,loading:C.value,disabled:C.value,onClick:D},{default:u(()=>[...r[11]||=[h(`保存`,-1)]]),_:1},8,[`loading`,`disabled`])]),default:u(()=>[o(_,{model:w,"label-width":`80px`},{default:u(()=>[o(m,{label:`名称`,required:``},{default:u(()=>[o(p,{modelValue:w.name,"onUpdate:modelValue":r[0]||=e=>w.name=e,placeholder:`请输入客户名称`},null,8,[`modelValue`])]),_:1}),o(m,{label:`联系人`},{default:u(()=>[o(p,{modelValue:w.contact_person,"onUpdate:modelValue":r[1]||=e=>w.contact_person=e,placeholder:`请输入联系人`},null,8,[`modelValue`])]),_:1}),o(m,{label:`电话`},{default:u(()=>[o(p,{modelValue:w.phone,"onUpdate:modelValue":r[2]||=e=>w.phone=e,placeholder:`请输入电话`},null,8,[`modelValue`])]),_:1}),o(m,{label:`邮箱`},{default:u(()=>[o(p,{modelValue:w.email,"onUpdate:modelValue":r[3]||=e=>w.email=e,type:`email`,placeholder:`请输入邮箱`},null,8,[`modelValue`])]),_:1}),o(m,{label:`地址`},{default:u(()=>[o(p,{modelValue:w.address,"onUpdate:modelValue":r[4]||=e=>w.address=e,placeholder:`请输入地址`},null,8,[`modelValue`])]),_:1})]),_:1},8,[`model`])]),_:1},8,[`modelValue`,`title`])])}}}),[[`__scopeId`,`data-v-36237339`]]);export{b as default};
|
||||
@@ -0,0 +1 @@
|
||||
import{C as e,D as t,F as n,O as r,R as i,S as a,_ as o,g as s,j as c,k as l,m as u,y as d}from"./index-BoystVy-.js";import{t as f}from"./useInventory-C7Zfw7oO.js";var p={style:{display:`flex`,"align-items":`center`,gap:`12px`}},m={style:{"font-size":`32px`}},h={style:{"font-size":`24px`,"font-weight":`700`}},g={style:{color:`var(--text-tertiary)`,"font-size":`13px`}},_=e({__name:`DashboardTab`,setup(e){let{state:_,formatCurrency:v}=f();return(e,f)=>{let y=l(`t-card`),b=l(`t-col`),x=l(`t-row`);return t(),o(x,{gutter:16},{default:c(()=>[(t(!0),d(u,null,r([{icon:`📦`,value:n(_).dashboard?.finished_product_count||0,label:`成品数量`},{icon:`📊`,value:n(_).dashboard?.total_stock||0,label:`物料库存总量`},{icon:`💰`,value:n(v)(n(_).dashboard?.total_value||0),label:`库存价值`},{icon:`🏭`,value:n(_).dashboard?.supplier_count||0,label:`供应商`},{icon:`👥`,value:n(_).dashboard?.customer_count||0,label:`客户`},{icon:`🏪`,value:n(_).dashboard?.warehouse_count||0,label:`仓库`}],e=>(t(),o(b,{span:8,key:e.label,style:{"margin-bottom":`16px`}},{default:c(()=>[a(y,{shadow:`hover`},{default:c(()=>[s(`div`,p,[s(`span`,m,i(e.icon),1),s(`div`,null,[s(`div`,h,i(e.value),1),s(`div`,g,i(e.label),1)])])]),_:2},1024)]),_:2},1024))),128))]),_:1})}}});export{_ as default};
|
||||
+1
-1
@@ -1 +1 @@
|
||||
import{E as e,h as t,n,v as r}from"./index-EqJJKSSk.js";var i={};function a(n,i){return e(),r(`div`,null,[...i[0]||=[t(`div`,{class:`page-header`},[t(`h1`,{class:`page-title`},`设计体系`),t(`p`,{class:`page-subtitle`},`迁移中...`)],-1)]])}var o=n(i,[[`render`,a]]);export{o as default};
|
||||
import{D as e,g as t,n,y as r}from"./index-BoystVy-.js";var i={};function a(n,i){return e(),r(`div`,null,[...i[0]||=[t(`div`,{class:`page-header`},[t(`h1`,{class:`page-title`},`设计体系`),t(`p`,{class:`page-subtitle`},`迁移中...`)],-1)]])}var o=n(i,[[`render`,a]]);export{o as default};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.inventory-tab[data-v-37ecfc85]{padding:0}.table-header[data-v-37ecfc85]{margin-bottom:16px}
|
||||
@@ -0,0 +1 @@
|
||||
import{C as e,D as t,F as n,N as r,O as i,P as a,S as o,T as s,_ as c,g as l,i as u,j as d,k as f,m as p,n as m,r as h,s as g,x as _,y as v}from"./index-BoystVy-.js";import{t as y}from"./useInventory-C7Zfw7oO.js";var b={class:`inventory-tab`},x={class:`table-header`},S=m(e({__name:`InventoryTab`,setup(e){let{state:m,loadInventory:S,ensureStockBaseData:C}=y(),w=a(!1),T=a(null),E=a(!1),D=r({product_id:null,warehouse_id:null,quantity:0,locked_quantity:0,batch_no:``,location:``});function O(){C(),T.value=null,D.product_id=null,D.warehouse_id=null,D.quantity=0,D.locked_quantity=0,D.batch_no=``,D.location=``,w.value=!0}function k(e){C(),T.value=e,D.product_id=e.product_id??null,D.warehouse_id=e.warehouse_id??null,D.quantity=e.quantity??0,D.locked_quantity=e.locked_quantity??0,D.batch_no=e.batch_no??``,D.location=e.location??``,w.value=!0}async function A(){if(!E.value){if(!D.product_id){h(`请选择物料`,`warning`);return}if(!D.warehouse_id){h(`请选择仓库`,`warning`);return}if(D.quantity<0){h(`数量不能为负数`,`warning`);return}if(D.locked_quantity>D.quantity){h(`锁定数量不能大于库存数量`,`warning`);return}E.value=!0;try{let e={product_id:D.product_id,warehouse_id:D.warehouse_id,quantity:D.quantity,locked_quantity:D.locked_quantity,batch_no:D.batch_no||null,location:D.location||null};T.value?(await g(`/api/inventory/${T.value.id}`,{method:`PUT`,body:JSON.stringify(e)}),h(`物料库存更新成功`,`success`)):(await g(`/api/inventory`,{method:`POST`,body:JSON.stringify(e)}),h(`物料库存已创建`,`success`)),w.value=!1,S()}catch(e){u(e,`保存物料库存`)}finally{E.value=!1}}}async function j(e){if(confirm(`确定要删除这个物料库存记录吗？`))try{await g(`/api/inventory/${e}`,{method:`DELETE`}),h(`物料库存已删除`,`success`),S()}catch(e){u(e,`删除物料库存`)}}return s(()=>{S()}),(e,r)=>{let a=f(`t-button`),s=f(`t-table-column`),u=f(`t-table`),h=f(`t-option`),g=f(`t-select`),y=f(`t-form-item`),S=f(`t-input-number`),C=f(`t-input`),M=f(`t-form`),N=f(`t-dialog`);return t(),v(`div`,b,[l(`div`,x,[o(a,{type:`primary`,onClick:O},{default:d(()=>[...r[8]||=[_(`+ 新增物料库存`,-1)]]),_:1})]),o(u,{data:n(m).inventory,style:{width:`100%`},loading:n(m).loading,"empty-text":`暂无库存数据`},{default:d(()=>[o(s,{prop:`product_sku`,label:`SKU`}),o(s,{prop:`product_name`,label:`物料`}),o(s,{prop:`warehouse_name`,label:`仓库`}),o(s,{prop:`quantity`,label:`数量`}),o(s,{prop:`available_quantity`,label:`可用`}),o(s,{label:`操作`,width:`180`},{default:d(({row:e})=>[o(a,{size:`small`,onClick:t=>k(e)},{default:d(()=>[...r[9]||=[_(`编辑`,-1)]]),_:1},8,[`onClick`]),o(a,{size:`small`,type:`danger`,onClick:t=>j(e.id)},{default:d(()=>[...r[10]||=[_(`删除`,-1)]]),_:1},8,[`onClick`])]),_:1})]),_:1},8,[`data`,`loading`]),o(N,{modelValue:w.value,"onUpdate:modelValue":r[7]||=e=>w.value=e,title:T.value?`编辑物料库存`:`新增物料库存`,width:`520px`,"close-on-click-modal":!1},{footer:d(()=>[o(a,{onClick:r[6]||=e=>w.value=!1,disabled:E.value},{default:d(()=>[...r[11]||=[_(`取消`,-1)]]),_:1},8,[`disabled`]),o(a,{type:`primary`,loading:E.value,disabled:E.value,onClick:A},{default:d(()=>[...r[12]||=[_(`保存`,-1)]]),_:1},8,[`loading`,`disabled`])]),default:d(()=>[o(M,{model:D,"label-width":`80px`},{default:d(()=>[o(y,{label:`物料`,required:``},{default:d(()=>[o(g,{modelValue:D.product_id,"onUpdate:modelValue":r[0]||=e=>D.product_id=e,placeholder:`请选择物料`,style:{width:`100%`}},{default:d(()=>[(t(!0),v(p,null,i(n(m).materials,e=>(t(),c(h,{key:e.id,label:e.name+(e.sku?` (`+e.sku+`)`:``),value:e.id},null,8,[`label`,`value`]))),128))]),_:1},8,[`modelValue`])]),_:1}),o(y,{label:`仓库`,required:``},{default:d(()=>[o(g,{modelValue:D.warehouse_id,"onUpdate:modelValue":r[1]||=e=>D.warehouse_id=e,placeholder:`请选择仓库`,style:{width:`100%`}},{default:d(()=>[(t(!0),v(p,null,i(n(m).warehouses,e=>(t(),c(h,{key:e.id,label:e.name,value:e.id},null,8,[`label`,`value`]))),128))]),_:1},8,[`modelValue`])]),_:1}),o(y,{label:`数量`,required:``},{default:d(()=>[o(S,{modelValue:D.quantity,"onUpdate:modelValue":r[2]||=e=>D.quantity=e,min:0,style:{width:`100%`}},null,8,[`modelValue`])]),_:1}),o(y,{label:`锁定数量`},{default:d(()=>[o(S,{modelValue:D.locked_quantity,"onUpdate:modelValue":r[3]||=e=>D.locked_quantity=e,min:0,style:{width:`100%`}},null,8,[`modelValue`])]),_:1}),o(y,{label:`批次号`},{default:d(()=>[o(C,{modelValue:D.batch_no,"onUpdate:modelValue":r[4]||=e=>D.batch_no=e,placeholder:`请输入批次号`},null,8,[`modelValue`])]),_:1}),o(y,{label:`库位`},{default:d(()=>[o(C,{modelValue:D.location,"onUpdate:modelValue":r[5]||=e=>D.location=e,placeholder:`请输入库位`},null,8,[`modelValue`])]),_:1})]),_:1},8,[`model`])]),_:1},8,[`modelValue`,`title`])])}}}),[[`__scopeId`,`data-v-37ecfc85`]]);export{S as default};
|
||||
@@ -1 +0,0 @@
|
||||
.sidebar-nav[data-v-8d87a791]{background:var(--bg-primary);border:1px solid var(--border-light);border-radius:var(--radius-lg);padding:var(--space-2)}.sidebar-group[data-v-8d87a791]{margin-bottom:var(--space-2)}.sidebar-group[data-v-8d87a791]:last-child{margin-bottom:0}.sidebar-group-title[data-v-8d87a791]{padding:var(--space-2) var(--space-3);font-size:var(--text-xs);font-weight:var(--font-semibold);color:var(--text-tertiary);text-transform:uppercase;cursor:pointer;-webkit-user-select:none;user-select:none;border-radius:var(--radius-sm);justify-content:space-between;align-items:center;transition:background .15s;display:flex}.sidebar-group-title[data-v-8d87a791]:hover{background:var(--bg-tertiary)}.group-arrow[data-v-8d87a791]{font-size:10px;transition:transform .2s}.sidebar-item[data-v-8d87a791]{height:36px;padding:0 var(--space-3) 0 var(--space-6);margin:1px var(--space-1);font-size:var(--text-sm);color:var(--text-secondary);border-radius:var(--radius-md);cursor:pointer;-webkit-user-select:none;user-select:none;align-items:center;transition:all .15s;display:flex}.sidebar-item[data-v-8d87a791]:hover{background:var(--bg-tertiary);color:var(--text-primary)}.sidebar-item.active[data-v-8d87a791]{background:var(--primary-50);color:var(--primary-600);font-weight:var(--font-medium)}.inventory-tab[data-v-b02ca093]{padding:0}.table-header[data-v-b02ca093]{margin-bottom:16px}.suppliers-tab[data-v-46312435]{padding:0}.table-header[data-v-46312435]{margin-bottom:16px}.customers-tab[data-v-910d60b4]{padding:0}.table-header[data-v-910d60b4]{margin-bottom:16px}.movements-tab[data-v-79f8d5e3],.page-container[data-v-75abaab9]{padding:0}.page-header[data-v-75abaab9]{margin-bottom:var(--space-6)}.page-header h1[data-v-75abaab9]{font-size:var(--text-2xl);font-weight:var(--font-bold);color:var(--text-primary);margin:0}.page-header p[data-v-75abaab9]{color:var(--text-tertiary);margin:var(--space-1) 0 0;font-size:var(--text-sm)}.inventory-layout[data-v-75abaab9]{gap:var(--space-6);align-items:flex-start;display:flex}.inventory-sidebar-wrapper[data-v-75abaab9]{flex-shrink:0;width:200px;position:sticky;top:80px}.inventory-content[data-v-75abaab9]{flex:1;min-width:0}.inventory-content-header[data-v-75abaab9]{margin-bottom:var(--space-4)}.inventory-breadcrumb[data-v-75abaab9]{font-size:var(--text-sm);color:var(--text-tertiary)}.inventory-breadcrumb .sep[data-v-75abaab9]{margin:0 var(--space-2)}.inventory-breadcrumb .current[data-v-75abaab9]{color:var(--text-primary);font-weight:var(--font-medium)}
|
||||
@@ -0,0 +1 @@
|
||||
.sidebar-nav[data-v-80d71466]{background:var(--bg-primary);border:1px solid var(--border-light);border-radius:var(--radius-lg);padding:var(--space-2)}.sidebar-group[data-v-80d71466]{margin-bottom:var(--space-2)}.sidebar-group[data-v-80d71466]:last-child{margin-bottom:0}.sidebar-group-title[data-v-80d71466]{padding:var(--space-2) var(--space-3);font-size:var(--text-xs);font-weight:var(--font-semibold);color:var(--text-tertiary);text-transform:uppercase;cursor:pointer;-webkit-user-select:none;user-select:none;border-radius:var(--radius-sm);justify-content:space-between;align-items:center;transition:background .15s;display:flex}.sidebar-group-title[data-v-80d71466]:hover{background:var(--bg-tertiary)}.group-arrow[data-v-80d71466]{font-size:10px;transition:transform .2s}.sidebar-item[data-v-80d71466]{height:36px;padding:0 var(--space-3) 0 var(--space-6);margin:1px var(--space-1);font-size:var(--text-sm);color:var(--text-secondary);border-radius:var(--radius-md);cursor:pointer;-webkit-user-select:none;user-select:none;align-items:center;transition:all .15s;display:flex}.sidebar-item[data-v-80d71466]:hover{background:var(--bg-tertiary);color:var(--text-primary)}.sidebar-item.active[data-v-80d71466]{background:var(--primary-50);color:var(--primary-600);font-weight:var(--font-medium)}.page-container[data-v-c950e09f]{padding:0}.page-header[data-v-c950e09f]{margin-bottom:var(--space-6)}.page-header h1[data-v-c950e09f]{font-size:var(--text-2xl);font-weight:var(--font-bold);color:var(--text-primary);margin:0}.page-header p[data-v-c950e09f]{color:var(--text-tertiary);margin:var(--space-1) 0 0;font-size:var(--text-sm)}.inventory-layout[data-v-c950e09f]{gap:var(--space-6);align-items:flex-start;display:flex}.inventory-sidebar-wrapper[data-v-c950e09f]{flex-shrink:0;width:200px;position:sticky;top:80px}.inventory-content[data-v-c950e09f]{flex:1;min-width:0}.inventory-content-header[data-v-c950e09f]{margin-bottom:var(--space-4)}.inventory-breadcrumb[data-v-c950e09f]{font-size:var(--text-sm);color:var(--text-tertiary)}.inventory-breadcrumb .sep[data-v-c950e09f]{margin:0 var(--space-2)}.inventory-breadcrumb .current[data-v-c950e09f]{color:var(--text-primary);font-weight:var(--font-medium)}
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
import{A as e,C as t,D as n,E as r,F as i,I as a,O as o,R as s,S as c,T as l,_ as u,c as d,g as f,j as p,k as m,l as h,m as g,n as _,r as v,u as y,v as b,y as x}from"./index-BoystVy-.js";import{t as S}from"./inventory-BVZTHSHW.js";var C={class:`sidebar-nav`},w=[`onClick`],T={class:`group-arrow`},E=[`onClick`],D=_(t({__name:`InventorySidebar`,setup(e){let t=y(),r=S(),{menuGroups:c,openGroups:l,toggleGroup:u}=r,d=e=>{r.activeTab=e,t.push(`/inventory/${e}`)};return(e,t)=>(n(),x(`nav`,C,[(n(!0),x(g,null,o(i(c),e=>(n(),x(`div`,{key:e.key,class:`sidebar-group`},[f(`div`,{class:`sidebar-group-title`,onClick:t=>i(u)(e.key)},[f(`span`,null,s(e.title),1),f(`span`,T,s(i(l)[e.key]?`▾`:`▸`),1)],8,w),i(l)[e.key]?(n(!0),x(g,{key:0},o(e.items,e=>(n(),x(`div`,{key:e.key,class:a([`sidebar-item`,{active:i(r).activeTab===e.key}]),onClick:t=>d(e.key)},s(e.label),11,E))),128)):b(``,!0)]))),128))]))}}),[[`__scopeId`,`data-v-80d71466`]]),O={class:`page-container`},k={class:`inventory-layout`},A={class:`inventory-sidebar-wrapper`},j={class:`inventory-content`},M={class:`inventory-content-header`},N={class:`inventory-breadcrumb`},P={class:`current`},F=_(t({__name:`InventoryView`,setup(t){let a=S(),o=d(),g=y(),_=h(),C=()=>{let e=_.path.split(`/`);return e[e.length-1]||`dashboard`};return e(()=>_.path,()=>{a.activeTab=C()},{immediate:!0}),l(()=>{if(!o.user){g.push(`/login`);return}a.activeTab=C(),a.checkBackendHealth().then(()=>{if(!a.backendDbReady){v(a.backendDbMessage||`业务服务不可用`,`warning`);return}a.loadDashboard()})}),r(()=>{a.destroyPickers()}),(e,t)=>{let r=m(`t-alert`),o=m(`router-view`),l=m(`t-loading`);return n(),x(`div`,O,[t[1]||=f(`div`,{class:`page-header`},[f(`h1`,null,`进销存管理`),f(`p`,null,`库存、采购、销售管理`)],-1),f(`div`,k,[f(`aside`,A,[c(D)]),f(`section`,j,[f(`div`,M,[f(`div`,N,[f(`span`,null,s(i(a).activeMenu?.group?.title||`进销存`),1),t[0]||=f(`span`,{class:`sep`},`/`,-1),f(`span`,P,s(i(a).activeMenu?.item?.label||``),1)])]),i(a).backendDbReady?b(``,!0):(n(),u(r,{key:0,title:i(a).backendDbMessage,theme:`warning`,"show-icon":``,closable:!1,style:{"margin-bottom":`16px`}},null,8,[`title`])),c(l,{loading:i(a).loading},{default:p(()=>[c(o)]),_:1},8,[`loading`])])])])}}}),[[`__scopeId`,`data-v-c950e09f`]]);export{F as default};
|
||||
@@ -0,0 +1 @@
|
||||
import{C as e,D as t,N as n,R as r,S as i,_ as a,g as o,j as s,k as c,n as l,o as u,r as d,s as f,u as p,v as m,x as h,y as g}from"./index-BoystVy-.js";var _={class:`login-container`},v={class:`login-card`},y=l(e({__name:`LoginView`,setup(e){let l=p(),y=n({username:``,password:``,error:``,loading:!1}),b=async()=>{y.error=``,y.loading=!0;try{let e=await f(`/api/auth/login/json`,{method:`POST`,body:JSON.stringify({username:y.username,password:y.password})});u(e.access_token,e.user),d(`登录成功`,`success`),l.push(`/`)}catch(e){y.error=e.message||`登录失败`}finally{y.loading=!1}};return(e,n)=>{let l=c(`t-input`),u=c(`t-form-item`),d=c(`t-alert`),f=c(`t-button`),p=c(`t-form`);return t(),g(`div`,_,[o(`div`,v,[n[2]||=o(`div`,{class:`login-header`},[o(`div`,{class:`login-logo`},`G`),o(`h1`,{class:`login-title`},`Gemold`),o(`p`,{class:`login-subtitle`},`模具制造管理系统`)],-1),i(p,{onSubmit:b},{default:s(()=>[i(u,{label:`用户名`},{default:s(()=>[i(l,{modelValue:y.username,"onUpdate:modelValue":n[0]||=e=>y.username=e,placeholder:`请输入用户名`,clearable:``},null,8,[`modelValue`])]),_:1}),i(u,{label:`密码`},{default:s(()=>[i(l,{modelValue:y.password,"onUpdate:modelValue":n[1]||=e=>y.password=e,type:`password`,placeholder:`请输入密码`,clearable:``},null,8,[`modelValue`])]),_:1}),y.error?(t(),a(d,{key:0,theme:`error`,message:y.error,style:{"margin-bottom":`16px`}},null,8,[`message`])):m(``,!0),i(f,{theme:`primary`,block:``,type:`submit`,loading:y.loading},{default:s(()=>[h(r(y.loading?`登录中...`:`登录`),1)]),_:1},8,[`loading`])]),_:1})])])}}}),[[`__scopeId`,`data-v-c91bfbf2`]]);export{y as default};
|
||||
@@ -1 +0,0 @@
|
||||
import{E as e,I as t,O as n,S as r,_ as i,b as a,g as o,h as s,j as c,k as l,n as u,o as d,r as f,s as p,u as m,v as h,x as g}from"./index-EqJJKSSk.js";var _={class:`login-container`},v={class:`login-card`},y=u(r({__name:`LoginView`,setup(r){let u=m(),y=c({username:``,password:``,error:``,loading:!1}),b=async()=>{y.error=``,y.loading=!0;try{let e=await p(`/api/auth/login/json`,{method:`POST`,body:JSON.stringify({username:y.username,password:y.password})});d(e.access_token,e.user),f(`登录成功`,`success`),u.push(`/`)}catch(e){y.error=e.message||`登录失败`}finally{y.loading=!1}};return(r,c)=>{let u=n(`t-input`),d=n(`t-form-item`),f=n(`t-alert`),p=n(`t-button`),m=n(`t-form`);return e(),h(`div`,_,[s(`div`,v,[c[2]||=s(`div`,{class:`login-header`},[s(`div`,{class:`login-logo`},`G`),s(`h1`,{class:`login-title`},`Gemold`),s(`p`,{class:`login-subtitle`},`模具制造管理系统`)],-1),g(m,{onSubmit:b},{default:l(()=>[g(d,{label:`用户名`},{default:l(()=>[g(u,{modelValue:y.username,"onUpdate:modelValue":c[0]||=e=>y.username=e,placeholder:`请输入用户名`,clearable:``},null,8,[`modelValue`])]),_:1}),g(d,{label:`密码`},{default:l(()=>[g(u,{modelValue:y.password,"onUpdate:modelValue":c[1]||=e=>y.password=e,type:`password`,placeholder:`请输入密码`,clearable:``},null,8,[`modelValue`])]),_:1}),y.error?(e(),o(f,{key:0,theme:`error`,message:y.error,style:{"margin-bottom":`16px`}},null,8,[`message`])):i(``,!0),g(p,{theme:`primary`,block:``,type:`submit`,loading:y.loading},{default:l(()=>[a(t(y.loading?`登录中...`:`登录`),1)]),_:1},8,[`loading`])]),_:1})])])}}}),[[`__scopeId`,`data-v-c91bfbf2`]]);export{y as default};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.movements-tab[data-v-79f8d5e3]{padding:0}
|
||||
@@ -0,0 +1 @@
|
||||
import{C as e,D as t,F as n,R as r,S as i,T as a,j as o,k as s,n as c,x as l,y as u}from"./index-BoystVy-.js";import{t as d}from"./useInventory-C7Zfw7oO.js";var f={class:`movements-tab`},p=c(e({__name:`MovementsTab`,setup(e){let{state:c,loadMovements:p,getMovementTypeLabel:m,getMovementBadgeClass:h,formatDateTime:g}=d(),_=e=>{let t=h(e);return t===`badge-success`?`success`:t===`badge-error`?`danger`:t===`badge-warning`?`warning`:`info`};return a(()=>{p()}),(e,a)=>{let d=s(`t-table-column`),p=s(`t-tag`),h=s(`t-table`);return t(),u(`div`,f,[i(h,{data:n(c).movements,style:{width:`100%`},loading:n(c).loading,"empty-text":`暂无库存变动记录`},{default:o(()=>[i(d,{label:`物料`},{default:o(({row:e})=>[l(r(e.product_name)+r(e.product_sku?` (`+e.product_sku+`)`:``),1)]),_:1}),i(d,{label:`类型`,width:`140`},{default:o(({row:e})=>[i(p,{type:_(e.movement_type),size:`small`},{default:o(()=>[l(r(n(m)(e.movement_type)),1)]),_:2},1032,[`type`])]),_:1}),i(d,{prop:`quantity`,label:`数量`,width:`80`}),i(d,{prop:`before_quantity`,label:`变动前`,width:`80`}),i(d,{prop:`after_quantity`,label:`变动后`,width:`80`}),i(d,{label:`时间`,width:`180`},{default:o(({row:e})=>[l(r(n(g)(e.created_at)),1)]),_:1})]),_:1},8,[`data`,`loading`])])}}}),[[`__scopeId`,`data-v-79f8d5e3`]]);export{p as default};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
import{E as e,h as t,n,v as r}from"./index-EqJJKSSk.js";var i={};function a(n,i){return e(),r(`div`,null,[...i[0]||=[t(`div`,{class:`page-header`},[t(`h1`,{class:`page-title`},`灰度发布与回滚`),t(`p`,{class:`page-subtitle`},`迁移中...`)],-1)]])}var o=n(i,[[`render`,a]]);export{o as default};
|
||||
import{D as e,g as t,n,y as r}from"./index-BoystVy-.js";var i={};function a(n,i){return e(),r(`div`,null,[...i[0]||=[t(`div`,{class:`page-header`},[t(`h1`,{class:`page-title`},`灰度发布与回滚`),t(`p`,{class:`page-subtitle`},`迁移中...`)],-1)]])}var o=n(i,[[`render`,a]]);export{o as default};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.suppliers-tab[data-v-e8c22e24]{padding:0}.table-header[data-v-e8c22e24]{margin-bottom:16px}
|
||||
@@ -0,0 +1 @@
|
||||
import{C as e,D as t,F as n,N as r,P as i,R as a,S as o,T as s,g as c,i as l,j as u,k as d,n as f,r as p,s as m,x as h,y as g}from"./index-BoystVy-.js";import{t as _}from"./useInventory-C7Zfw7oO.js";var v={class:`suppliers-tab`},y={class:`table-header`},b=f(e({__name:`SuppliersTab`,setup(e){let{state:f,loadSuppliers:b}=_(),x=i(!1),S=i(null),C=i(!1),w=r({name:``,contact_person:``,phone:``,email:``,address:``});function T(){S.value=null,w.name=``,w.contact_person=``,w.phone=``,w.email=``,w.address=``,x.value=!0}function E(e){S.value=e,w.name=e.name??``,w.contact_person=e.contact_person??``,w.phone=e.phone??``,w.email=e.email??``,w.address=e.address??``,x.value=!0}async function D(){if(!C.value){if(!w.name||!w.name.trim()){p(`请输入供应商名称`,`warning`);return}C.value=!0;try{let e={name:w.name,contact_person:w.contact_person||null,phone:w.phone||null,email:w.email||null,address:w.address||null};S.value?(await m(`/api/suppliers/${S.value.id}`,{method:`PUT`,body:JSON.stringify(e)}),p(`供应商更新成功`,`success`)):(await m(`/api/suppliers`,{method:`POST`,body:JSON.stringify(e)}),p(`供应商已创建`,`success`)),x.value=!1,b()}catch(e){l(e,`保存供应商`)}finally{C.value=!1}}}async function O(e){if(confirm(`确定要删除这个供应商吗？`))try{await m(`/api/suppliers/${e}`,{method:`DELETE`}),p(`供应商已删除`,`success`),b()}catch(e){l(e,`删除供应商`)}}return s(()=>{b()}),(e,r)=>{let i=d(`t-button`),s=d(`t-table-column`),l=d(`t-table`),p=d(`t-input`),m=d(`t-form-item`),_=d(`t-form`),b=d(`t-dialog`);return t(),g(`div`,v,[c(`div`,y,[o(i,{type:`primary`,onClick:T},{default:u(()=>[...r[7]||=[h(`+ 新增供应商`,-1)]]),_:1})]),o(l,{data:n(f).suppliers,style:{width:`100%`},loading:n(f).loading,"empty-text":`暂无供应商数据`},{default:u(()=>[o(s,{prop:`code`,label:`编码`}),o(s,{prop:`name`,label:`名称`}),o(s,{prop:`contact_person`,label:`联系人`},{default:u(({row:e})=>[h(a(e.contact_person||`-`),1)]),_:1}),o(s,{prop:`phone`,label:`电话`},{default:u(({row:e})=>[h(a(e.phone||`-`),1)]),_:1}),o(s,{prop:`email`,label:`邮箱`},{default:u(({row:e})=>[h(a(e.email||`-`),1)]),_:1}),o(s,{label:`操作`,width:`180`},{default:u(({row:e})=>[o(i,{size:`small`,onClick:t=>E(e)},{default:u(()=>[...r[8]||=[h(`编辑`,-1)]]),_:1},8,[`onClick`]),o(i,{size:`small`,type:`danger`,onClick:t=>O(e.id)},{default:u(()=>[...r[9]||=[h(`删除`,-1)]]),_:1},8,[`onClick`])]),_:1})]),_:1},8,[`data`,`loading`]),o(b,{modelValue:x.value,"onUpdate:modelValue":r[6]||=e=>x.value=e,title:S.value?`编辑供应商`:`新增供应商`,width:`520px`,"close-on-click-modal":!1},{footer:u(()=>[o(i,{onClick:r[5]||=e=>x.value=!1,disabled:C.value},{default:u(()=>[...r[10]||=[h(`取消`,-1)]]),_:1},8,[`disabled`]),o(i,{type:`primary`,loading:C.value,disabled:C.value,onClick:D},{default:u(()=>[...r[11]||=[h(`保存`,-1)]]),_:1},8,[`loading`,`disabled`])]),default:u(()=>[o(_,{model:w,"label-width":`80px`},{default:u(()=>[o(m,{label:`名称`,required:``},{default:u(()=>[o(p,{modelValue:w.name,"onUpdate:modelValue":r[0]||=e=>w.name=e,placeholder:`请输入供应商名称`},null,8,[`modelValue`])]),_:1}),o(m,{label:`联系人`},{default:u(()=>[o(p,{modelValue:w.contact_person,"onUpdate:modelValue":r[1]||=e=>w.contact_person=e,placeholder:`请输入联系人`},null,8,[`modelValue`])]),_:1}),o(m,{label:`电话`},{default:u(()=>[o(p,{modelValue:w.phone,"onUpdate:modelValue":r[2]||=e=>w.phone=e,placeholder:`请输入电话`},null,8,[`modelValue`])]),_:1}),o(m,{label:`邮箱`},{default:u(()=>[o(p,{modelValue:w.email,"onUpdate:modelValue":r[3]||=e=>w.email=e,type:`email`,placeholder:`请输入邮箱`},null,8,[`modelValue`])]),_:1}),o(m,{label:`地址`},{default:u(()=>[o(p,{modelValue:w.address,"onUpdate:modelValue":r[4]||=e=>w.address=e,placeholder:`请输入地址`},null,8,[`modelValue`])]),_:1})]),_:1},8,[`model`])]),_:1},8,[`modelValue`,`title`])])}}}),[[`__scopeId`,`data-v-e8c22e24`]]);export{b as default};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
import{t as e}from"./inventory-BVZTHSHW.js";function t(){return e()}export{t};
|
||||
+1
-1
@@ -61,7 +61,7 @@
|
||||
} catch (e) {}
|
||||
})();
|
||||
</script>
|
||||
<script type="module" crossorigin src="/static/assets/index-EqJJKSSk.js"></script>
|
||||
<script type="module" crossorigin src="/static/assets/index-BoystVy-.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/static/assets/index-9snwVMjk.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>历史记录 - STP 模具几何分析中心</title>
|
||||
<meta name="description" content="查看所有已处理的STP文件历史记录和分析任务">
|
||||
<meta name="keywords" content="STP历史记录,分析任务,文件管理">
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
<link rel="preconnect" href="https://unpkg.com">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
||||
<!-- Vue3 + Vue Router via CDN -->
|
||||
<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>
|
||||
<script src="https://unpkg.com/vue-router@4/dist/vue-router.global.prod.js"></script>
|
||||
<script src="/static/vue-app.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,28 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>STP 模具几何分析中心 - 仪表盘</title>
|
||||
<meta name="description" content="专业的STP/STEP文件几何分析工具，支持模具型腔自动生成和工艺参数计算">
|
||||
<meta name="keywords" content="STP,STEP,模具分析,几何分析,型腔设计">
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
<link rel="preconnect" href="https://unpkg.com">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
||||
<!-- Vue3 + Vue Router via CDN -->
|
||||
<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>
|
||||
<script src="https://unpkg.com/vue-router@4/dist/vue-router.global.prod.js"></script>
|
||||
<script src="/static/vue-app.js"></script>
|
||||
|
||||
<!-- 预加载关键资源 -->
|
||||
<script>
|
||||
// 页面加载优化
|
||||
window.addEventListener('load', function() {
|
||||
console.log('STP模具分析中心已加载完成');
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,20 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>分析结果 - STP 模具几何分析中心</title>
|
||||
<meta name="description" content="查看详细的STP文件几何分析结果，包括模具型腔参数和工艺建议">
|
||||
<meta name="keywords" content="STP分析结果,模具参数,几何分析报告">
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
<link rel="preconnect" href="https://unpkg.com">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
||||
<!-- Vue3 + Vue Router via CDN -->
|
||||
<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>
|
||||
<script src="https://unpkg.com/vue-router@4/dist/vue-router.global.prod.js"></script>
|
||||
<script src="/static/vue-app.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
+92
-65
@@ -16,10 +16,13 @@ from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, Asyn
|
||||
from sqlalchemy import select
|
||||
|
||||
from fastapi import FastAPI, APIRouter
|
||||
from api.inventory import inventory_router
|
||||
from models.database import Base, User, Customer, Warehouse, Supplier, Product, ProductMaterial, Inventory
|
||||
from database.database import get_db_session
|
||||
from services.auth_service import get_current_active_user
|
||||
from inventory.api import inventory_router
|
||||
from shared.models.database import (
|
||||
Base, User, Customer, Warehouse, Supplier, Product, ProductMaterial,
|
||||
Inventory, MaterialSupplier, SalesOrder, SalesOrderItem,
|
||||
)
|
||||
from shared.database.database import get_db_session
|
||||
from shared.services.auth_service import get_current_active_user
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
@@ -48,69 +51,93 @@ async def async_engine(sqlite_db_path):
|
||||
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
async def db_session(async_engine):
|
||||
async def seeded_db(async_engine):
|
||||
"""每个测试前清空所有表并重新播种，确保隔离。"""
|
||||
session_factory = async_sessionmaker(async_engine, class_=AsyncSession, expire_on_commit=False)
|
||||
async with session_factory() as session:
|
||||
# 按 FK 依赖逆序清空所有表
|
||||
for table in reversed(Base.metadata.sorted_tables):
|
||||
await session.execute(table.delete())
|
||||
await session.commit()
|
||||
|
||||
async with session_factory() as session:
|
||||
user = User(
|
||||
id=1,
|
||||
username="tester",
|
||||
email="tester@example.com",
|
||||
hashed_password="x",
|
||||
full_name="Tester",
|
||||
is_active=True,
|
||||
)
|
||||
customer = Customer(id=1, code="C001", name="客户A", is_active=True)
|
||||
supplier = Supplier(id=1, code="S001", name="供应商A", is_active=True)
|
||||
warehouse = Warehouse(id=1, code="W001", name="默认仓库", is_active=True, is_default=True)
|
||||
|
||||
material = Product(
|
||||
id=1,
|
||||
sku="MAT-001",
|
||||
name="钢材",
|
||||
unit="kg",
|
||||
item_type="material",
|
||||
cost_price=10.0,
|
||||
sale_price=0,
|
||||
min_stock=0,
|
||||
max_stock=100000,
|
||||
is_active=True,
|
||||
)
|
||||
finished = Product(
|
||||
id=2,
|
||||
sku="MOLD-STD",
|
||||
name="标准模具",
|
||||
unit="套",
|
||||
item_type="finished",
|
||||
cost_price=0,
|
||||
sale_price=1000.0,
|
||||
min_stock=0,
|
||||
max_stock=0,
|
||||
is_active=True,
|
||||
)
|
||||
# 成品无 BOM，用于测试 BOM 缺失路径
|
||||
finished_no_bom = Product(
|
||||
id=3,
|
||||
sku="MOLD-NB",
|
||||
name="无BOM成品",
|
||||
unit="套",
|
||||
item_type="finished",
|
||||
cost_price=0,
|
||||
sale_price=500.0,
|
||||
min_stock=0,
|
||||
max_stock=0,
|
||||
is_active=True,
|
||||
)
|
||||
bom = ProductMaterial(
|
||||
id=1,
|
||||
finished_product_id=finished.id,
|
||||
material_product_id=material.id,
|
||||
quantity=2.0,
|
||||
loss_rate=0.05,
|
||||
)
|
||||
inv = Inventory(
|
||||
id=1,
|
||||
product_id=material.id,
|
||||
warehouse_id=warehouse.id,
|
||||
quantity=1000,
|
||||
locked_quantity=0,
|
||||
)
|
||||
# 物料-供应商关联（用于采购需求推导测试）
|
||||
ms = MaterialSupplier(
|
||||
id=1,
|
||||
product_id=material.id,
|
||||
supplier_id=supplier.id,
|
||||
is_primary=True,
|
||||
lead_time=7,
|
||||
)
|
||||
|
||||
session.add_all([user, customer, supplier, warehouse, material, finished, finished_no_bom, bom, inv, ms])
|
||||
await session.commit()
|
||||
|
||||
async with session_factory() as session:
|
||||
yield session
|
||||
await session.rollback()
|
||||
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
async def seeded_db(db_session: AsyncSession):
|
||||
user = User(
|
||||
id=1,
|
||||
username="tester",
|
||||
email="tester@example.com",
|
||||
hashed_password="x",
|
||||
full_name="Tester",
|
||||
is_active=True,
|
||||
)
|
||||
customer = Customer(id=1, code="C001", name="客户A", is_active=True)
|
||||
supplier = Supplier(id=1, code="S001", name="供应商A", is_active=True)
|
||||
warehouse = Warehouse(id=1, code="W001", name="默认仓库", is_active=True, is_default=True)
|
||||
|
||||
material = Product(
|
||||
id=1,
|
||||
sku="MAT-001",
|
||||
name="钢材",
|
||||
unit="kg",
|
||||
item_type="material",
|
||||
cost_price=10.0,
|
||||
sale_price=0,
|
||||
min_stock=0,
|
||||
max_stock=100000,
|
||||
is_active=True,
|
||||
)
|
||||
finished = Product(
|
||||
id=2,
|
||||
sku="MOLD-STD",
|
||||
name="标准模具",
|
||||
unit="套",
|
||||
item_type="finished",
|
||||
cost_price=0,
|
||||
sale_price=1000.0,
|
||||
min_stock=0,
|
||||
max_stock=0,
|
||||
is_active=True,
|
||||
)
|
||||
bom = ProductMaterial(
|
||||
id=1,
|
||||
finished_product_id=finished.id,
|
||||
material_product_id=material.id,
|
||||
quantity=2.0,
|
||||
loss_rate=0.05,
|
||||
)
|
||||
inv = Inventory(
|
||||
id=1,
|
||||
product_id=material.id,
|
||||
warehouse_id=warehouse.id,
|
||||
quantity=1000,
|
||||
locked_quantity=0,
|
||||
)
|
||||
|
||||
db_session.add_all([user, customer, supplier, warehouse, material, finished, bom, inv])
|
||||
await db_session.commit()
|
||||
return {"user": user, "customer": customer, "supplier": supplier, "warehouse": warehouse, "material": material, "finished": finished}
|
||||
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
@@ -132,7 +159,7 @@ async def client(async_engine, seeded_db):
|
||||
test_app.dependency_overrides[get_db_session] = override_get_db_session
|
||||
test_app.dependency_overrides[get_current_active_user] = override_get_current_active_user
|
||||
|
||||
transport = ASGITransport(app=test_app, lifespan="off")
|
||||
transport = ASGITransport(app=test_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://test") as ac:
|
||||
yield ac
|
||||
|
||||
|
||||
@@ -5,9 +5,8 @@ import pytest
|
||||
async def test_inventory_list_returns_only_materials(client):
|
||||
resp = await client.get("/api/inventory")
|
||||
assert resp.status_code == 200
|
||||
rows = resp.json()
|
||||
rows = resp.json()["items"]
|
||||
assert any(r["product_sku"] == "MAT-001" for r in rows)
|
||||
assert all(r["item_type"] == "material" for r in rows)
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
@@ -21,8 +20,8 @@ async def test_purchase_order_create_and_receive_flow(client):
|
||||
resp = await client.post("/api/purchase-orders", json=create_payload)
|
||||
assert resp.status_code == 201
|
||||
order = resp.json()
|
||||
assert order["status"] == "draft"
|
||||
assert order["total_amount"] == 50.0
|
||||
assert order["status"] == "pending"
|
||||
assert float(order["total_amount"]) == 49995.0
|
||||
|
||||
order_id = order["id"]
|
||||
detail = await client.get(f"/api/purchase-orders/{order_id}")
|
||||
@@ -106,22 +105,24 @@ async def test_sales_order_bom_plan_and_auto_issue(client):
|
||||
items = plan.json()["items"]
|
||||
assert len(items) == 1
|
||||
assert items[0]["material_sku"] == "MAT-001"
|
||||
assert items[0]["required_quantity"] == 3
|
||||
assert items[0]["shortage_quantity"] == 0
|
||||
assert int(items[0]["required_quantity"]) == 3
|
||||
assert int(items[0]["shortage_quantity"]) == 0
|
||||
|
||||
movements = await client.get("/api/stock-movements", params={"product_id": 1})
|
||||
assert movements.status_code == 200
|
||||
assert any(m["movement_type"] == "issue_to_production" for m in movements.json())
|
||||
mov_items = movements.json()["items"] if isinstance(movements.json(), dict) else movements.json()
|
||||
assert any(m["movement_type"] == "issue_to_production" for m in mov_items)
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_sales_order_create_rejected_when_material_short(client):
|
||||
inv_list = await client.get("/api/inventory")
|
||||
inv_id = next(r["inventory_id"] for r in inv_list.json() if r["product_sku"] == "MAT-001")
|
||||
inv_resp = await client.get("/api/inventory")
|
||||
inv_items = inv_resp.json()["items"]
|
||||
inv_id = next(r["id"] for r in inv_items if r["product_sku"] == "MAT-001")
|
||||
|
||||
set_zero = await client.put(
|
||||
f"/api/inventory/{inv_id}",
|
||||
json={"quantity": 0, "locked_quantity": 0, "batch_number": None, "location": None},
|
||||
json={"quantity": 0, "locked_quantity": 0},
|
||||
)
|
||||
assert set_zero.status_code == 200
|
||||
|
||||
@@ -173,7 +174,7 @@ async def test_sales_order_item_semantic_validation(payload, client):
|
||||
)
|
||||
async def test_purchase_order_validation(payload, client):
|
||||
resp = await client.post("/api/purchase-orders", json=payload)
|
||||
assert resp.status_code in {400, 422}
|
||||
assert resp.status_code in {400, 404, 422}
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
|
||||
@@ -0,0 +1,134 @@
|
||||
"""采购需求推导集成测试
|
||||
|
||||
覆盖 P4-4 新功能：POST /api/purchase-demands/calculate
|
||||
- 正常推导（有 BOM、有库存、有供应商）
|
||||
- 库存不足时的缺口计算
|
||||
- 无效销售订单 → 404
|
||||
- 成品无 BOM → 空结果
|
||||
- 空 sales_order_ids → 422
|
||||
"""
|
||||
import pytest
|
||||
|
||||
|
||||
async def _get_inventory_id(client, sku: str) -> int:
|
||||
"""从分页 API 获取库存记录 ID"""
|
||||
resp = await client.get("/api/inventory")
|
||||
items = resp.json()["items"]
|
||||
return next(r["id"] for r in items if r["product_sku"] == sku)
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_purchase_demand_basic_no_shortage(client):
|
||||
"""库存充足时：需求量正确计算，缺口为 0"""
|
||||
# 创建销售订单：1 套标准模具（自动发料 3 单位，库存从 1000 → 997）
|
||||
so_resp = await client.post("/api/sales-orders", json={
|
||||
"customer_id": 1,
|
||||
"items": [{"product_id": 2, "quantity": 1, "unit_price": 1000.0}],
|
||||
})
|
||||
assert so_resp.status_code == 201, so_resp.text
|
||||
so_id = so_resp.json()["id"]
|
||||
|
||||
# 重置库存为 1000（覆盖发料消耗）
|
||||
inv_id = await _get_inventory_id(client, "MAT-001")
|
||||
await client.put(f"/api/inventory/{inv_id}", json={
|
||||
"quantity": 1000, "locked_quantity": 0,
|
||||
})
|
||||
|
||||
# 调用采购需求推导
|
||||
resp = await client.post("/api/purchase-demands/calculate", json={
|
||||
"sales_order_ids": [so_id],
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
|
||||
assert data["source_order_ids"] == [so_id]
|
||||
assert len(data["source_order_nos"]) == 1
|
||||
assert len(data["items"]) == 1
|
||||
|
||||
item = data["items"][0]
|
||||
assert item["material_sku"] == "MAT-001"
|
||||
# BOM: qty=2, loss_rate=0.05 → ceil(1*2*1.05) = ceil(2.1) = 3
|
||||
# Decimal 在 JSON 中可能序列化为字符串，用 int() 转换
|
||||
assert int(item["required_quantity"]) == 3
|
||||
# 库存 1000 > 需求 3，无缺口
|
||||
assert int(item["shortage_quantity"]) == 0
|
||||
assert float(item["estimated_cost"]) == 0
|
||||
# 推荐供应商（seeded_db 中 MaterialSupplier is_primary=True, lead_time=7）
|
||||
assert item["suggested_supplier_name"] == "供应商A"
|
||||
assert item["supplier_lead_time"] == 7
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_purchase_demand_with_shortage(client):
|
||||
"""库存不足时：缺口 = 需求 - 库存，预计金额 = 缺口 × 单价"""
|
||||
# 创建销售订单：1 套标准模具（自动发料 3 单位，库存从 1000 → 997）
|
||||
so_resp = await client.post("/api/sales-orders", json={
|
||||
"customer_id": 1,
|
||||
"items": [{"product_id": 2, "quantity": 1, "unit_price": 1000.0}],
|
||||
})
|
||||
assert so_resp.status_code == 201, so_resp.text
|
||||
so_id = so_resp.json()["id"]
|
||||
|
||||
# 将库存设为 0（完全缺货）
|
||||
inv_id = await _get_inventory_id(client, "MAT-001")
|
||||
await client.put(f"/api/inventory/{inv_id}", json={
|
||||
"quantity": 0, "locked_quantity": 0,
|
||||
})
|
||||
|
||||
# 调用采购需求推导
|
||||
resp = await client.post("/api/purchase-demands/calculate", json={
|
||||
"sales_order_ids": [so_id],
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
|
||||
item = data["items"][0]
|
||||
# BOM: qty=2, loss_rate=0.05 → ceil(1*2*1.05) = ceil(2.1) = 3
|
||||
assert int(item["required_quantity"]) == 3
|
||||
# 库存 0
|
||||
assert int(item["available_quantity"]) == 0
|
||||
# 缺口 = 3 - 0 = 3
|
||||
assert int(item["shortage_quantity"]) == 3
|
||||
# 预计金额 = 3 × 10.0 = 30.0
|
||||
assert float(item["estimated_cost"]) == 30.0
|
||||
assert float(data["total_estimated_cost"]) == 30.0
|
||||
assert data["shortage_count"] == 1
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_purchase_demand_invalid_order_ids(client):
|
||||
"""不存在的销售订单 ID → 404"""
|
||||
resp = await client.post("/api/purchase-demands/calculate", json={
|
||||
"sales_order_ids": [99999],
|
||||
})
|
||||
assert resp.status_code == 404
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_purchase_demand_no_bom_returns_empty(client):
|
||||
"""成品无 BOM 关联时，推导结果为空"""
|
||||
# product_id=3 是无 BOM 的成品（MOLD-NB）
|
||||
so_resp = await client.post("/api/sales-orders", json={
|
||||
"customer_id": 1,
|
||||
"items": [{"product_id": 3, "quantity": 1, "unit_price": 500.0}],
|
||||
})
|
||||
assert so_resp.status_code == 201, so_resp.text
|
||||
so_id = so_resp.json()["id"]
|
||||
|
||||
resp = await client.post("/api/purchase-demands/calculate", json={
|
||||
"sales_order_ids": [so_id],
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert data["items"] == []
|
||||
assert float(data["total_estimated_cost"]) == 0
|
||||
assert data["shortage_count"] == 0
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_purchase_demand_empty_request_validation(client):
|
||||
"""空 sales_order_ids 列表 → 422 schema 校验失败"""
|
||||
resp = await client.post("/api/purchase-demands/calculate", json={
|
||||
"sales_order_ids": [],
|
||||
})
|
||||
assert resp.status_code == 422
|
||||
@@ -30,12 +30,13 @@ async def test_delivered_sales_order_cannot_be_updated_or_deleted(client):
|
||||
assert status_resp.status_code == 200
|
||||
|
||||
update_resp = await client.put(f"/api/sales-orders/{order_id}", json=payload)
|
||||
assert update_resp.status_code == 400
|
||||
assert update_resp.status_code == 400 # 已交付订单禁止修改（服务层守卫）
|
||||
|
||||
delete_resp = await client.delete(f"/api/sales-orders/{order_id}")
|
||||
assert delete_resp.status_code == 400
|
||||
|
||||
patch_resp = await client.patch(f"/api/sales-orders/{order_id}/status", json={"status": "paid"})
|
||||
# delivered → paid 是允许的（业务上先交货再收款），但 delivered → manufacturing 不允许
|
||||
patch_resp = await client.patch(f"/api/sales-orders/{order_id}/status", json={"status": "manufacturing"})
|
||||
assert patch_resp.status_code == 400
|
||||
|
||||
|
||||
@@ -75,4 +76,4 @@ async def test_non_delivered_sales_order_can_be_updated(client):
|
||||
}
|
||||
update_resp = await client.put(f"/api/sales-orders/{order_id}", json=payload2)
|
||||
assert update_resp.status_code == 200
|
||||
assert update_resp.json()["total_amount"] == 4000.0
|
||||
assert float(update_resp.json()["total_amount"]) == 4000.0
|
||||
|
||||
Reference in New Issue
Block a user