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

半成品入库与出库相关联

Browse Source
This commit is contained in:
dxc
2026-02-05 11:51:25 +08:00
parent 1e5627dc0a
commit bf8cf37ff9
3 changed files with 104 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
inventory-backend/app/api/v1/inbound/semi.py
View File

@ -8,7 +8,7 @@ inbound_semi_bp = Blueprint('inbound_semi', __name__)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# 0. 基础物料搜索 (复用逻辑) # 0. 基础物料搜索
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@inbound_semi_bp.route('/search-base', methods=['GET']) @inbound_semi_bp.route('/search-base', methods=['GET'])
def search_base(): def search_base():
@ -18,7 +18,6 @@ def search_base():
""" """
try: try:
keyword = request.args.get('keyword', '') keyword = request.args.get('keyword', '')
# 这里复用 Service 中的搜索逻辑
data = SemiInboundService.search_base_material(keyword) data = SemiInboundService.search_base_material(keyword)
return jsonify({ return jsonify({
"code": 200, "code": 200,
@ -38,10 +37,13 @@ def get_list():
try: try:
page = request.args.get('page', 1, type=int) page = request.args.get('page', 1, type=int)
limit = request.args.get('pageSize', 15, type=int) limit = request.args.get('pageSize', 15, type=int)
# 支持按关键字搜索：BOM号、工单号、SN、批号等
keyword = request.args.get('keyword', '') keyword = request.args.get('keyword', '')
result = SemiInboundService.get_list(page, limit, keyword) # 获取状态列表参数
statuses_str = request.args.get('statuses', '')
statuses = statuses_str.split(',') if statuses_str else []
result = SemiInboundService.get_list(page, limit, keyword, statuses)
return jsonify({"code": 200, "msg": "success", "data": result}) return jsonify({"code": 200, "msg": "success", "data": result})
except Exception as e: except Exception as e:
traceback.print_exc() traceback.print_exc()
@ -49,7 +51,7 @@ def get_list():
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# 2. 新增半成品入库 (修改：返回创建的对象数据) # 2. 新增半成品入库
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@inbound_semi_bp.route('/submit', methods=['POST']) @inbound_semi_bp.route('/submit', methods=['POST'])
def submit(): def submit():
@ -58,10 +60,8 @@ def submit():
if not data: if not data:
return jsonify({"code": 400, "msg": "No data"}), 400 return jsonify({"code": 400, "msg": "No data"}), 400
# 修改：调用 Service 处理入库，获取新创建的对象
new_stock = SemiInboundService.handle_inbound(data) new_stock = SemiInboundService.handle_inbound(data)
# 修改：返回成功信息以及新创建的数据（包含生成的ID和SKU），供前端打印使用
return jsonify({ return jsonify({
"code": 200, "code": 200,
"msg": "入库成功", "msg": "入库成功",

85
inventory-backend/app/services/inbound/semi_service.py
View File

@ -2,7 +2,7 @@
from app.extensions import db from app.extensions import db
from app.models.base import MaterialBase from app.models.base import MaterialBase
from datetime import datetime from datetime import datetime
from sqlalchemy import or_, func, text from sqlalchemy import or_, func, text, and_ # Added and_
import traceback import traceback
import json import json
@ -130,7 +130,7 @@ class SemiInboundService:
batch_number=data.get('batch_number'), batch_number=data.get('batch_number'),
barcode=final_barcode, barcode=final_barcode,
status='在库', status=data.get('status', '在库'), # 默认在库
quality_status=data.get('quality_status', '合格'), quality_status=data.get('quality_status', '合格'),
in_quantity=in_qty, in_quantity=in_qty,
stock_quantity=in_qty, stock_quantity=in_qty,
@ -150,7 +150,6 @@ class SemiInboundService:
manual_cost=manual_cost, manual_cost=manual_cost,
total_price=total_value, total_price=total_value,
# [核心修改] 将列表转为 JSON 字符串存储
arrival_photo=json.dumps(arrival_list), arrival_photo=json.dumps(arrival_list),
quality_report_link=json.dumps(quality_report_list), quality_report_link=json.dumps(quality_report_list),
@ -199,7 +198,6 @@ class SemiInboundService:
if frontend_key in data: if frontend_key in data:
setattr(stock, db_attr, data[frontend_key]) setattr(stock, db_attr, data[frontend_key])
# [核心修改] 图片字段更新 (List -> JSON String)
if 'arrival_photo' in data: if 'arrival_photo' in data:
imgs = data['arrival_photo'] imgs = data['arrival_photo']
if isinstance(imgs, list): if isinstance(imgs, list):
@ -244,9 +242,8 @@ class SemiInboundService:
if 'in_quantity' in data: if 'in_quantity' in data:
new_qty = float(data['in_quantity']) new_qty = float(data['in_quantity'])
old_qty = float(stock.in_quantity) diff = new_qty - float(stock.in_quantity)
if new_qty != old_qty: if diff != 0:
diff = new_qty - old_qty
stock.in_quantity = new_qty stock.in_quantity = new_qty
stock.stock_quantity = float(stock.stock_quantity) + diff stock.stock_quantity = float(stock.stock_quantity) + diff
stock.available_quantity = float(stock.available_quantity) + diff stock.available_quantity = float(stock.available_quantity) + diff
@ -288,49 +285,71 @@ class SemiInboundService:
raise e raise e
@staticmethod @staticmethod
def get_list(page, limit, keyword=None): def get_list(page, limit, keyword=None, statuses=None):
from app.models.inbound.semi import StockSemi from app.models.inbound.semi import StockSemi
try: try:
query = db.session.query(StockSemi).outerjoin(MaterialBase, StockSemi.base_id == MaterialBase.id) query = db.session.query(StockSemi).outerjoin(MaterialBase, StockSemi.base_id == MaterialBase.id)
# 1. 关键词搜索
if keyword: if keyword:
kw = f'%{keyword}%'
query = query.filter( query = query.filter(
or_( or_(
MaterialBase.name.ilike(f'%{keyword}%'), MaterialBase.name.ilike(kw),
MaterialBase.spec_model.ilike(f'%{keyword}%'), MaterialBase.spec_model.ilike(kw),
StockSemi.batch_number.ilike(f'%{keyword}%'), StockSemi.batch_number.ilike(kw),
StockSemi.serial_number.ilike(f'%{keyword}%'), StockSemi.serial_number.ilike(kw),
StockSemi.sku.ilike(f'%{keyword}%'), StockSemi.sku.ilike(kw),
StockSemi.work_order_code.ilike(f'%{keyword}%'), StockSemi.work_order_code.ilike(kw),
StockSemi.bom_code.ilike(f'%{keyword}%') StockSemi.bom_code.ilike(kw)
)
)
# 2. 状态筛选与零库存隐藏逻辑
if not statuses:
statuses = ['在库', '借库']
# 如果筛选包含'已出库'，则显示所有数量；否则隐藏 stock_quantity <= 0 的记录
if '已出库' in statuses:
query = query.filter(StockSemi.status.in_(statuses))
else:
query = query.filter(
and_(
StockSemi.status.in_(statuses),
StockSemi.stock_quantity > 0
) )
) )
pagination = query.order_by(StockSemi.id.desc()).paginate(page=page, per_page=limit, error_out=False) pagination = query.order_by(StockSemi.id.desc()).paginate(page=page, per_page=limit, error_out=False)
current_items = pagination.items current_items = pagination.items
base_ids = list(set([item.base_id for item in current_items if item.base_id]))
stock_map = {} # 3. 数据组装 (移除 aggregation map，使用单行数据)
if base_ids: def parse_img(json_str):
aggregates = db.session.query( if not json_str: return []
StockSemi.base_id, try:
func.sum(StockSemi.stock_quantity).label('total_stock'), return json.loads(json_str) if json_str.startswith('[') else [json_str]
func.sum(StockSemi.available_quantity).label('total_avail') except:
).filter(StockSemi.base_id.in_(base_ids)).group_by(StockSemi.base_id).all() return []
for agg in aggregates:
stock_map[agg.base_id] = {
'total_stock': float(agg.total_stock or 0),
'total_avail': float(agg.total_avail or 0)
}
items = [] items = []
for item in current_items: for item in current_items:
stats = stock_map.get(item.base_id, {'total_stock': 0, 'total_avail': 0})
d = item.to_dict() d = item.to_dict()
d['sum_stock'] = stats['total_stock']
d['sum_available'] = stats['total_avail'] # 直接使用当前行的库存，不再聚合
d['qty_stock'] = float(item.stock_quantity or 0)
d['qty_available'] = float(item.available_quantity or 0)
# 兼容前端字段
d['sum_stock'] = d['qty_stock']
d['sum_available'] = d['qty_available']
# 图片解析
d['arrival_photo'] = parse_img(item.arrival_photo)
d['quality_report_link'] = parse_img(item.quality_report_link)
# 打印相关
d['global_print_id'] = item.global_print_id
items.append(d) items.append(d)
return {"total": pagination.total, "items": items} return {"total": pagination.total, "items": items}

63
inventory-web/src/views/stock/inbound/semi.vue
View File

@ -9,11 +9,25 @@
clearable clearable
@clear="fetchData" @clear="fetchData"
@keyup.enter="fetchData" @keyup.enter="fetchData"
style="width: 300px; margin-right: 10px;"
> >
<template #append> <template #append>
<el-button :icon="Search" @click="fetchData"/> <el-button :icon="Search" @click="fetchData"/>
</template> </template>
</el-input> </el-input>
<el-select
v-model="queryParams.statuses"
multiple
collapse-tags
placeholder="状态筛选"
style="width: 220px;"
@change="fetchData"
>
<el-option label="在库" value="在库" />
<el-option label="借库" value="借库" />
<el-option label="已出库" value="已出库" />
</el-select>
</div> </div>
<div class="right-tools"> <div class="right-tools">
@ -66,21 +80,24 @@
</span> </span>
</template> </template>
<template #default="scope" v-else-if="['serial_number', 'batch_number'].includes(col.prop)"> <template #default="scope" v-else-if="col.prop === 'sn_bn'">
<span v-if="scope.row[col.prop]" :class="col.prop === 'serial_number' ? 'tag-sn' : 'tag-bn'"> <div v-if="scope.row.serial_number" class="id-cell">
{{ scope.row[col.prop] }} <span class="prefix-tag sn">SN</span>
</span> <span class="id-text">{{ scope.row.serial_number }}</span>
</div>
<div v-else-if="scope.row.batch_number" class="id-cell">
<span class="prefix-tag bn">BN</span>
<span class="id-text">{{ scope.row.batch_number }}</span>
</div>
<span v-else class="text-placeholder">-</span> <span v-else class="text-placeholder">-</span>
</template> </template>
<template #default="scope" v-else-if="col.prop === 'qty_stock'"> <template #default="scope" v-else-if="col.prop === 'qty_stock'">
<span class="stock-num">{{ scope.row.sum_stock }}</span> <span class="stock-num">{{ scope.row.qty_stock }}</span>
<el-tag size="small" type="info" effect="plain" class="sum-tag">总</el-tag>
</template> </template>
<template #default="scope" v-else-if="col.prop === 'qty_available'"> <template #default="scope" v-else-if="col.prop === 'qty_available'">
<span class="avail-num">{{ scope.row.sum_available }}</span> <span class="avail-num">{{ scope.row.qty_available }}</span>
<el-tag size="small" type="info" effect="plain" class="sum-tag">总</el-tag>
</template> </template>
<template #default="scope" v-else-if="col.prop === 'status'"> <template #default="scope" v-else-if="col.prop === 'status'">
@ -351,8 +368,8 @@
<el-form-item label="库存状态" prop="status"> <el-form-item label="库存状态" prop="status">
<el-select v-model="form.status" style="width:100%"> <el-select v-model="form.status" style="width:100%">
<el-option label="在库" value="在库"/> <el-option label="在库" value="在库"/>
<el-option label="出库" value="出库"/> <el-option label="借库" value="借库"/>
<el-option label="损耗" value="损耗"/> <el-option label="已出库" value="已出库"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -613,7 +630,12 @@ const dialogStatus = ref<'create' | 'update'>('create')
const tableData = ref([]) const tableData = ref([])
const total = ref(0) const total = ref(0)
const formRef = ref() const formRef = ref()
const queryParams = reactive({page: 1, pageSize: 15, keyword: ''}) const queryParams = reactive({
page: 1,
pageSize: 15,
keyword: '',
statuses: ['在库', '借库']
})
const materialOptions = ref<any[]>([]) const materialOptions = ref<any[]>([])
// 打印相关变量 // 打印相关变量
@ -651,8 +673,10 @@ const stockColumns = [
{prop: 'sku', label: 'SKU', minWidth: '120'}, {prop: 'sku', label: 'SKU', minWidth: '120'},
{prop: 'inbound_date', label: '入库日期', minWidth: '120'}, {prop: 'inbound_date', label: '入库日期', minWidth: '120'},
{prop: 'barcode', label: '条码', minWidth: '120'}, {prop: 'barcode', label: '条码', minWidth: '120'},
{prop: 'serial_number', label: '序列号', minWidth: '150'},
{prop: 'batch_number', label: '批号', minWidth: '150'}, // 修改：合并序列号和批号
{prop: 'sn_bn', label: '序列号/批号', minWidth: '160'},
{prop: 'status', label: '状态', minWidth: '100'}, {prop: 'status', label: '状态', minWidth: '100'},
{prop: 'quality_status', label: '质量状态', minWidth: '100'}, {prop: 'quality_status', label: '质量状态', minWidth: '100'},
{prop: 'qty_inbound', label: '入库量', minWidth: '100'}, {prop: 'qty_inbound', label: '入库量', minWidth: '100'},
@ -676,10 +700,10 @@ const stockColumns = [
const allColumns = [...baseColumns, ...stockColumns] const allColumns = [...baseColumns, ...stockColumns]
// 表头持久化 // 表头持久化
const STORAGE_KEY = 'stock_semi_visible_columns' const STORAGE_KEY = 'stock_semi_visible_columns_v2' // Update key to force refresh
const defaultColumns = [ const defaultColumns = [
'material_name', 'spec_model', 'unit', 'material_name', 'spec_model', 'unit',
'inbound_date', 'serial_number', 'batch_number', 'status', 'quality_status', 'inbound_date', 'sn_bn', 'status', 'quality_status',
'bom_code', 'work_order_code', 'qty_stock', 'qty_available', 'unit_total_cost', 'arrival_photo', 'quality_report_link' 'bom_code', 'work_order_code', 'qty_stock', 'qty_available', 'unit_total_cost', 'arrival_photo', 'quality_report_link'
] ]
@ -884,7 +908,8 @@ watch(() => [form.raw_material_cost, form.manual_cost], () => {
const fetchData = async () => { const fetchData = async () => {
loading.value = true loading.value = true
try { try {
const res: any = await getSemiList(queryParams) const params = { ...queryParams, statuses: queryParams.statuses.join(',') }
const res: any = await getSemiList(params)
tableData.value = res.data.items || [] tableData.value = res.data.items || []
total.value = res.data.total || 0 total.value = res.data.total || 0
} finally { loading.value = false } } finally { loading.value = false }
@ -1142,7 +1167,7 @@ const resetForm = () => {
}) })
} }
const getStatusType = (status: string) => { const map: any = { '在库': 'success', '出库': 'info', '损耗': 'danger' }; return map[status] || 'warning' } const getStatusType = (status: string) => { const map: any = { '在库': 'success', '出库': 'info', '借库': 'warning', '损耗': 'danger' }; return map[status] || 'warning' }
const getQualityType = (status: string) => { const map: any = { '合格': 'success', '不合格': 'danger', '待检': 'info', '返修中': 'warning' }; return map[status] || 'info' } const getQualityType = (status: string) => { const map: any = { '合格': 'success', '不合格': 'danger', '待检': 'info', '返修中': 'warning' }; return map[status] || 'info' }
const formatMoney = (val: any) => { const num = Number(val); return isNaN(num) ? '-' : `¥ ${num.toFixed(2)}` } const formatMoney = (val: any) => { const num = Number(val); return isNaN(num) ? '-' : `¥ ${num.toFixed(2)}` }
@ -1155,7 +1180,7 @@ onMounted(() => fetchData())
/* 顶部工具栏 */ /* 顶部工具栏 */
.header-tools { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; background: #fff; padding: 15px 20px; border-radius: 8px; box-shadow: 0 2px 12px 0 rgba(0,0,0,0.05); } .header-tools { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; background: #fff; padding: 15px 20px; border-radius: 8px; box-shadow: 0 2px 12px 0 rgba(0,0,0,0.05); }
.left-tools { flex: 0 0 350px; } .left-tools { display: flex; gap: 10px; align-items: center; flex: 1; }
.right-tools { display: flex; gap: 10px; align-items: center; } .right-tools { display: flex; gap: 10px; align-items: center; }
.action-btn { font-weight: 500; } .action-btn { font-weight: 500; }
@ -1168,6 +1193,8 @@ onMounted(() => fetchData())
.stock-num { font-weight: bold; color: #333; font-size: 15px; } .stock-num { font-weight: bold; color: #333; font-size: 15px; }
.avail-num { font-weight: bold; color: #67C23A; font-size: 15px; } .avail-num { font-weight: bold; color: #67C23A; font-size: 15px; }
.sum-tag { margin-left: 4px; transform: scale(0.9); } .sum-tag { margin-left: 4px; transform: scale(0.9); }
.id-cell { display: flex; align-items: center; }
.id-text { font-family: monospace; color: #606266; }
/* 弹窗与表单美化 */ /* 弹窗与表单美化 */
.stylish-form .form-card { background: #fff; border-radius: 8px; border: 1px solid #e4e7ed; margin-bottom: 20px; overflow: hidden; } .stylish-form .form-card { background: #fff; border-radius: 8px; border: 1px solid #e4e7ed; margin-bottom: 20px; overflow: hidden; }