duxingchen/KCGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bom表逻辑和出库选单内容

Browse Source
This commit is contained in:
dxc
2026-02-12 10:39:21 +08:00
parent b93a565c82
commit d61668bc4b
8 changed files with 838 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
inventory-backend/app/api/v1/bom.py
View File

@ -8,14 +8,16 @@ from sqlalchemy import distinct
bom_bp = Blueprint('bom', __name__)
# ==================== 新版 BOM 接口（基于 bom_no） ====================
@bom_bp.route('/list', methods=['GET'])
@jwt_required()
def get_bom_list():
"""获取所有 BOM 配方列表（按 bom_no 分组）"""
"""获取所有 BOM 配方列表（按 bom_no 分组），支持 keyword 搜索"""
try:
data = BomService.get_bom_list()
keyword = request.args.get('keyword', '').strip()
data = BomService.get_bom_list(keyword=keyword)
return jsonify({
'code': 200,
'msg': 'success',
@ -25,6 +27,7 @@ def get_bom_list():
current_app.logger.error(f'获取BOM列表失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
@bom_bp.route('/detail/<bom_no>', methods=['GET'])
@jwt_required()
def get_bom_detail(bom_no):
@ -42,16 +45,21 @@ def get_bom_detail(bom_no):
current_app.logger.error(f'获取BOM详情失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
@bom_bp.route('/save', methods=['POST'])
@jwt_required()
def save_bom():
"""保存或更新 BOM 配方（支持新建和另存为新版本）"""
"""保存或更新 BOM 配方（支持自定义 bom_no）"""
try:
req_data = request.get_json()
# 必需字段校验
if 'parent_id' not in req_data or 'children' not in req_data:
return jsonify({'code': 400, 'msg': '缺少 parent_id 或 children 字段'}), 400
# 校验 bom_no 不能为空（如果前端要求必须填）
if 'bom_no' in req_data and not req_data['bom_no']:
return jsonify({'code': 400, 'msg': 'BOM编号不能为空'}), 400
bom_no = BomService.save_bom(req_data)
return jsonify({
'code': 200,
@ -64,6 +72,7 @@ def save_bom():
current_app.logger.error(f'保存BOM失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
@bom_bp.route('/stock/<bom_no>', methods=['GET'])
@jwt_required()
def get_bom_with_stock_by_no(bom_no):
@ -81,6 +90,7 @@ def get_bom_with_stock_by_no(bom_no):
current_app.logger.error(f'获取BOM库存信息失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
# ==================== 删除BOM接口（根据bom_no删除整个配方） ====================
@bom_bp.route('/<bom_no>', methods=['DELETE'])
@ -104,6 +114,7 @@ def delete_bom(bom_no):
current_app.logger.error(f'删除BOM失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
# ==================== 兼容旧接口（保留不改动现有前端） ====================
@bom_bp.route('/<int:parent_id>', methods=['GET'])
@ -120,6 +131,7 @@ def get_bom(parent_id):
current_app.logger.error(f'获取BOM失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
@bom_bp.route('', methods=['POST'])
@jwt_required()
def save_bom_legacy():
@ -140,6 +152,7 @@ def save_bom_legacy():
current_app.logger.error(f'保存BOM失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
@bom_bp.route('/base/list', methods=['GET'])
@jwt_required()
def get_material_base_list():
@ -156,6 +169,7 @@ def get_material_base_list():
current_app.logger.error(f'获取基础物料列表失败: {str(e)}')
return jsonify({'code': 500, 'msg': '内部服务器错误'}), 500
@bom_bp.route('/parents', methods=['GET'])
@jwt_required()
def get_bom_parents():

76
inventory-backend/app/services/bom_service.py
View File

@ -2,32 +2,76 @@ from app.extensions import db
from app.models.bom import BomTable
from app.models.base import MaterialBase
from app.models.inbound.buy import StockBuy
from sqlalchemy import func, distinct
from sqlalchemy import func, distinct, or_
import uuid
from datetime import datetime
class BomService:
# ====================== 新版 BOM 逻辑（基于 bom_no） ======================
@staticmethod
def generate_bom_no():
"""生成唯一的 BOM 编号"""
"""生成唯一的 BOM 编号 (作为默认备选)"""
timestamp = datetime.now().strftime('%Y%m%d%H%M%S')
unique = str(uuid.uuid4())[:8]
return f'BOM-{timestamp}-{unique}'
@staticmethod
def get_bom_list():
def get_bom_list(keyword=None):
"""
获取所有 BOM 配方（按 bom_no 分组）
返回：每个 BOM 的编号、父件信息、版本、子件数量
支持模糊搜索：BOM编号、父件名称/规格、子件名称/规格
"""
subq = db.session.query(
# 1. 如果有搜索关键词，先筛选出符合条件的 bom_no 集合
filtered_bom_nos = None
if keyword:
kw = f'%{keyword}%'
# 条件A: 匹配 BOM编号 或 父件信息
# 需要 join 父件表
q1 = db.session.query(BomTable.bom_no).join(
MaterialBase, BomTable.parent_id == MaterialBase.id
).filter(
or_(
BomTable.bom_no.ilike(kw),
MaterialBase.name.ilike(kw),
MaterialBase.spec_model.ilike(kw)
)
)
# 条件B: 匹配 子件信息
# 需要 join 子件表
q2 = db.session.query(BomTable.bom_no).join(
MaterialBase, BomTable.child_id == MaterialBase.id
).filter(
or_(
MaterialBase.name.ilike(kw),
MaterialBase.spec_model.ilike(kw)
)
)
# 取并集 (Union)
filtered_bom_nos = q1.union(q2).distinct().all()
filtered_bom_nos = [row[0] for row in filtered_bom_nos]
# 如果搜不到任何结果，直接返回空
if not filtered_bom_nos:
return []
# 2. 原有的分组聚合查询
subq_query = db.session.query(
BomTable.bom_no,
BomTable.parent_id,
BomTable.version,
func.count(BomTable.child_id).label('child_count')
).group_by(BomTable.bom_no, BomTable.parent_id, BomTable.version).subquery()
)
# 应用筛选
if filtered_bom_nos is not None:
subq_query = subq_query.filter(BomTable.bom_no.in_(filtered_bom_nos))
subq = subq_query.group_by(BomTable.bom_no, BomTable.parent_id, BomTable.version).subquery()
query = db.session.query(
subq.c.bom_no,
@ -38,6 +82,9 @@ class BomService:
MaterialBase.spec_model.label('parent_spec')
).join(MaterialBase, subq.c.parent_id == MaterialBase.id)
# 按 bom_no 倒序排列
query = query.order_by(subq.c.bom_no.desc())
results = query.all()
return [{
'bom_no': row.bom_no,
@ -103,13 +150,10 @@ class BomService:
保存或更新一个 BOM 配方
data 结构：
{
"bom_no": "可选，为空则新建",
"bom_no": "用户输入或自动生成",
"version": "版本号，默认v1",
"parent_id": 父件ID,
"children": [
{"child_id": 1, "dosage": 2.5, "remark": ""},
...
]
"children": [...]
}
"""
bom_no = data.get('bom_no')
@ -122,11 +166,13 @@ class BomService:
if child['child_id'] == parent_id:
raise ValueError('父件与子件不能是同一物料')
# 如果未提供 bom_no，则生成一个新的
if not bom_no:
# 如果未提供 bom_no，则生成一个新的 (兼容旧逻辑，但现在前端会传值)
if not bom_no or not bom_no.strip():
# 如果前端没传，抛出异常要求用户填写，或者自动生成
# 这里选择自动生成作为兜底，但推荐前端校验必填
bom_no = BomService.generate_bom_no()
else:
# 删除该 bom_no 下所有现有记录
# 删除该 bom_no 下所有现有记录 (全量更新模式)
BomTable.query.filter_by(bom_no=bom_no).delete()
# 插入新记录

44
inventory-web/nginx.conf
View File

@ -1,26 +1,58 @@
# --- HTTP 重定向到 HTTPS ---
server {
listen 80;
server_name localhost;
server_name _; # 匹配所有域名/IP
# 将所有 HTTP 请求强制跳转到 HTTPS
return 301 https://$host$request_uri;
}
# --- HTTPS 服务器配置 ---
server {
listen 443 ssl;
server_name _;
# 1. SSL 证书配置
ssl_certificate /etc/nginx/ssl/nginx.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.key;
# SSL 优化配置 (可选)
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers HIGH:!aNULL:!MD5;
# 允许上传大文件
client_max_body_size 20M;
# 开启 Gzip
gzip on;
gzip_min_length 1k;
gzip_comp_level 6;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript image/jpeg image/gif image/png;
# 1. 前端页面
# 2. 前端 Vue 页面
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}
# 2. 后端接口代理
location /api {
# 'backend' 对应 docker-compose 里的服务名
# 3. 后端 API 接口代理
location /api/ {
proxy_pass http://backend:8000;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; # 告诉后端这是 HTTPS 请求
proxy_connect_timeout 300s;
proxy_read_timeout 300s;
proxy_send_timeout 300s;
}
# 4. 图片资源托管
location /uploads/ {
alias /usr/share/nginx/html/uploads/;
expires 30d;
}
}

2
inventory-web/package.json
View File

@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite",
"build": "vue-tsc -b && vite build",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {

2
inventory-web/src/App.vue
View File

@ -82,7 +82,7 @@ const handleLogout = () => {
<footer v-if="!isLoginPage" class="app-footer">
<span class="version-tag">
<el-icon style="vertical-align: middle; margin-right: 4px"><InfoFilled /></el-icon>
当前版本: 1.0 Beta (测试版)
当前版本: 1.1 Beta (测试版)
</span>
</footer>
</div>

176
inventory-web/src/views/bom/BomManage.vue
View File

@ -4,57 +4,96 @@
<template #header>
<div class="card-header">
<span class="title">BOM 配方管理</span>
<div>
<div class="header-right">
<el-input
v-model="searchKeyword"
placeholder="搜索 BOM编号/父子件名称/规格"
style="width: 300px; margin-right: 15px;"
clearable
@clear="fetchBomList"
@keyup.enter="fetchBomList"
>
<template #append>
<el-button :icon="Search" @click="fetchBomList" />
</template>
</el-input>
<el-button type="primary" :icon="Plus" @click="handleCreate">新建 BOM</el-button>
</div>
</div>
</template>
<el-table v-loading="loading" :data="bomList" border style="width: 100%">
<el-table-column prop="bom_no" label="BOM编号" min-width="180" />
<el-table-column prop="parent_name" label="父件名称" min-width="180" />
<el-table-column prop="parent_spec" label="父件规格" min-width="180" />
<el-table-column prop="version" label="版本" width="100" />
<el-table-column prop="child_count" label="子件数量" width="100" />
<el-table-column prop="bom_no" label="BOM编号" min-width="180" sortable />
<el-table-column prop="parent_name" label="父件名称" min-width="150" />
<el-table-column prop="parent_spec" label="父件规格" min-width="150" />
<el-table-column prop="version" label="版本" width="100" align="center">
<template #default="{ row }">
<el-tag>{{ row.version }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="child_count" label="子件数" width="100" align="center" />
<el-table-column label="操作" width="280" align="center" fixed="right">
<template #default="{ row }">
<el-button type="primary" size="small" @click="handleEdit(row.bom_no)">编辑</el-button>
<el-button type="success" size="small" @click="handleSaveAs(row.bom_no)">另存为新版</el-button>
<el-button type="danger" size="small" @click="handleDelete(row.bom_no)">删除</el-button>
<el-button type="primary" link @click="handleEdit(row.bom_no)">编辑</el-button>
<el-button type="success" link @click="handleSaveAs(row.bom_no)">另存为</el-button>
<el-button type="danger" link @click="handleDelete(row.bom_no)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<!-- BOM 编辑弹窗 -->
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="800px" destroy-on-close>
<el-form :model="form" label-width="120px" ref="formRef">
<el-form-item label="父件 (成品)" prop="parent_id" required>
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="850px" destroy-on-close :close-on-click-modal="false">
<el-form :model="form" label-width="120px" ref="formRef" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="BOM 编号" prop="bom_no">
<el-input
v-model="form.bom_no"
placeholder="请输入BOM编号"
:disabled="isEditMode"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="版本" prop="version">
<el-input v-model="form.version" placeholder="例如：V1.0" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="父件 (成品)" prop="parent_id">
<el-select
v-model="form.parent_id"
placeholder="请选择父件物料"
placeholder="请搜索并选择父件"
filterable
style="width: 100%"
:disabled="!!form.bom_no && !isSaveAs"
:disabled="isEditMode"
class="beautified-select"
>
<el-option
v-for="item in materialOptions"
:key="item.id"
:label="`${item.name} (${item.spec})`"
:value="item.id"
/>
>
<div class="option-row">
<span class="option-name">{{ item.name }}</span>
<span class="option-spec">{{ item.spec }}</span>
</div>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="版本" prop="version">
<el-input v-model="form.version" placeholder="默认 v1" :disabled="!!form.bom_no && !isSaveAs" />
</el-form-item>
<div style="font-weight: bold; margin-bottom: 10px;">子件列表</div>
<div style="font-weight: bold; margin: 15px 0 10px 0; border-left: 4px solid #409EFF; padding-left: 10px;">子件列表</div>
<el-table :data="form.children" border style="width: 100%; margin-bottom: 15px">
<el-table-column label="子件物料" min-width="300">
<template #default="{ row, $index }">
<el-select
v-model="row.child_id"
placeholder="请选择"
placeholder="请搜索原料"
filterable
style="width: 100%"
@change="(val) => onChildChange(val, $index)"
@ -64,10 +103,16 @@
:key="item.id"
:label="`${item.name} (${item.spec})`"
:value="item.id"
/>
>
<div class="option-row">
<span class="option-name">{{ item.name }}</span>
<span class="option-spec">{{ item.spec }}</span>
</div>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="用量" width="150">
<template #default="{ row }">
<el-input-number
@ -75,24 +120,29 @@
:min="0"
:precision="4"
style="width: 100%"
controls-position="right"
/>
</template>
</el-table-column>
<el-table-column label="备注" width="180">
<template #default="{ row }">
<el-input v-model="row.remark" placeholder="备注" />
</template>
</el-table-column>
<el-table-column label="操作" width="80">
<el-table-column label="操作" width="80" align="center">
<template #default="{ $index }">
<el-button type="danger" size="small" @click="removeChild($index)">删除</el-button>
<el-button type="danger" link @click="removeChild($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top: 10px; text-align: center;">
<el-button type="primary" @click="addChild">添加子件</el-button>
<el-button type="primary" plain :icon="Plus" @click="addChild" style="width: 100%">添加一行子件</el-button>
</div>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
@ -104,9 +154,9 @@
</template>
<script setup lang="ts">
import { ref, reactive, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus } from '@element-plus/icons-vue'
import { ref, reactive, onMounted, computed } from 'vue'
import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus'
import { Plus, Search } from '@element-plus/icons-vue'
import { getBomList, getBomDetail, saveBom, deleteBom } from '@/api/bom'
import { getMaterialBaseList } from '@/api/inbound/stock'
@ -133,24 +183,33 @@ interface ChildRow {
const loading = ref(false)
const dialogVisible = ref(false)
const saving = ref(false)
const isSaveAs = ref(false)
// isEditMode: true表示编辑现有BOM，false表示新建或另存为
const isEditMode = ref(false)
const bomList = ref<BomItem[]>([])
const materialOptions = ref<MaterialBase[]>([])
const searchKeyword = ref('')
const formRef = ref<FormInstance>()
const form = reactive({
bom_no: '',
parent_id: null as number | null,
version: 'v1',
version: 'V1.0',
children: [] as ChildRow[]
})
const rules = reactive<FormRules>({
bom_no: [{ required: true, message: '请输入BOM编号', trigger: 'blur' }],
parent_id: [{ required: true, message: '请选择父件', trigger: 'change' }],
version: [{ required: true, message: '请输入版本号', trigger: 'blur' }]
})
const dialogTitle = ref('新建 BOM')
const fetchBomList = async () => {
loading.value = true
try {
const res = await getBomList()
const res = await getBomList({ keyword: searchKeyword.value })
if (res.code === 200) {
bomList.value = res.data
} else {
@ -178,7 +237,7 @@ const handleCreate = () => {
resetForm()
dialogTitle.value = '新建 BOM'
dialogVisible.value = true
isSaveAs.value = false
isEditMode.value = false
}
const handleEdit = async (bomNo: string) => {
@ -196,7 +255,8 @@ const handleEdit = async (bomNo: string) => {
}))
dialogTitle.value = '编辑 BOM'
dialogVisible.value = true
isSaveAs.value = false
// 编辑模式下，BOM编号不可改
isEditMode.value = true
} else {
ElMessage.error(res.msg || '获取详情失败')
}
@ -210,7 +270,7 @@ const handleSaveAs = async (bomNo: string) => {
const res = await getBomDetail(bomNo)
if (res.code === 200) {
const data = res.data
// 清空 bom_no，表示新建
// 清空 bom_no，要求用户输入新的
form.bom_no = ''
form.parent_id = data.parent_id
form.version = data.version + '_copy'
@ -221,7 +281,8 @@ const handleSaveAs = async (bomNo: string) => {
}))
dialogTitle.value = '另存为新版'
dialogVisible.value = true
isSaveAs.value = true
// 另存为模式，BOM编号可编辑
isEditMode.value = false
} else {
ElMessage.error(res.msg || '获取详情失败')
}
@ -231,8 +292,10 @@ const handleSaveAs = async (bomNo: string) => {
}
const handleDelete = (bomNo: string) => {
ElMessageBox.confirm('确定删除该 BOM 吗？', '警告', {
type: 'warning'
ElMessageBox.confirm('确定删除该 BOM 吗？此操作不可恢复', '警告', {
type: 'warning',
confirmButtonText: '确定删除',
cancelButtonText: '取消'
})
.then(async () => {
try {
@ -253,8 +316,9 @@ const handleDelete = (bomNo: string) => {
const resetForm = () => {
form.bom_no = ''
form.parent_id = null
form.version = 'v1'
form.version = 'V1.0'
form.children = []
if (formRef.value) formRef.value.resetFields()
}
const addChild = () => {
@ -270,18 +334,20 @@ const removeChild = (index: number) => {
}
const onChildChange = (val: number, index: number) => {
// 可以做一些校验，比如不能与父件相同
// 可扩展逻辑
}
const submitForm = async () => {
if (!form.parent_id) {
ElMessage.warning('请选择父件')
return
}
if (!formRef.value) return
await formRef.value.validate(async (valid) => {
if (!valid) return
if (form.children.length === 0) {
ElMessage.warning('请至少添加一个子件')
return
}
for (const child of form.children) {
if (!child.child_id) {
ElMessage.warning('请为每个子件选择物料')
@ -294,7 +360,7 @@ const submitForm = async () => {
}
const payload = {
bom_no: form.bom_no || undefined,
bom_no: form.bom_no, // 必填
version: form.version,
parent_id: form.parent_id,
children: form.children.map(c => ({
@ -319,6 +385,7 @@ const submitForm = async () => {
} finally {
saving.value = false
}
})
}
onMounted(() => {
@ -333,8 +400,29 @@ onMounted(() => {
justify-content: space-between;
align-items: center;
}
.header-right {
display: flex;
align-items: center;
}
.title {
font-size: 18px;
font-weight: bold;
}
/* 下拉框选项样式优化 */
.option-row {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}
.option-name {
font-weight: bold;
color: #303133;
}
.option-spec {
font-size: 12px;
color: #909399;
margin-left: 15px;
}
</style>

478
inventory-web/src/views/outbound/Selection.vue
View File

@ -39,45 +39,79 @@
row-key="uniqueKey"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="typeLabel" label="类型" width="80" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="standard" label="规格" />
<el-table-column prop="available_quantity" label="当前库存" width="100" />
<el-table-column label="本次出库" width="180" align="center">
<el-table-column label="类型" width="100" align="center">
<template #default="{ row }">
<el-tag :type="getTypeTag(row.type)">{{ row.typeLabel }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="name" label="名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="standard" label="规格型号" min-width="150" show-overflow-tooltip />
<el-table-column prop="available_quantity" label="当前库存" width="120" align="right">
<template #default="{ row }">
<span style="color: green; font-weight: bold;">{{ row.available_quantity }}</span>
</template>
</el-table-column>
<el-table-column label="本次出库数" width="180" align="center" fixed="right">
<template #default="{ row }">
<el-input-number
v-model="row.export_quantity"
:min="1"
:min="0"
:max="row.available_quantity"
size="small"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<el-table-column label="操作" width="80" align="center" fixed="right">
<template #default="{ $index }">
<el-button type="danger" link @click="removeRow($index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div v-if="selectedItems.length > 0" style="margin-top: 15px; text-align: right; color: #606266;">
共 <span style="color: red; font-weight: bold;">{{ selectedItems.length }}</span> 种物品，
合计出库 <span style="color: red; font-weight: bold;">{{ totalExportCount }}</span> 件
</div>
</el-card>
<el-dialog v-model="manualDialogVisible" title="选择库存物品" width="80%" top="5vh">
<el-dialog v-model="manualDialogVisible" title="选择库存物品" width="85%" top="5vh" destroy-on-close>
<div class="filter-container">
<el-input v-model="searchKeyword" placeholder="搜索名称/规格" style="width: 300px" @input="filterStock" />
<el-input
v-model="searchKeyword"
placeholder="请输入物料名称 或 规格型号 进行搜索"
style="width: 300px"
:prefix-icon="Search"
clearable
@input="filterStock"
/>
<span style="margin-left: 15px; color: #909399; font-size: 12px;">
提示：勾选物品后，可直接在表格中修改【本次出库】数量
</span>
</div>
<el-table
:data="filteredStockData"
height="500"
border
row-key="uniqueKey"
@selection-change="handleStockSelection"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="standard" label="规格" />
<el-table-column prop="available_quantity" label="可用库存" />
<el-table-column label="本次出库" width="150">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
<el-table-column label="类型" width="90" align="center">
<template #default="{ row }">
<el-tag size="small" :type="getTypeTag(row.type)">{{ row.typeLabel }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="name" label="名称" show-overflow-tooltip />
<el-table-column prop="standard" label="规格" show-overflow-tooltip />
<el-table-column prop="available_quantity" label="可用库存" width="100" align="right" />
<el-table-column label="本次出库" width="160" align="center" fixed="right">
<template #default="{ row }">
<el-input-number
v-model="row.export_quantity"
@ -85,139 +119,339 @@
:max="row.available_quantity"
size="small"
style="width: 100%"
placeholder="数量"
@click.stop
/>
</template>
</el-table-column>
</el-table>
<template #footer>
<span style="float: left; line-height: 32px; color: #909399;">
已勾选 {{ tempSelection.length }} 项
</span>
<el-button @click="manualDialogVisible = false">取消</el-button>
<el-button type="primary" @click="confirmManualAdd">确认添加</el-button>
</template>
</el-dialog>
<el-dialog v-model="bomSelectVisible" title="选择 BOM 套餐" width="600px">
<el-form label-width="80px">
<el-dialog v-model="bomSelectVisible" title="按 BOM 套餐添加" width="600px">
<el-form label-width="100px">
<el-form-item label="选择产品">
<el-select v-model="selectedBomNo" filterable placeholder="选择要出库的产品BOM" style="width: 100%">
<el-select v-model="selectedBomNo" filterable placeholder="请选择产品BOM配方" style="width: 100%">
<el-option
v-for="b in bomOptions"
:key="b.bom_no"
:label="`${b.parent_name} (${b.version})`"
:label="`${b.parent_name} - ${b.version}`"
:value="b.bom_no"
/>
</el-select>
</el-form-item>
<el-form-item label="生产套数">
<el-input-number v-model="bomSets" :min="1" label="套" />
<el-input-number v-model="bomSets" :min="1" label="套" style="width: 200px;" />
</el-form-item>
</el-form>
<div style="margin-left: 100px; color: #909399; font-size: 12px;">
注意：系统将自动计算所需原料数量 ( 配方用量 × 套数 )。
</div>
<template #footer>
<el-button @click="bomSelectVisible = false">取消</el-button>
<el-button type="primary" @click="confirmBomAdd">一键添加</el-button>
<el-button type="primary" @click="confirmBomAdd">一键计算并添加</el-button>
</template>
</el-dialog>
<el-dialog v-model="previewVisible" title="打印预览" width="800px">
<el-button @click="window.print()">确认打印</el-button>
<el-dialog
v-model="previewVisible"
title="出库单核对与打印"
width="800px"
destroy-on-close
class="no-print-content"
>
<div class="print-preview-content">
<el-alert title="请核对以下清单，确认无误后点击【确认打印】" type="info" :closable="false" style="margin-bottom: 10px;" />
<el-table :data="validSelectedItems" border size="small" style="width: 100%">
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="typeLabel" label="类型" width="80" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="standard" label="规格" />
<el-table-column prop="export_quantity" label="本次出库" width="120" align="center">
<template #default="{ row }">
<span style="font-weight: bold; color: #F56C6C; font-size: 16px;">{{ row.export_quantity }}</span>
</template>
</el-table-column>
</el-table>
<div class="summary-info" style="margin-top: 20px; text-align: right; font-weight: bold;">
总计出库: <span style="color: red; font-size: 18px;">{{ totalExportCount }}</span> 件
</div>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="previewVisible = false">取消</el-button>
<el-button type="warning" :icon="Download" :loading="exportLoading" @click="confirmExport">
导出 Excel
</el-button>
<el-button type="primary" :icon="Printer" :loading="printLoading" @click="confirmPrint">
确认打印 (A4)
</el-button>
</span>
</template>
</el-dialog>
<div id="print-area">
<div class="print-header">
<h1>IRIS出库拣货确认单</h1>
<div class="print-meta-row">
<span>打印时间: {{ currentTime }}</span>
<span>单据编号: {{ currentOrderNo }}</span>
</div>
<div class="header-line"></div>
</div>
<table class="print-table">
<thead>
<tr>
<th style="width: 60px;">序号</th>
<th>物料名称</th>
<th>规格型号</th>
<th style="width: 60px;">单位</th>
<th style="width: 100px;">出库数量</th>
<th style="width: 60px;">备注</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in validSelectedItems" :key="index">
<td style="text-align: center;">{{ index + 1 }}</td>
<td class="cell-padding">{{ item.name }}</td>
<td class="cell-padding">{{ item.standard }}</td>
<td style="text-align: center;">件</td>
<td style="text-align: center; font-weight: bold; font-size: 16px;">{{ item.export_quantity }}</td>
<td></td>
</tr>
<tr v-if="validSelectedItems.length === 0">
<td colspan="6" style="text-align: center; padding: 20px;">无数据</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="4" style="text-align: right; font-weight: bold; padding-right: 15px;">合计:</td>
<td style="text-align: center; font-weight: bold; font-size: 18px;">{{ totalExportCount }}</td>
<td></td>
</tr>
</tfoot>
</table>
<div class="print-footer">
<div class="signature-item">
<span class="sig-label">库管员签字:</span>
<span class="sig-line"></span>
</div>
<div class="signature-item">
<span class="sig-label">领料人签字:</span>
<span class="sig-line"></span>
</div>
<div class="signature-item">
<span class="sig-label">日期:</span>
<span class="sig-line"></span>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref } from 'vue'
import { Plus, List, Printer } from '@element-plus/icons-vue'
import { ref, computed } from 'vue'
import { Printer, Search, Plus, Download, List } from '@element-plus/icons-vue'
import { ElMessage } from 'element-plus'
import { getAllStock } from '@/api/inbound/stock'
import { getAllStock, printSelectionList } from '@/api/inbound/stock'
import { getBomList, getBomDetail } from '@/api/bom'
// 购物车数据
// --- 状态变量 ---
// 核心：购物车数据
const selectedItems = ref<any[]>([])
// 手动选择相关
// 弹窗与加载状态
const manualDialogVisible = ref(false)
const bomSelectVisible = ref(false)
const previewVisible = ref(false)
const exportLoading = ref(false)
const printLoading = ref(false)
// 数据缓存
const allStockData = ref<any[]>([])
const filteredStockData = ref<any[]>([])
const searchKeyword = ref('')
const tempSelection = ref<any[]>([])
const tempSelection = ref<any[]>([]) // 手动添加时的临时勾选
// BOM 相关
const bomSelectVisible = ref(false)
const bomOptions = ref<any[]>([])
const selectedBomNo = ref('')
const bomSets = ref(1)
const previewVisible = ref(false)
// 打印相关
const currentTime = ref('')
const currentOrderNo = ref('')
// --- 方法 ---
// --- 计算属性 ---
// 有效的出库项 (数量 > 0)
const validSelectedItems = computed(() => {
return selectedItems.value.filter(item => item.export_quantity > 0)
})
const totalExportCount = computed(() => {
return validSelectedItems.value.reduce((sum, item) => sum + (item.export_quantity || 0), 0)
})
// --- 辅助方法 ---
const getTypeTag = (type: string) => {
switch (type) {
case 'material': return 'info'
case 'semi': return 'warning'
case 'product': return 'success'
default: return ''
}
}
const generateOrderNo = () => {
const now = new Date();
const dateStr = now.getFullYear() + (now.getMonth()+1).toString().padStart(2,'0') + now.getDate().toString().padStart(2,'0');
const random = Math.floor(Math.random()*1000).toString().padStart(3, '0');
return 'OUT' + dateStr + '-' + random;
}
// --- 核心逻辑 1：手动添加库存 (支持弹窗内修改数量) ---
// 1. 打开手动选择
const openManualSelect = async () => {
manualDialogVisible.value = true
if (allStockData.value.length === 0) {
try {
const res: any = await getAllStock()
// 简单处理数据，实际应复用之前的 normalizeItem 逻辑
const list = res.materials ? [...res.materials, ...res.products, ...res.semis] : []
// 1. 分类处理并打上标记
const rawMaterials = (res.materials || []).map((i: any) => ({ ...i, type: 'material', typeLabel: '采购件' }))
const rawSemis = (res.semis || []).map((i: any) => ({ ...i, type: 'semi', typeLabel: '半成品' }))
const rawProducts = (res.products || []).map((i: any) => ({ ...i, type: 'product', typeLabel: '成品' }))
// 2. 合并
const list = [...rawMaterials, ...rawSemis, ...rawProducts]
// 3. 规范化并生成 UniqueKey
allStockData.value = list.map((i: any) => ({
...i,
name: i.name || i.material_name || i.product_name,
standard: i.standard || i.spec_model,
uniqueKey: i.id + '_' + i.type,
export_quantity: 1,
typeLabel: i.type === 'material' ? '采购件' : i.type === 'semi' ? '半成品' : i.type === 'product' ? '成品' : '未知'
name: i.name || i.material_name || i.product_name || '未知名称',
standard: i.standard || i.spec_model || '',
// ★ 确保 Key 唯一，格式：类型_ID
uniqueKey: `${i.type}_${i.id}`,
available_quantity: parseFloat(i.available_quantity) || 0,
export_quantity: 1 // ★ 默认初始化为1，方便用户在弹窗里看到并修改
}))
filteredStockData.value = allStockData.value
} catch (e) {
ElMessage.error('加载库存数据失败')
}
} else {
// 每次打开时，重置筛选，并将所有项的“本次出库”重置为1（或保留上次，视需求而定，这里重置为1以防混淆）
searchKeyword.value = ''
allStockData.value.forEach(item => item.export_quantity = 1)
filteredStockData.value = allStockData.value
}
}
const filterStock = () => {
const kw = searchKeyword.value.toLowerCase()
const kw = searchKeyword.value.trim().toLowerCase()
if (!kw) {
filteredStockData.value = allStockData.value
return
}
filteredStockData.value = allStockData.value.filter(i =>
(i.name && i.name.toLowerCase().includes(kw)) || (i.standard && i.standard.toLowerCase().includes(kw))
(i.name && i.name.toLowerCase().includes(kw)) ||
(i.standard && i.standard.toLowerCase().includes(kw))
)
}
const handleStockSelection = (val: any[]) => { tempSelection.value = val }
const handleStockSelection = (val: any[]) => {
tempSelection.value = val
}
const confirmManualAdd = () => {
if (tempSelection.value.length === 0) {
return ElMessage.warning('请先勾选需要添加的物品')
}
// 1. 过滤已存在的 (避免重复)
const newItems = tempSelection.value.filter(item =>
!selectedItems.value.find(existing => existing.uniqueKey === item.uniqueKey)
)
selectedItems.value.push(...newItems)
if (newItems.length === 0) {
manualDialogVisible.value = false
tempSelection.value = []
ElMessage.success(`添加了 ${newItems.length} 项`)
return ElMessage.warning('选中的物品已全部在清单中')
}
// 2. 打开 BOM 选择
// 2. 深拷贝加入购物车 (防止引用关联)
const itemsToAdd = newItems.map(item => {
const copy = JSON.parse(JSON.stringify(item))
// ★ 关键修改：直接使用用户在弹窗里输入的 export_quantity
// 如果用户把输入框清空了(undefined)，则默认为1
copy.export_quantity = (item.export_quantity && item.export_quantity > 0) ? item.export_quantity : 1
return copy
})
selectedItems.value.push(...itemsToAdd)
manualDialogVisible.value = false
tempSelection.value = [] // 清空临时勾选
ElMessage.success(`成功添加 ${itemsToAdd.length} 项物品`)
}
// --- 核心逻辑 2：按 BOM 添加 ---
const openBomSelect = async () => {
bomSelectVisible.value = true
// 每次打开 BOM 弹窗重置套数为 1
bomSets.value = 1
try {
const res = await getBomList()
bomOptions.value = res.data || []
} catch (e) {
ElMessage.error('加载 BOM 列表失败')
}
}
const confirmBomAdd = async () => {
if(!selectedBomNo.value) return;
const detailRes = await getBomDetail(selectedBomNo.value)
const bomRows = detailRes.data || []
if(!selectedBomNo.value) return ElMessage.warning('请选择 BOM');
// 确保库存数据已加载，用于匹配
if (allStockData.value.length === 0) {
// 确保有库存数据用于匹配
await openManualSelect()
manualDialogVisible.value = false // 仅加载数据，不显示弹窗
}
try {
const detailRes = await getBomDetail(selectedBomNo.value)
const bomRows = detailRes.data || []
let addedCount = 0;
// 遍历 BOM 子件
bomRows.forEach((bomItem: any) => {
const needQty = bomItem.dosage * bomSets.value
// 简单匹配逻辑：通过名称或ID匹配
// ★ 这里本身就是“选择数量”的逻辑：用量 * 套数
const needQty = (parseFloat(bomItem.dosage) || 0) * bomSets.value
// 简单匹配逻辑：匹配 base_id (最准确)
const stockCandidate = allStockData.value.find(s =>
(s.base_id == bomItem.child_id)
(s.base_id && s.base_id == bomItem.child_id)
)
if (stockCandidate) {
const existing = selectedItems.value.find(e => e.uniqueKey === stockCandidate.uniqueKey)
if (existing) {
// 如果已存在，累加数量
existing.export_quantity += needQty
} else {
const newItem = JSON.parse(JSON.stringify(stockCandidate))
@ -229,26 +463,154 @@ const confirmBomAdd = async () => {
})
if(addedCount > 0) {
ElMessage.success(`已添加 BOM 相关物料`)
ElMessage.success(`成功添加 BOM 相关物料，共 ${addedCount} 类`)
bomSelectVisible.value = false
} else {
ElMessage.warning('未在库存中找到匹配的物料')
ElMessage.warning('库存中未找到该 BOM 所需的任何原料')
}
} catch(e) {
ElMessage.error('获取 BOM 详情失败')
}
}
// --- 通用逻辑 ---
const removeRow = (index: number) => {
selectedItems.value.splice(index, 1)
}
const handlePreview = () => {
if (validSelectedItems.value.length === 0) {
ElMessage.warning('请先添加物品并填写出库数量')
return
}
const now = new Date();
currentTime.value = `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()} ${now.getHours()}:${now.getMinutes()}`;
currentOrderNo.value = generateOrderNo();
previewVisible.value = true
setTimeout(() => window.print(), 500)
}
const confirmPrint = async () => {
previewVisible.value = false;
// 记录日志
try {
const payload = validSelectedItems.value.map(item => ({
name: item.name, standard: item.standard, quantity: item.export_quantity
}));
// 不阻塞打印
printSelectionList(JSON.parse(JSON.stringify(payload))).catch(() => {});
} catch (e) {}
setTimeout(() => {
window.print();
}, 300);
}
const confirmExport = () => {
if (validSelectedItems.value.length === 0) return;
exportLoading.value = true;
try {
let csvContent = "\uFEFF";
csvContent += "类型,名称,规格型号,本次出库数量\n";
validSelectedItems.value.forEach(item => {
const safeName = (item.name || '').replace(/,/g, ' ');
const safeStd = (item.standard || '').replace(/,/g, ' ');
csvContent += `${item.typeLabel},${safeName},${safeStd},${item.export_quantity}\n`;
});
const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
const link = document.createElement("a");
link.href = URL.createObjectURL(blob);
const timestamp = new Date().toISOString().slice(0,19).replace(/[-T:]/g, "");
link.download = `出库单_${timestamp}.csv`;
link.click();
ElMessage.success('导出成功');
previewVisible.value = false;
} catch (err) {
ElMessage.error('导出文件失败');
} finally {
exportLoading.value = false;
}
}
</script>
<style scoped>
/* ================= 屏幕显示样式 ================= */
.card-header { display: flex; justify-content: space-between; align-items: center; }
.header-left .title { font-size: 18px; font-weight: bold; margin-right: 10px; }
.header-left .subtitle { font-size: 12px; color: #909399; }
.filter-container { margin-bottom: 10px; }
.filter-container { margin-bottom: 20px; }
.app-container { height: 100vh; overflow: hidden; display: flex; flex-direction: column; padding: 20px; box-sizing: border-box; }
.app-container .el-card { flex: 1; display: flex; flex-direction: column; overflow: hidden; }
::v-deep(.el-card__body) { flex: 1; display: flex; flex-direction: column; overflow: hidden; }
/* ================= ★★★ 打印专用样式 ★★★ ================= */
/* 1. 默认状态：屏幕上隐藏打印区域 */
#print-area { display: none; }
/* 2. 打印状态：隐藏所有非打印内容，独显 #print-area */
@media print {
@page { margin: 0; size: auto; }
body * { visibility: hidden; }
.el-dialog__wrapper, .v-modal, .el-message, .no-print-content { display: none !important; }
#print-area, #print-area * { visibility: visible; }
#print-area {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
margin: 0;
padding: 20mm;
background-color: white;
display: block !important;
z-index: 99999;
}
.print-header { text-align: center; margin-bottom: 20px; }
.print-header h1 { font-size: 24px; margin: 0 0 10px 0; font-weight: bold; color: #000; }
.print-meta-row { display: flex; justify-content: space-between; font-size: 12px; margin-bottom: 5px; }
.header-line { border-bottom: 2px solid #000; margin-top: 5px; }
.print-table {
width: 100%;
border-collapse: collapse;
margin-bottom: 40px;
border: 1px solid #000;
}
.print-table th, .print-table td {
border: 1px solid #000;
padding: 12px 8px;
text-align: left;
font-size: 14px;
color: #000;
}
.print-table th { text-align: center; font-weight: bold; }
.cell-padding { padding-left: 10px; }
.print-footer {
display: flex;
justify-content: space-between;
margin-top: 60px;
padding: 0 20px;
}
.signature-item {
display: flex;
flex-direction: column;
align-items: center;
width: 30%;
}
.sig-label { font-size: 14px; margin-bottom: 40px; text-align: left; width: 100%; }
.sig-line { border-bottom: 1px solid #000; width: 100%; height: 1px; display: block; }
}
</style>

6
inventory-web/tsconfig.node.json
View File

@ -14,10 +14,10 @@
"moduleDetection": "force",
"noEmit": true,
/* Linting */
/* Linting - Relaxed for production build */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noUnusedLocals": false,
"noUnusedParameters": false,
"erasableSyntaxOnly": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true