一、MES — 叫料单扩展(schema + 逻辑) material_request 新增字段:packageNo(叫料包号,一次提交=一包)、callDate(叫料日,默认当天)、planBreakdown(jsonb,工单×排产日明细 []CallPlanBreakdown);targetDock 语义降级为"期望接驳台(可空,配送时 WMS 确定实际台)"。 新增 internal/logic/call_plan.go:实时计算「叫料需求明细(工单×排产日×物料)」,派生两类提示(当日剩余未叫 / 跨日量明细),不落库、不拦提交;接驳台空台校验 EnsureStationDocksEmpty、托盘回库 DispatchPalletReturnManual、人工清台 ClearDockLedger、配送单派车 DispatchDeliveryAgv、工位物料明细 StationMaterialDetail。 新增 internal/handler/production/call_pkg.go:8 个 MES 内部端点(X-API-TOKEN 网关),供 WMS 调用——叫料需求明细、按包查单、接驳台状态、托盘回库、人工清台、配送单派车、叫料池原始行、工位物料明细、WMS 代叫料。 internal/handler/production/call.go、internal/logic/call.go、agv.go、qty_report.go、routes_production.go、wmsclient/client.go、db.go 同步接入上述逻辑。 二、WMS — 配送单(新功能,叫料与送料彻底拆开) 新增 schema/delivery_order.go + delivery_order_item.go 及 ent 生成代码:delivery_order(PENDING→DISPATCHED→DONE / CANCELLED,一单=一次托盘配送)、delivery_order_item(配送物料明细快照:工单/工艺/排产日)。 新增 internal/handler/delivery.go + 路由 + DeliveryOrders.vue 页面(仓储作业 → 配送单)。 mesclient/client.go 扩展:MES 叫料单结构补 packageNo/callDate/workOrderNo/planBreakdown,新增 PoolRow/DockPalletState/DeliveryAgvItem/getJSON 等。 CallQueue.vue:按叫料包展示,新增「代叫料」「建配送单」按钮与对话框;出库单回写所属配送单号(outbound_order 加字段);AGV 派送改由配送单驱动。 三、工位终端 — 叫料体验升级 MaterialPanel.vue:新增「本工位物料明细」卡(工艺物料全集×工位账四数,量为 0 也显示);叫料改为「叫料包」模式(默认当天、可勾选分批、可选其他排产日、期望接驳台可空),新增叫料日选择器、两条提示横幅(当日剩余未叫 / 跨日量明细)、托盘回库按钮。 InspectPanel.vue/Main.vue/OnlinePanel.vue/OfflinePanel.vue/WorkPanel.vue/SyncQueueDialog.vue/api/index.js/internal/handler/line.go/routes.go 同步接入接驳台状态、托盘回库、下班双台空台校验等。 web/static/index.html 构建刷新。 四、文档 案例.md:重写第 5/6/8/9 节与新「配送单」流程,补「模拟模式跳过接驳台校验」说明,库管员菜单加「配送单」;并修正"本单箱体"等措辞歧义。 客户问题.md:同步本轮拍板口径。 五、构建产物 / 同步 多个 MES 前端页面(.vue)随本次改动统一重新构建刷新;ent 生成代码(MES material_request、WMS delivery_order/outbound_order 相关)随 schema 更新重新生成。
1023 lines
57 KiB
Vue
1023 lines
57 KiB
Vue
<template>
|
||
<div>
|
||
<el-card>
|
||
<el-form inline>
|
||
<el-form-item label="产品工号">
|
||
<el-input v-model="query.orderNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
|
||
</el-form-item>
|
||
<el-form-item label="图号">
|
||
<el-input v-model="query.productCode" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
|
||
</el-form-item>
|
||
<el-form-item label="产品名称">
|
||
<el-input v-model="query.productName" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
|
||
</el-form-item>
|
||
<el-form-item label="归属类型">
|
||
<el-select v-model="query.ownershipType" clearable placeholder="请选择" style="width:130px">
|
||
<el-option v-for="o in ownershipOptions" :key="o.v" :label="o.l" :value="o.v" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item label="归属编号">
|
||
<el-input v-model="query.contractNo" placeholder="合同号/科技项目号 模糊查询" clearable style="width:170px" @keyup.enter="load" />
|
||
</el-form-item>
|
||
<el-form-item label="状态">
|
||
<el-select v-model="query.status" clearable placeholder="请选择状态" style="width:150px">
|
||
<el-option v-for="s in statusOptions" :key="s.v" :label="s.l" :value="s.v" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item>
|
||
<el-button type="primary" @click="load">查询</el-button>
|
||
<el-button @click="resetFilters">重置</el-button>
|
||
<el-button v-if="can('produce.workorder:add')" @click="openCreate">新建工单</el-button>
|
||
</el-form-item>
|
||
</el-form>
|
||
|
||
<el-table :data="list" border stripe size="small">
|
||
<el-table-column prop="id" label="ID" width="55" />
|
||
<el-table-column prop="workOrderNo" label="产品工号" min-width="140" />
|
||
<el-table-column prop="productCode" label="图号" min-width="120" />
|
||
<el-table-column prop="productName" label="产品名称" min-width="120" />
|
||
<el-table-column label="归属类型" width="95">
|
||
<template #default="{ row }">{{ ownershipText(row.ownershipType) }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="contractNo" label="归属编号" min-width="110" show-overflow-tooltip>
|
||
<template #default="{ row }">{{ row.contractNo || '-' }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="productSerial" label="产品序号" min-width="100" show-overflow-tooltip>
|
||
<template #default="{ row }">{{ row.productSerial || '-' }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="quantity" label="数量" width="70">
|
||
<template #default="{ row }">{{ row.quantity ?? 0 }}</template>
|
||
</el-table-column>
|
||
<!-- finishedNum 走 ent omitempty:0 值被序列化省略,必须兜底显示 0(2026-10-19 修复"已完工"显示为空被误读) -->
|
||
<el-table-column prop="finishedNum" label="已完工" width="70">
|
||
<template #default="{ row }">{{ row.finishedNum ?? 0 }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="status" label="状态" width="100" align="center">
|
||
<template #default="{ row }">
|
||
<el-tooltip :content="statusText(row.status)" placement="top">
|
||
<el-tag size="small" :type="statusTagType(row.status)">{{ statusText(row.status) }}</el-tag>
|
||
</el-tooltip>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column prop="createdBy" label="创建人" width="100">
|
||
<template #default="{ row }">{{ row.createdBy || '-' }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="创建日期" width="160">
|
||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="计划开始" width="110">
|
||
<template #default="{ row }">{{ fmtDateOnly(row.planStart) }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="计划完成" width="110">
|
||
<template #default="{ row }">{{ fmtDateOnly(row.planEnd) }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="实际开始" width="110">
|
||
<template #default="{ row }">{{ fmtDateOnly(row.actualStart) }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="实际完成" width="110">
|
||
<template #default="{ row }">{{ fmtDateOnly(row.completedAt) }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="操作" width="130" align="center" fixed="right">
|
||
<template #default="{ row }">
|
||
<div style="display:flex;align-items:center;justify-content:center;gap:8px">
|
||
<el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
|
||
<el-dropdown trigger="click" @command="(cmd) => onRowCmd(row, cmd)">
|
||
<el-button link type="primary" size="small">更多 ▾</el-button>
|
||
<template #dropdown>
|
||
<el-dropdown-menu>
|
||
<el-dropdown-item command="usage">用料</el-dropdown-item>
|
||
<el-dropdown-item v-if="can('produce.workorder:dailyplan') && !['DONE','CANCELLED'].includes(row.status)"
|
||
:disabled="!hasCombination(row)" command="schedule">自动排产</el-dropdown-item>
|
||
<el-dropdown-item v-for="a in statusActions(row.status)" :key="a.v" :command="'st:' + a.v">{{ a.l }}</el-dropdown-item>
|
||
<el-dropdown-item v-if="can('produce.workorder:edit') && row.status === 'CREATED'" command="edit" divided>编辑</el-dropdown-item>
|
||
<el-dropdown-item v-if="can('produce.workorder:forcecomplete') && ['IN_PROGRESS','PAUSED'].includes(row.status)"
|
||
command="force" style="color:#e6a23c">强制完工</el-dropdown-item>
|
||
<el-dropdown-item v-if="can('produce.workorder:delete') && row.status === 'CREATED'"
|
||
command="del" divided style="color:#f56c6c">删除</el-dropdown-item>
|
||
</el-dropdown-menu>
|
||
</template>
|
||
</el-dropdown>
|
||
</div>
|
||
</template>
|
||
</el-table-column>
|
||
</el-table>
|
||
</el-card>
|
||
|
||
<!-- 新建/编辑工单 -->
|
||
<el-dialog v-model="dialog.show" :title="dialog.id ? '编辑工单' : '新建工单'" width="640px">
|
||
<el-form :model="dialog" label-width="90px">
|
||
<el-form-item label="产品工号" required><el-input v-model="dialog.workOrderNo" /></el-form-item>
|
||
<el-form-item label="产品型号" required>
|
||
<el-select v-model="dialog.productTypeId" placeholder="请选择" style="width:100%" @change="onProductTypeChange">
|
||
<el-option v-for="p in productTypes" :key="p.id" :label="p.name + (p.code ? ' / ' + p.code : '')" :value="p.id" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item label="图号">
|
||
<el-input v-model="dialog.productCode" placeholder="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
|
||
</el-form-item>
|
||
<el-form-item label="产品名称">
|
||
<el-input v-model="dialog.productName" placeholder="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
|
||
</el-form-item>
|
||
<el-form-item label="归属类型" required>
|
||
<el-select v-model="dialog.ownershipType" placeholder="请选择归属(合同号/科技项目号/其他)" style="width:100%">
|
||
<el-option v-for="o in ownershipOptions" :key="o.v" :label="o.l" :value="o.v" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item label="归属编号">
|
||
<el-input v-model="dialog.contractNo"
|
||
:placeholder="dialog.ownershipType === 'project' ? '科技项目号(必填)' : dialog.ownershipType === 'other' ? '选「其他」可不填' : '合同号(必填)'" />
|
||
</el-form-item>
|
||
<el-form-item label="产品序号"><el-input v-model="dialog.productSerial" placeholder="本工单内每台产品的序号" /></el-form-item>
|
||
<el-form-item label="产品工艺">
|
||
<div style="width:100%">
|
||
<el-select v-model="dialog.productProcessId" clearable placeholder="选择后按工序自动推荐工位(可逐道改)" style="width:100%" @change="applyProductProcess">
|
||
<el-option v-for="p in productProcesses" :key="p.id" :value="p.id" :label="p.name" />
|
||
</el-select>
|
||
<el-alert v-if="ppWarnings.length" type="warning" :closable="false" style="margin-top:6px"
|
||
:title="ppWarnings.length > 1 ? ppWarnings.map((w, i) => (i + 1) + '. ' + w).join(';') : ppWarnings[0]" />
|
||
<el-alert v-if="comboStaleWarn" type="warning" :closable="false" style="margin-top:6px" :title="comboStaleWarn" />
|
||
<div v-else-if="dialog.productProcessId" class="combo-tip">
|
||
已按该产品的「产品工艺」自动为每道工序推荐一个执行工位(工件在产线上不回头,后道工位号必须大于前道);每道可改,改后后续工序的候选自动更新。
|
||
<el-link type="primary" :underline="false" style="margin-left:6px" @click="goProductProcess">查看产品工艺</el-link>
|
||
</div>
|
||
</div>
|
||
</el-form-item>
|
||
<el-form-item label="数量" required><el-input-number v-model="dialog.quantity" :min="1" /></el-form-item>
|
||
<el-form-item label="计划开始">
|
||
<el-date-picker v-model="dialog.planStart" type="date" value-format="YYYY-MM-DD"
|
||
placeholder="计划开始日期(选填)" style="width:100%" />
|
||
</el-form-item>
|
||
<el-form-item label="计划完成">
|
||
<el-date-picker v-model="dialog.planEnd" type="date" value-format="YYYY-MM-DD"
|
||
placeholder="计划完成日期(选填)" style="width:100%" />
|
||
</el-form-item>
|
||
<el-alert type="info" :closable="false" style="margin-bottom:8px"
|
||
title="交付日期以「计划开始 / 计划完成」为准;本系统不再单独维护「要求完成日期」字段。" />
|
||
<el-form-item label="工序工位" required>
|
||
<div style="width:100%">
|
||
<el-alert v-if="!dialog.productProcessId" type="info" :closable="false" style="margin-bottom:8px"
|
||
title="未选择产品工艺:请先选择产品型号(自动带出产品工艺)以按工序推荐工位;若该产品尚未配置产品工艺,可到「产品工艺」页创建后再选。" />
|
||
<template v-if="processRows.length">
|
||
<div class="combo-table">
|
||
<div class="combo-row combo-head">
|
||
<span class="combo-col-seq">工序</span>
|
||
<span class="combo-col-flow">工序(工艺)</span>
|
||
<span class="combo-col-station">工位(可多选,按工序顺序递增)</span>
|
||
</div>
|
||
<div v-for="(r, i) in processRows" :key="r.flowId" class="combo-row">
|
||
<span class="combo-col-seq">第 {{ i + 1 }} 道</span>
|
||
<span class="combo-col-flow">{{ r.flowName || ('工序' + r.flowId) }}</span>
|
||
<span class="combo-col-station">
|
||
<el-select v-model="r.stationNos" multiple collapse-tags collapse-tags-tooltip
|
||
placeholder="请选择工位(可多选)" style="width:100%" @change="onProcessStationChange(i)">
|
||
<el-option v-for="o in r.options" :key="o.stationNo" :value="o.stationNo"
|
||
:label="'工位' + o.stationNo + (o.name ? '(' + o.name + ')' : '')" />
|
||
</el-select>
|
||
</span>
|
||
</div>
|
||
</div>
|
||
<el-alert v-if="comboError" type="error" :closable="false" style="margin-top:8px" :title="comboError" />
|
||
<div v-if="routeText" class="combo-route">
|
||
执行路线:{{ routeText }}
|
||
<span class="combo-route-tip">(按工位号从小到大依次执行)</span>
|
||
</div>
|
||
<div class="combo-tip">每道工序执行一个工位;推荐规则与组合校验说明见「产品工艺」页顶部说明。</div>
|
||
</template>
|
||
<div v-else class="combo-tip">该产品暂无产品工艺或工艺未配置工序,暂无可推荐的工序工位。可到「产品工艺」页创建后重新选择产品型号;不选产品工艺时工单可不带工艺组合(排产/开工前须配置)。</div>
|
||
</div>
|
||
</el-form-item>
|
||
</el-form>
|
||
<template #footer>
|
||
<el-button @click="dialog.show=false">取消</el-button>
|
||
<el-button v-if="can('produce.workorder:add') || can('produce.workorder:edit')" type="primary" @click="save">保存</el-button>
|
||
</template>
|
||
</el-dialog>
|
||
|
||
<!-- 自动排产(引导式,Item K) -->
|
||
<el-dialog v-model="sched.show" :title="`自动排产 - ${sched.orderNo}`" width="640px">
|
||
<el-alert type="info" :closable="false" style="margin-bottom:14px"
|
||
title="排产仅排「未开工数量 = 工单总数 − 已完工 − 在产未完工」:生成预览后可逐日调节数量(前松/中紧/后松等任意节奏),各日合计须与应排总数一致;确认后生成未启用排产,工单「下发并开工」后到「日排产」页面人工启用即生效。" />
|
||
<el-alert type="info" :closable="false" style="margin-bottom:14px"
|
||
:title="`项目开始:${fmtDateOnly(sched.planStart)} 工单数量:${sched.quantity} 已完工:${sched.finishedNum}`" />
|
||
<el-form :model="sched" label-width="100px">
|
||
<el-form-item label="排产模式">
|
||
<el-radio-group v-model="sched.mode">
|
||
<el-radio value="AVG">平均分摊</el-radio>
|
||
<el-radio value="FIXED">固定日产</el-radio>
|
||
</el-radio-group>
|
||
</el-form-item>
|
||
<el-form-item v-if="sched.mode === 'FIXED'" label="每日产量">
|
||
<el-input-number v-model="sched.dailyQty" :min="1" />
|
||
</el-form-item>
|
||
<el-form-item label="日期区间">
|
||
<div style="width:100%">
|
||
<div v-for="(seg, i) in sched.segments" :key="i" style="display:flex;gap:8px;margin-bottom:8px;align-items:center">
|
||
<el-date-picker v-model="seg.range" type="daterange" value-format="YYYY-MM-DD"
|
||
start-placeholder="开始" end-placeholder="结束" style="width:280px" />
|
||
<el-button v-if="sched.segments.length > 1" type="danger" plain size="small" @click="removeSegment(i)">删除</el-button>
|
||
</div>
|
||
<el-button size="small" @click="addSegment">+ 添加区间</el-button>
|
||
<div class="sched-tip">可多段(如 6/23-26 + 6/28-29),区间并集去重排序</div>
|
||
</div>
|
||
</el-form-item>
|
||
<el-form-item label="排产预览">
|
||
<div style="width:100%">
|
||
<el-table v-if="sched.preview" :data="sched.preview.rows" border size="small" max-height="320">
|
||
<el-table-column prop="date" label="日期" width="130" align="center" />
|
||
<el-table-column label="计划数量" width="200" align="center">
|
||
<template #default="{ row }">
|
||
<el-input-number v-if="row.editable" v-model="row.qty" :min="0" :step="1" size="small" style="width:150px" />
|
||
<span v-else>{{ row.qty }}({{ row.existStatus === 'PROCESSING' ? '执行中' : '已完成' }})</span>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column label="说明" align="center">
|
||
<template #default="{ row }">
|
||
<el-tag v-if="row.editable" type="primary" size="small">可调</el-tag>
|
||
<el-tag v-else type="info" size="small">已执行中/已完成,锁定</el-tag>
|
||
</template>
|
||
</el-table-column>
|
||
</el-table>
|
||
<div v-if="sched.preview" class="sched-tip">
|
||
可调合计 <b>{{ schedTotal }}</b> 件 / 应排总数 <b>{{ sched.preview.quota }}</b> 件
|
||
<span v-if="schedTotal === sched.preview.quota" style="color:var(--el-color-success)">(一致,可确认)</span>
|
||
<span v-else style="color:var(--el-color-danger)">(不一致,确认前需调平)</span>
|
||
</div>
|
||
<div v-else class="sched-tip">选好模式与日期区间后,点下方「生成预览」查看逐日计划数量并自行调节</div>
|
||
</div>
|
||
</el-form-item>
|
||
</el-form>
|
||
<template #footer>
|
||
<el-button @click="sched.show=false">取消</el-button>
|
||
<el-button :loading="sched.previewing" @click="genPreview">生成预览</el-button>
|
||
<el-button v-if="can('produce.workorder:dailyplan')" type="primary"
|
||
:disabled="!sched.preview || schedTotal !== sched.preview.quota" :loading="sched.applying"
|
||
@click="applySchedule">确认排产</el-button>
|
||
</template>
|
||
</el-dialog>
|
||
<!-- 工单单台用料汇总(只读:工单工艺组合 × 工艺物料清单 实时汇总,不落库) -->
|
||
<el-dialog v-model="usage.show" :title="`单台用料汇总 - ${usage.orderNo}`" width="820px">
|
||
<el-alert type="info" :closable="false" style="margin-bottom:12px"
|
||
title="物料跟着工单走:按该工单的工艺组合 × 各工艺的物料清单实时汇总(同成品不同工单可用不同工艺)。单台含损耗用量 = Σ 各行单台用量 × (1+损耗率%),是备料/反冲的计算口径。" />
|
||
<el-table :data="usage.rows" border size="small" v-loading="usage.loading"
|
||
:empty-text="usage.emptyTip || '该工单工艺组合未配置物料清单'">
|
||
<el-table-column prop="materialCode" label="图号" min-width="140" show-overflow-tooltip />
|
||
<el-table-column prop="materialName" label="物料名称" min-width="150" show-overflow-tooltip />
|
||
<el-table-column prop="spec" label="规格" min-width="120" show-overflow-tooltip />
|
||
<el-table-column prop="unit" label="单位" width="70" align="center" />
|
||
<el-table-column label="序列号" width="110" align="center">
|
||
<template #default="{ row }">{{ row.snMode === 1 ? '序列号=是' : '序列号=否' }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="unitQty" label="单台净用量" width="100" align="center" />
|
||
<el-table-column prop="lossRate" label="损耗率(%)" width="100" align="center" />
|
||
<el-table-column prop="effQty" label="单台含损耗" width="110" align="center" />
|
||
</el-table>
|
||
<template #footer>
|
||
<el-button @click="usage.show = false">关闭</el-button>
|
||
</template>
|
||
</el-dialog>
|
||
|
||
<!-- 强制完工核对单(方案 A:剩余未完工显示不拦 / 排产自动取消 / 待备料叫料自动取消、已发货人工处理 / 在制必须 0) -->
|
||
<el-dialog v-model="fc.show" title="强制完工核对单" width="640px" :close-on-click-modal="false">
|
||
<el-alert type="warning" :closable="false" style="margin-bottom:12px"
|
||
title="强制完工用于「工单做不满必须关单」:未生产完即关单,绕过完工门禁,操作留痕(谁/何时/原因/清单快照),不可恢复。" />
|
||
<div v-loading="fc.loading">
|
||
<template v-if="fc.preview">
|
||
<el-descriptions :column="2" border size="small" style="margin-bottom:12px">
|
||
<el-descriptions-item label="产品工号">{{ fc.preview.workOrderNo }}</el-descriptions-item>
|
||
<el-descriptions-item label="完工进度">
|
||
{{ fc.preview.finishedNum }} / {{ fc.preview.quantity }} 台
|
||
<el-tag v-if="fc.preview.remaining > 0" type="warning" size="small" style="margin-left:6px">剩余 {{ fc.preview.remaining }} 台未完工(显示不拦)</el-tag>
|
||
</el-descriptions-item>
|
||
</el-descriptions>
|
||
<el-descriptions :column="1" border size="small" style="margin-bottom:12px">
|
||
<el-descriptions-item label="在制工件(必须为 0 才能关单)">
|
||
<template v-if="fc.preview.inProduction > 0">
|
||
<b style="color:#f56c6c">{{ fc.preview.inProduction }} 件在制 —— 实物去向必须先落定:正常完工报工,或先在「工件追溯」页走「报废 / 人工取走登记」(原因必填)</b>
|
||
</template>
|
||
<template v-else><b style="color:#67c23a">0 件(可关单)</b></template>
|
||
</el-descriptions-item>
|
||
<el-descriptions-item label="已报废/取走登记(R11:先报废登记后强完)">
|
||
<span v-if="(fc.preview.scrapCount || 0) > 0">{{ fc.preview.scrapCount }} 件已登记报废/取走</span>
|
||
<span v-else style="color:#909399">无(若工件丢失/损坏无法完工,须先登记报废再强制完工)</span>
|
||
</el-descriptions-item>
|
||
<el-descriptions-item label="未完成排产(确认后自动取消)">
|
||
<span v-if="fc.preview.plansToCancel && fc.preview.plansToCancel.length">{{ fc.preview.plansToCancel.join(';') }}</span>
|
||
<span v-else style="color:#909399">无</span>
|
||
</el-descriptions-item>
|
||
<el-descriptions-item label="待备料叫料单(确认后自动取消并释放占用)">
|
||
<span v-if="fc.preview.pendingCalls && fc.preview.pendingCalls.length">{{ fc.preview.pendingCalls.join(';') }}</span>
|
||
<span v-else style="color:#909399">无</span>
|
||
</el-descriptions-item>
|
||
<el-descriptions-item label="已发货叫料单(不拦关单,需人工到终端签收或退库)">
|
||
<span v-if="fc.preview.shippedCalls && fc.preview.shippedCalls.length">{{ fc.preview.shippedCalls.join(';') }}</span>
|
||
<span v-else style="color:#909399">无</span>
|
||
</el-descriptions-item>
|
||
</el-descriptions>
|
||
<el-input v-model="fc.reason" type="textarea" :rows="2" maxlength="200" show-word-limit
|
||
placeholder="强制完工原因(必填,写入操作日志,如:客户砍单 / 工艺变更终止)" />
|
||
</template>
|
||
</div>
|
||
<template #footer>
|
||
<el-button @click="fc.show = false">取消</el-button>
|
||
<el-button type="warning" :disabled="!fc.preview || fc.preview.inProduction > 0"
|
||
:loading="fc.submitting" @click="doForceComplete">确认强制完工</el-button>
|
||
</template>
|
||
</el-dialog>
|
||
|
||
<!-- 工单详情(只读):工单字段汇总 + 工件SN列表 -->
|
||
<el-drawer v-model="detail.show" :title="`工单详情 - ${detail.row ? detail.row.workOrderNo : ''}`" size="780px">
|
||
<template v-if="detail.row">
|
||
<el-descriptions :column="2" border size="small">
|
||
<el-descriptions-item label="产品工号">{{ detail.row.workOrderNo }}</el-descriptions-item>
|
||
<el-descriptions-item label="图号">{{ detail.row.productCode || '-' }}</el-descriptions-item>
|
||
<el-descriptions-item label="产品名称">{{ detail.row.productName || '-' }}</el-descriptions-item>
|
||
<el-descriptions-item label="数量">
|
||
共 {{ detail.row.quantity ?? 0 }} 台(已完工 {{ detail.row.finishedNum ?? 0 }} 台 / 未完工 {{ Math.max(0, (detail.row.quantity ?? 0) - (detail.row.finishedNum ?? 0)) }} 台)
|
||
</el-descriptions-item>
|
||
<el-descriptions-item label="归属">
|
||
{{ ownershipText(detail.row.ownershipType) }}{{ detail.row.contractNo ? ':' + detail.row.contractNo : '' }}
|
||
</el-descriptions-item>
|
||
<el-descriptions-item label="状态">{{ statusText(detail.row.status) }}</el-descriptions-item>
|
||
<el-descriptions-item label="已排产量">{{ detail.row.scheduledQty ?? 0 }} 台</el-descriptions-item>
|
||
<el-descriptions-item label="剩余未排产量">{{ detail.row.remainQty ?? 0 }} 台</el-descriptions-item>
|
||
<el-descriptions-item label="产品序号">{{ detail.row.productSerial || '-' }}</el-descriptions-item>
|
||
<el-descriptions-item label="计划完成">{{ fmtDateOnly(detail.row.planEnd) }}</el-descriptions-item>
|
||
<el-descriptions-item label="计划开始">{{ fmtDateOnly(detail.row.planStart) }}</el-descriptions-item>
|
||
<el-descriptions-item label="计划完成">{{ fmtDateOnly(detail.row.planEnd) }}</el-descriptions-item>
|
||
<el-descriptions-item label="实际开始">{{ fmtDateOnly(detail.row.actualStart) }}</el-descriptions-item>
|
||
<el-descriptions-item label="实际完成">{{ fmtDateOnly(detail.row.completedAt) }}</el-descriptions-item>
|
||
<el-descriptions-item label="创建人 / 创建日期">
|
||
{{ detail.row.createdBy || '-' }} / {{ fmtTime(detail.row.createdAt) }}
|
||
</el-descriptions-item>
|
||
</el-descriptions>
|
||
<div class="detail-subtitle">工艺路线({{ detailRoutes.length }} 道工艺,按工位号升序=执行顺序,不显示工位号)</div>
|
||
<el-table :data="detailRoutes" border size="small" empty-text="该工单未配置工艺组合">
|
||
<el-table-column type="index" label="序" width="50" align="center" />
|
||
<el-table-column prop="flowName" label="工艺" min-width="140" show-overflow-tooltip />
|
||
<el-table-column label="步骤数" width="80" align="center">
|
||
<template #default="{ row }">{{ row.steps.length }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="步骤明细" min-width="260">
|
||
<template #default="{ row }">
|
||
<template v-if="!row.steps.length">-</template>
|
||
<template v-else>
|
||
<span>{{ row.expanded ? row.steps.map((s, i) => `${i + 1}. ${s.name}`).join(';') : row.steps.slice(0, 3).map((s, i) => `${i + 1}. ${s.name}`).join(';') + (row.steps.length > 3 ? ' …' : '') }}</span>
|
||
<el-button v-if="row.steps.length > 3" link type="primary" size="small" style="margin-left:6px"
|
||
@click="row.expanded = !row.expanded">{{ row.expanded ? '收起' : '展开全部' }}</el-button>
|
||
</template>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column label="检测/签字要求" min-width="150">
|
||
<template #default="{ row }">{{ stepReqText(row) }}</template>
|
||
</el-table-column>
|
||
</el-table>
|
||
<div class="detail-subtitle">工件序列号列表({{ detail.total }} 台,按产品序号升序)</div>
|
||
<div class="piece-toolbar">
|
||
<el-select v-model="pieceQuery.status" clearable placeholder="状态:全部" style="width:140px" @change="onPieceFilter">
|
||
<el-option v-for="(l, v) in pieceStatusMap" :key="v" :label="l" :value="v" />
|
||
</el-select>
|
||
</div>
|
||
<el-table :data="detail.pieces" border size="small" v-loading="detail.loading" empty-text="该工单暂无工件进线记录">
|
||
<el-table-column label="产品序号" width="80" align="center">
|
||
<template #default="{ row }">{{ pieceSerialText(row) }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="sn" label="SN" min-width="160" show-overflow-tooltip />
|
||
<el-table-column label="类型" width="90" align="center">
|
||
<template #default>{{ snModeText(detail.snMode) }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="状态" width="90" align="center">
|
||
<template #default="{ row }">{{ pieceStatusText(row.status) }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="当前工位" width="90" align="center">
|
||
<template #default="{ row }">{{ stationText(row.currentStationNo) }}</template>
|
||
</el-table-column>
|
||
</el-table>
|
||
<el-pagination class="piece-pagination" background layout="total, sizes, prev, pager, next"
|
||
:total="detail.total" :page-sizes="[100, 200, 500]"
|
||
v-model:current-page="pieceQuery.page" v-model:page-size="pieceQuery.pageSize"
|
||
@current-change="loadPieces" @size-change="onPieceSize" />
|
||
</template>
|
||
</el-drawer>
|
||
</div>
|
||
<PageHelp :data="helpWorkOrder" page="WorkOrder" />
|
||
</template>
|
||
|
||
<script setup>
|
||
import { ref, reactive, computed, onMounted } from 'vue'
|
||
import { useRouter } from 'vue-router'
|
||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||
import request from '../utils/request'
|
||
import { can } from '../utils/perm'
|
||
import { fmtDateOnly, fmtTime } from '../utils/format'
|
||
import PageHelp from '../components/PageHelp.vue'
|
||
import { helpWorkOrder } from '../help'
|
||
|
||
const statusOptions = [
|
||
{ v: 'CREATED', l: '已创建' },
|
||
{ v: 'IN_PROGRESS', l: '执行中' },
|
||
{ v: 'PAUSED', l: '已暂停' },
|
||
{ v: 'DONE', l: '已完成' }, { v: 'CANCELLED', l: '已取消' }
|
||
]
|
||
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || '—'
|
||
// 状态固定配色(方案 A):已创建=灰(info) / 执行中=绿(success) / 已暂停=橙(warning) / 已完成=深绿(success) / 已取消=红(danger)
|
||
const statusTagType = (s) => (
|
||
{ CREATED: 'info', IN_PROGRESS: 'success', PAUSED: 'warning', CANCELLED: 'danger', DONE: 'success' }[s] || 'info'
|
||
)
|
||
|
||
// 归属(一级编号):合同号/科技项目号 二选一,值域与 WMS inventories.ownership_type 一致
|
||
const ownershipOptions = [
|
||
{ v: 'workorder', l: '合同号' }, { v: 'project', l: '科技项目号' }, { v: 'other', l: '其他' }
|
||
]
|
||
const ownershipText = (t) => (ownershipOptions.find((o) => o.v === t) || {}).l || '-'
|
||
|
||
// 工件SN列表(详情抽屉):状态/当前工位/类型(sn_mode:1=序列号=是 2=序列号=否,取自产品图号对应物料档案)
|
||
const pieceStatusMap = { NEW: '待上线', ONLINE: '已上线', PROCESSING: '在制', SEMI_STORED: '半成品入库', DONE: '完工', SCRAPPED: '报废' }
|
||
const pieceStatusText = (s) => pieceStatusMap[s] || '—'
|
||
const stationText = (n) => (n !== 0 ? '工位' + n : '-')
|
||
const snModeText = (m) => (m === 1 ? '序列号=是' : m === 2 ? '序列号=否' : '-')
|
||
|
||
// 状态流转:给出当前状态可执行的下一个动作(按钮文案随当前状态变化,方案 A)
|
||
function statusActionBtn(status) {
|
||
const map = {
|
||
CREATED: '下发并开工 ▾', IN_PROGRESS: '执行中 ▾', PAUSED: '已暂停 ▾'
|
||
}
|
||
return map[status] || ''
|
||
}
|
||
function statusActions(status) {
|
||
const map = {
|
||
CREATED: [{ v: 'IN_PROGRESS', l: '下发并开工' }, { v: 'CANCELLED', l: '取消工单' }],
|
||
IN_PROGRESS: [{ v: 'PAUSED', l: '暂停' }, { v: 'DONE', l: '完工' }],
|
||
PAUSED: [{ v: 'IN_PROGRESS', l: '恢复执行' }, { v: 'CANCELLED', l: '取消工单' }]
|
||
}
|
||
return map[status] || []
|
||
}
|
||
|
||
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', ownershipType: '', status: '' })
|
||
function resetFilters() {
|
||
Object.assign(query, { orderNo: '', productCode: '', productName: '', contractNo: '', ownershipType: '', status: '' })
|
||
load()
|
||
}
|
||
const list = ref([])
|
||
const productTypes = ref([])
|
||
|
||
// 工序工位:数据源=工位(含 flowId/flowName/stationNo/status/name)+ 产品工艺工序顺序
|
||
// 模型=「每道工序可绑定多个有序工位」(2026-11-02 多工位同工序:工件按工位号升序依次经过各工位,
|
||
// 同一工序的多个工位整体须排在上一道工序之后;产线单向不回头)。
|
||
// processRows 每行 { seq, flowId, flowName, stationNos:[int], options:[{stationNo,name}], error }
|
||
const stations = ref([])
|
||
const flows = ref([])
|
||
const processRows = ref([])
|
||
// comboError:前端即时红字(该道无候选);保存由后端兜底
|
||
const comboError = ref('')
|
||
// comboStaleWarn:打开存量工单时组合已失效(工位管理已调整)的黄条提示,不拦
|
||
const comboStaleWarn = ref('')
|
||
|
||
// 候选工位:绑定该工序 且 启用的工位(按工位号升序)
|
||
function boundStations(flowId) {
|
||
return stations.value
|
||
.filter((s) => s.flowId === flowId && s.status === 'ENABLED')
|
||
.map((s) => ({ stationNo: s.stationNo, name: s.name || '' }))
|
||
.sort((a, b) => a.stationNo - b.stationNo)
|
||
}
|
||
|
||
// 已选工位中的最大工位号(无则返回 -Infinity,便于首道工序允许负数虚拟工位)
|
||
function maxSelected(arr) {
|
||
if (!arr || !arr.length) return -Infinity
|
||
return Math.max(...arr)
|
||
}
|
||
|
||
// 按产品工艺工序顺序构建工序行
|
||
function buildProcessRows(pp) {
|
||
comboStaleWarn.value = ''
|
||
if (!pp || !pp.flows || !pp.flows.length) {
|
||
processRows.value = []
|
||
comboError.value = ''
|
||
return
|
||
}
|
||
processRows.value = pp.flows
|
||
.slice()
|
||
.sort((a, b) => (a.seq || 0) - (b.seq || 0))
|
||
.map((it) => ({
|
||
seq: it.seq,
|
||
flowId: it.flowId,
|
||
flowName: it.flowName || ('工序' + it.flowId),
|
||
stationNos: [],
|
||
options: [],
|
||
error: ''
|
||
}))
|
||
recomputeCandidates(0)
|
||
}
|
||
|
||
// 从 fromIdx 起重算候选 + 自动修正(去掉越界选择、空则补最小候选)+ 收集红字。
|
||
// 单调约束:本道工序全部工位须排在上一道工序全部工位之后(前向唯一约束),
|
||
// 配合后端 ValidateWorkOrderComboStrict 的整区间严格递增校验。
|
||
function recomputeCandidates(fromIdx) {
|
||
let prev = fromIdx > 0 ? maxSelected(processRows.value[fromIdx - 1].stationNos) : -Infinity
|
||
for (let i = fromIdx; i < processRows.value.length; i++) {
|
||
const r = processRows.value[i]
|
||
const lower = prev // 后续=上一道已选最大工位号(首道允许负数虚拟工位)
|
||
const cands = boundStations(r.flowId).filter((o) => o.stationNo > lower)
|
||
r.options = cands
|
||
// 仅保留仍合法的已选,去掉越界项
|
||
r.stationNos = (r.stationNos || []).filter((n) => cands.some((o) => o.stationNo === n))
|
||
if (r.stationNos.length === 0 && cands.length) {
|
||
r.stationNos = [cands[0].stationNo] // 无候选以外的默认:补最小合法候选
|
||
}
|
||
prev = r.stationNos.length ? maxSelected(r.stationNos) : lower
|
||
}
|
||
collectComboError()
|
||
}
|
||
|
||
// 收集红字提示:找到第一处「该道无候选」给出"工位X 之后没有能做工序Y 的工位"
|
||
function collectComboError() {
|
||
for (let i = 0; i < processRows.value.length; i++) {
|
||
const r = processRows.value[i]
|
||
if ((!r.stationNos || r.stationNos.length === 0) && r.options.length === 0) {
|
||
const prevNo = i > 0 ? maxSelected(processRows.value[i - 1].stationNos) : 0
|
||
comboError.value = `工位${prevNo} 之后没有能做工序「${r.flowName}」的工位,请改选第${i + 1}道工序`
|
||
return
|
||
}
|
||
}
|
||
comboError.value = ''
|
||
}
|
||
|
||
// 用户改某道工序的工位 → 后续候选自动重算(非法组合下拉里就没有,选不到)
|
||
function onProcessStationChange(i) {
|
||
recomputeCandidates(i + 1)
|
||
}
|
||
|
||
// 组合结果(展开为 工序-工位 扁平条目,按工位号升序即执行路线):仅含已选工序
|
||
const flowCombination = computed(() =>
|
||
processRows.value
|
||
.flatMap((r) => (r.stationNos || []).map((n) => ({ flowId: r.flowId, stationNo: n })))
|
||
.filter((c) => c.stationNo !== 0)
|
||
.sort((a, b) => a.stationNo - b.stationNo)
|
||
)
|
||
const routeText = computed(() => flowCombination.value.map((c) => c.stationNo).join('→'))
|
||
|
||
const hasCombination = (row) => Array.isArray(row.flowCombination) && row.flowCombination.length > 0
|
||
|
||
// 编辑回填:优先用来源产品工艺工序顺序;无产品工艺则从已存组合按工位号升序推导工序行
|
||
function buildEditProcessRows(row) {
|
||
const pp = row.productProcessId ? productProcesses.value.find((p) => p.id === row.productProcessId) : null
|
||
const combo = Array.isArray(row.flowCombination) ? row.flowCombination : []
|
||
if (pp && pp.flows && pp.flows.length) {
|
||
buildProcessRows(pp)
|
||
for (const r of processRows.value) {
|
||
const ns = combo.filter((x) => x.flowId === r.flowId && x.stationNo !== 0).map((x) => x.stationNo)
|
||
r.stationNos = ns
|
||
}
|
||
recomputeCandidates(0) // 已保存合法则保留,失效则自动修正
|
||
} else if (combo.length) {
|
||
const byFlow = new Map()
|
||
for (const c of combo) {
|
||
if (c.flowId > 0 && c.stationNo !== 0) {
|
||
if (!byFlow.has(c.flowId)) byFlow.set(c.flowId, [])
|
||
byFlow.get(c.flowId).push(c.stationNo)
|
||
}
|
||
}
|
||
const ordered = [...byFlow.entries()].sort((a, b) => Math.min(...a[1]) - Math.min(...b[1]))
|
||
processRows.value = ordered.map(([fid, nos], i) => {
|
||
const f = flows.value.find((x) => x.id === fid)
|
||
return { seq: i + 1, flowId: fid, flowName: f ? f.name : ('工序' + fid), stationNos: nos.slice().sort((a, b) => a - b), options: boundStations(fid), error: '' }
|
||
})
|
||
comboError.value = ''
|
||
} else {
|
||
processRows.value = []
|
||
comboError.value = ''
|
||
}
|
||
checkComboStale(row) // 存量失效软提示(工位管理已调整)
|
||
}
|
||
|
||
// 存量失效软提示:工位仍绑定该工序 + 工位号递增;不满足则黄条提示,不拦(2026-10-20 工单建单需求·三)
|
||
function checkComboStale(row) {
|
||
comboStaleWarn.value = ''
|
||
const combo = Array.isArray(row.flowCombination) ? row.flowCombination : []
|
||
if (!combo.length) return
|
||
const byNo = new Map(stations.value.map((s) => [s.stationNo, s]))
|
||
const msgs = []
|
||
for (const c of combo) {
|
||
const st = byNo.get(c.stationNo)
|
||
if (!st) { msgs.push(`工位${c.stationNo} 不存在`); continue }
|
||
if (st.status !== 'ENABLED') msgs.push(`工位${c.stationNo} 已停用`)
|
||
else if (st.flowId !== c.flowId) msgs.push(`工位${c.stationNo} 当前绑定工艺已变更(与原工序不匹配)`)
|
||
}
|
||
const pp = row.productProcessId ? productProcesses.value.find((p) => p.id === row.productProcessId) : null
|
||
if (pp && pp.flows && pp.flows.length) {
|
||
const seq = pp.flows.slice().sort((a, b) => (a.seq || 0) - (b.seq || 0))
|
||
let prev = 0
|
||
for (const it of seq) {
|
||
const sts = combo.filter((c) => c.flowId === it.flowId).map((c) => c.stationNo).sort((a, b) => a - b)
|
||
if (!sts.length) continue
|
||
if (prev > 0 && sts[0] <= prev) {
|
||
msgs.push(`工序「${it.flowName || ('工序' + it.flowId)}」的工位(${sts[0]})不大于上一道工序的工位(${prev}),组合已失效`)
|
||
break
|
||
}
|
||
prev = sts[0]
|
||
}
|
||
}
|
||
if (msgs.length) {
|
||
comboStaleWarn.value = '该工单工艺组合已失效(工位管理已调整):' + msgs.join(';') + '。可重新选择工序工位后保存。'
|
||
}
|
||
}
|
||
|
||
async function loadComboData() {
|
||
try {
|
||
stations.value = (await request.get('/stations')) || []
|
||
} catch { stations.value = [] }
|
||
try {
|
||
flows.value = (await request.get('/process-flows', { params: { page: 1, pageSize: 1000 } }))?.list || []
|
||
} catch { flows.value = [] }
|
||
}
|
||
|
||
// ---------- 工单单台用料汇总(只读) ----------
|
||
const usage = reactive({ show: false, orderNo: '', rows: [], loading: false, emptyTip: '' })
|
||
async function openUsage(row) {
|
||
// 空态细分(2026-11-02):接口对"组合为空"与"组合工艺均未配物料"都返回空数组,
|
||
// 前端按工单快照组合区分提示,避免"先建单后配工艺物料"时误导为配置丢失
|
||
const combo = Array.isArray(row.flowCombination) ? row.flowCombination : []
|
||
const tip = combo.length
|
||
? '该工单工艺组合中的工序尚未配置物料清单:请到「工艺」页为对应工序配置物料(物料实时按当前清单汇总,配置后重新打开即显示)。'
|
||
: '该工单建单时未选择工序工位组合(快照为空):编辑工单选择产品工艺/工序工位并保存后,才能按组合汇总用料;仅事后配置工艺物料不会自动关联到已建工单。'
|
||
Object.assign(usage, { show: true, orderNo: row.workOrderNo, rows: [], loading: true, emptyTip: tip })
|
||
try {
|
||
usage.rows = (await request.get('/order-usage', { params: { orderNo: row.workOrderNo } })) || []
|
||
} finally {
|
||
usage.loading = false
|
||
}
|
||
}
|
||
|
||
// ---------- 工单详情(只读:字段汇总 + 工件SN列表) ----------
|
||
// 工件SN列表:GET /workpieces?orderNo=&page=&pageSize=&status= 后端 SQL 分页(2026-10-20),
|
||
// 按 SN 升序(预生成 SN={产品工号}-{3位序号},即产品序号小号在前);产品序号列取 SN 末段序号。
|
||
const detail = reactive({ show: false, row: null, pieces: [], total: 0, loading: false, snMode: 0 })
|
||
const pieceQuery = reactive({ page: 1, pageSize: 100, status: '' })
|
||
// 产品序号=SN 末段数字(如 WO-20260918-001-001 → 1);扫入 SN(序列号=是)无该结构时显示 -
|
||
function pieceSerialText(row) {
|
||
const m = String(row.sn || '').match(/-(\d{1,4})$/)
|
||
return m ? String(parseInt(m[1], 10)) : '-'
|
||
}
|
||
async function loadPieces() {
|
||
if (!detail.row) return
|
||
detail.loading = true
|
||
try {
|
||
const d = await request.get('/workpieces', { params: {
|
||
orderNo: detail.row.workOrderNo, page: pieceQuery.page, pageSize: pieceQuery.pageSize, status: pieceQuery.status
|
||
} })
|
||
detail.pieces = d?.list || []
|
||
detail.total = d?.total || 0
|
||
} catch {
|
||
detail.pieces = []
|
||
detail.total = 0
|
||
} finally {
|
||
detail.loading = false
|
||
}
|
||
}
|
||
function onPieceFilter() {
|
||
pieceQuery.page = 1
|
||
loadPieces()
|
||
}
|
||
function onPieceSize() {
|
||
pieceQuery.page = 1
|
||
loadPieces()
|
||
}
|
||
let materialsCache = null
|
||
async function materialSnModeOf(code) {
|
||
if (!code) return 0
|
||
if (!materialsCache) {
|
||
try {
|
||
materialsCache = (await request.get('/materials')) || []
|
||
} catch {
|
||
materialsCache = []
|
||
}
|
||
}
|
||
const m = materialsCache.find((x) => x.code === code)
|
||
return m ? (m.snMode || 0) : 0
|
||
}
|
||
async function openDetail(row) {
|
||
Object.assign(detail, { show: true, row: null, pieces: [], total: 0, loading: false, snMode: 0 })
|
||
Object.assign(pieceQuery, { page: 1, pageSize: 100, status: '' })
|
||
try {
|
||
// 工单详情走 GET /work-orders/:id(含 已排产量/剩余未排产量 等统计字段)
|
||
const wo = await request.get('/work-orders/' + row.id)
|
||
detail.row = wo
|
||
buildDetailRoutes(wo)
|
||
await Promise.all([loadPieces(), materialSnModeOf(wo.productCode).then((m) => { detail.snMode = m })])
|
||
} finally {
|
||
detail.loading = false
|
||
}
|
||
}
|
||
|
||
// ---------- 工艺路线(详情抽屉,2026-10-19):按 flowCombination 去重、按工位号升序 ----------
|
||
// 展示工艺名+步骤数,可展开步骤列表;不显示工位列(工位号仅作为排序口径)。
|
||
const detailRoutes = ref([])
|
||
function buildDetailRoutes(row) {
|
||
const combo = Array.isArray(row?.flowCombination) ? row.flowCombination : []
|
||
const minStation = new Map()
|
||
for (const c of combo) {
|
||
if (!c || !c.flowId) continue
|
||
const cur = minStation.get(c.flowId)
|
||
if (cur === undefined || c.stationNo < cur) minStation.set(c.flowId, c.stationNo)
|
||
}
|
||
const ids = [...minStation.keys()].sort((a, b) => minStation.get(a) - minStation.get(b))
|
||
detailRoutes.value = ids.map((fid) => {
|
||
const f = flows.value.find((x) => x.id === fid)
|
||
return {
|
||
flowId: fid,
|
||
flowName: f ? f.name : `工艺${fid}`,
|
||
steps: (f?.steps || []).slice().sort((a, b) => (a.seq || 0) - (b.seq || 0))
|
||
.map((s) => ({ name: s.name, needCheck: !!s.needCheck, needOperatorSign: !!s.needOperatorSign, needInspectorSign: !!s.needInspectorSign })),
|
||
expanded: false
|
||
}
|
||
})
|
||
}
|
||
|
||
// 检测/签字要求(详情抽屉):汇总该工艺各步骤的门禁要求(2026-10-20 客户要求详情展示工艺门禁)
|
||
function stepReqText(row) {
|
||
const n = (fn) => row.steps.filter(fn).length
|
||
const parts = []
|
||
if (n((s) => s.needCheck)) parts.push(`检测确认 ${n((s) => s.needCheck)} 步`)
|
||
if (n((s) => s.needOperatorSign)) parts.push(`操作工签字 ${n((s) => s.needOperatorSign)} 步`)
|
||
if (n((s) => s.needInspectorSign)) parts.push(`检验员签字 ${n((s) => s.needInspectorSign)} 步`)
|
||
return parts.length ? parts.join(';') : '—'
|
||
}
|
||
|
||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, planStart: '', planEnd: '', status: 'CREATED', productProcessId: 0 })
|
||
|
||
// ---------- 产品工艺(2026-10-09):建单选产品自动带出默认产品工艺,自动填工艺组合(快捷选择+偏差提示) ----------
|
||
const productProcesses = ref([])
|
||
const ppWarnings = ref([])
|
||
const router = useRouter()
|
||
// 工单不嵌路线卡(客户裁定):想看定义层就跳「工艺」页(默认产品工艺 tab)查看/打印路线卡
|
||
// 2026-11-02 修复:原跳 /product-process 无此路由(命中 catch-all 被静默重定向,表现为"点击没反应")
|
||
function goProductProcess() {
|
||
router.push('/process-flow')
|
||
}
|
||
|
||
async function loadProductProcesses() {
|
||
productProcesses.value = []
|
||
dialog.productProcessId = 0
|
||
ppWarnings.value = []
|
||
if (!dialog.productCode) return
|
||
try {
|
||
productProcesses.value = (await request.get('/product-processes', { params: { productCode: dialog.productCode, status: 'ACTIVE' } })) || []
|
||
} catch {
|
||
productProcesses.value = []
|
||
}
|
||
if (productProcesses.value.length) {
|
||
const d = productProcesses.value[0]
|
||
dialog.productProcessId = d.id
|
||
await applyProductProcess(d.id)
|
||
} else {
|
||
ppWarnings.value = ['该产品尚未配置产品工艺(可在「产品工艺」页创建),工艺组合需手动勾选']
|
||
}
|
||
}
|
||
|
||
// 选产品工艺 → 按工序顺序构建「每道工序一个工位」行,并贪心填默认工位(用户可逐道改)
|
||
async function applyProductProcess(id) {
|
||
ppWarnings.value = []
|
||
comboStaleWarn.value = ''
|
||
if (!id) {
|
||
processRows.value = []
|
||
comboError.value = ''
|
||
return
|
||
}
|
||
const pp = productProcesses.value.find((p) => p.id === id)
|
||
if (!pp) {
|
||
processRows.value = []
|
||
comboError.value = ''
|
||
return
|
||
}
|
||
buildProcessRows(pp)
|
||
// 某道无绑定工位(无解):提示(工位管理阶段就该发现)
|
||
const noCand = processRows.value.find((r) => r.options.length === 0)
|
||
if (noCand) {
|
||
ppWarnings.value = [`工序「${noCand.flowName}」没有可用的绑定工位(工位管理未绑定或已停用),暂无法自动推荐工位。请先在「工位管理」为该工序绑定启用工位。`]
|
||
}
|
||
}
|
||
|
||
async function load() {
|
||
const params = {
|
||
orderNo: query.orderNo, productCode: query.productCode, productName: query.productName,
|
||
contractNo: query.contractNo, ownershipType: query.ownershipType, status: query.status
|
||
}
|
||
const data = await request.get('/work-orders', { params })
|
||
list.value = data || []
|
||
}
|
||
async function loadProducts() {
|
||
productTypes.value = (await request.get('/product-types', { params: { isActive: 'true' } })) || []
|
||
}
|
||
function genOrderNo() {
|
||
const d = new Date()
|
||
const ymd = `${d.getFullYear()}${String(d.getMonth() + 1).padStart(2, '0')}${String(d.getDate()).padStart(2, '0')}`
|
||
return `WO-${ymd}-001`
|
||
}
|
||
// Q1=A:选产品型号后自动带出图号/名称(只读,避免手填错位;图号=产品序号,同值)
|
||
// 2026-10-09:同时带出该产品的产品工艺(默认优先),自动填工艺组合
|
||
function onProductTypeChange(id) {
|
||
const p = productTypes.value.find((x) => x.id === id)
|
||
if (p) {
|
||
dialog.productCode = p.code || ''
|
||
dialog.productName = p.name || ''
|
||
} else {
|
||
dialog.productCode = ''
|
||
dialog.productName = ''
|
||
}
|
||
loadProductProcesses()
|
||
}
|
||
function openCreate() {
|
||
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, planStart: '', planEnd: '', status: 'CREATED', productProcessId: 0 })
|
||
productProcesses.value = []
|
||
ppWarnings.value = []
|
||
processRows.value = []
|
||
comboError.value = ''
|
||
comboStaleWarn.value = ''
|
||
}
|
||
async function openEdit(row) {
|
||
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', ownershipType: row.ownershipType || '', productSerial: row.productSerial || '', quantity: row.quantity, planStart: row.planStart ? String(row.planStart).slice(0, 10) : '', planEnd: row.planEnd ? String(row.planEnd).slice(0, 10) : '', status: row.status, productProcessId: row.productProcessId || 0 })
|
||
// 编辑:带出该产品可选的产品工艺(不自动重填组合,保留已保存组合)
|
||
productProcesses.value = []
|
||
ppWarnings.value = []
|
||
comboError.value = ''
|
||
if (row.productCode) {
|
||
try {
|
||
productProcesses.value = (await request.get('/product-processes', { params: { productCode: row.productCode, status: 'ACTIVE' } })) || []
|
||
} catch {
|
||
productProcesses.value = []
|
||
}
|
||
}
|
||
buildEditProcessRows(row)
|
||
}
|
||
async function save() {
|
||
// 归属(一级编号)二选一口径:类型必选;合同号/科技项目号必填编号,其他可空
|
||
if (!dialog.ownershipType) return ElMessage.warning('请选择归属类型(合同号/科技项目号/其他)')
|
||
if (dialog.ownershipType !== 'other' && !String(dialog.contractNo || '').trim()) {
|
||
return ElMessage.warning(dialog.ownershipType === 'project' ? '归属类型为科技项目号,请填写归属编号' : '归属类型为合同号,请填写归属编号')
|
||
}
|
||
// 工序工位:带产品工艺时每道工序必须至少选一个工位(前端即时拦,后端仍兜底)
|
||
if (dialog.productProcessId > 0 && processRows.value.some((r) => !r.stationNos || r.stationNos.length === 0)) {
|
||
const miss = processRows.value.filter((r) => !r.stationNos || r.stationNos.length === 0).map((r) => r.flowName).join('、')
|
||
return ElMessage.warning('请为每道工序至少选择一个工位:' + miss)
|
||
}
|
||
// 建单不强制工艺组合(工单≠开工):排产/开工时由后端校验组合非空
|
||
if (!flowCombination.value.length) ElMessage.warning('未选择工艺组合:排产/开工前须配置')
|
||
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, ownershipType: dialog.ownershipType, productSerial: dialog.productSerial, quantity: dialog.quantity, planStart: dialog.planStart, planEnd: dialog.planEnd, flowCombination: flowCombination.value, productProcessId: dialog.productProcessId || 0 }
|
||
let resp = null
|
||
if (dialog.id) resp = await request.put('/work-orders', body)
|
||
else resp = await request.post('/work-orders', body)
|
||
ElMessage.success('保存成功')
|
||
// 产品工艺偏差柔性警告(2026-10-20:顺序不符已由后端硬拦截不会保存成功,这里只剩覆盖/个数类提示)
|
||
const ws = (resp && resp.warnings) || []
|
||
if (ws.length) {
|
||
ElMessageBox.alert(ws.map((w, i) => (i + 1) + '. ' + w).join('\n'), '与产品工艺存在偏差(已保存)', {
|
||
type: 'warning', confirmButtonText: '知道了'
|
||
}).catch(() => {})
|
||
}
|
||
dialog.show = false
|
||
load()
|
||
}
|
||
|
||
async function changeStatus(row, status) {
|
||
const label = statusText(status)
|
||
// 取消/暂停允许填原因(可选),写入操作日志
|
||
let reason = ''
|
||
if (status === 'CANCELLED' || status === 'PAUSED') {
|
||
try {
|
||
const r = await ElMessageBox.prompt(
|
||
`确认将工单「${row.workOrderNo}」${label}?可填写原因(用于操作日志,可留空)。`,
|
||
label, { type: 'warning', confirmButtonText: '确认' })
|
||
reason = (r.value || '').trim()
|
||
} catch {
|
||
return // 用户取消输入 → 放弃本次操作
|
||
}
|
||
} else {
|
||
await ElMessageBox.confirm(`确认将工单「${row.workOrderNo}」${label}?`, '提示', { type: 'warning' })
|
||
}
|
||
await request.post('/work-orders/status', { id: row.id, status, reason })
|
||
ElMessage.success(`已${label}`)
|
||
load()
|
||
}
|
||
|
||
async function del(row) {
|
||
await ElMessageBox.confirm(
|
||
`确认删除工单「${row.workOrderNo}」?\n仅「已创建」状态且无排产、备料、生产数据的工单可删除。`,
|
||
'删除工单', { type: 'warning', confirmButtonText: '删除', confirmButtonClass: 'el-button--danger' })
|
||
await request.delete(`/work-orders/${row.id}`)
|
||
ElMessage.success('工单已删除')
|
||
load()
|
||
}
|
||
|
||
// 操作列「更多 ▾」菜单分发:用料 / 自动排产 / 状态操作 / 编辑 / 删除 / 强制完工
|
||
function onRowCmd(row, cmd) {
|
||
if (cmd === 'usage') return openUsage(row)
|
||
if (cmd === 'schedule') return openAutoSchedule(row)
|
||
if (cmd === 'edit') return openEdit(row)
|
||
if (cmd === 'del') return del(row)
|
||
if (cmd === 'force') return openForceComplete(row)
|
||
if (cmd.startsWith('st:')) return changeStatus(row, cmd.slice(3))
|
||
}
|
||
|
||
// ---- 强制完工(方案 A:终止+清单确认,2026-10-20 拍板)----
|
||
// 四项核对单:剩余未完工(显示不拦)/ 未完成排产(自动取消)/ 在途叫料(待备料自动取消、已发货人工处理)/ 在制工件(必须 0)
|
||
const fc = reactive({ show: false, id: 0, reason: '', preview: null, loading: false, submitting: false })
|
||
async function openForceComplete(row) {
|
||
fc.show = true; fc.id = row.id; fc.reason = ''; fc.preview = null; fc.loading = true
|
||
try {
|
||
fc.preview = await request.get(`/work-orders/${row.id}/force-complete/preview`)
|
||
} finally {
|
||
fc.loading = false
|
||
}
|
||
}
|
||
async function doForceComplete() {
|
||
if (!String(fc.reason || '').trim()) return ElMessage.warning('强制完工必须填写原因(写入操作日志)')
|
||
try {
|
||
await ElMessageBox.confirm(
|
||
`确认强制完工工单「${fc.preview.workOrderNo}」?未完成排产将自动取消、待备料叫料单自动取消,此操作不可恢复。`,
|
||
'强制完工', { type: 'warning', confirmButtonText: '确认强制完工', confirmButtonClass: 'el-button--warning' })
|
||
} catch {
|
||
return
|
||
}
|
||
fc.submitting = true
|
||
try {
|
||
await request.post('/work-orders/force-complete', { id: fc.id, reason: String(fc.reason).trim() })
|
||
ElMessage.success('工单已强制完工')
|
||
fc.show = false
|
||
load()
|
||
} finally {
|
||
fc.submitting = false
|
||
}
|
||
}
|
||
|
||
// ---- 自动排产(引导式,M9 定稿:预览逐日可调、总数据必须对上)----
|
||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }], planStart: '', quantity: 0, finishedNum: 0, preview: null, previewing: false, applying: false })
|
||
function openAutoSchedule(row) {
|
||
Object.assign(sched, {
|
||
show: true, orderNo: row.workOrderNo, mode: 'AVG', dailyQty: 1, segments: [{ range: null }],
|
||
planStart: row.planStart || '', quantity: row.quantity || 0, finishedNum: row.finishedNum || 0,
|
||
preview: null, previewing: false, applying: false
|
||
})
|
||
}
|
||
function addSegment() { sched.segments.push({ range: null }) }
|
||
function removeSegment(i) { sched.segments.splice(i, 1) }
|
||
// 可调日合计(应排总数校验用:合计必须等于 quota 才能确认)
|
||
const schedTotal = computed(() => {
|
||
if (!sched.preview) return 0
|
||
return sched.preview.rows.filter((r) => r.editable).reduce((a, r) => a + (r.qty || 0), 0)
|
||
})
|
||
// 生成预览(不落库):后端按模式给出初始逐日数量,已执行中/已完成的日期锁定展示
|
||
async function genPreview() {
|
||
const segments = sched.segments
|
||
.filter((s) => s.range && s.range.length === 2 && s.range[0] && s.range[1])
|
||
.map((s) => ({ start: s.range[0], end: s.range[1] }))
|
||
if (!segments.length) return ElMessage.warning('请至少选择一个日期区间')
|
||
if (sched.mode === 'FIXED' && sched.dailyQty <= 0) return ElMessage.warning('固定日产需填写每日产量(>0)')
|
||
sched.previewing = true
|
||
try {
|
||
sched.preview = await request.post('/work-orders/auto-schedule/preview', {
|
||
orderNo: sched.orderNo, mode: sched.mode, dailyQty: sched.dailyQty, segments
|
||
})
|
||
} finally {
|
||
sched.previewing = false
|
||
}
|
||
}
|
||
// 确认排产:Σ逐日数量必须等于应排总数(后端二次校验),生成「未启用」排产待人工启用
|
||
async function applySchedule() {
|
||
if (!sched.preview) return
|
||
const items = sched.preview.rows.filter((r) => r.editable).map((r) => ({ date: r.date, qty: r.qty || 0 }))
|
||
if (items.reduce((a, it) => a + it.qty, 0) !== sched.preview.quota) {
|
||
return ElMessage.warning('各日合计与应排总数不一致,请调平后再确认')
|
||
}
|
||
sched.applying = true
|
||
try {
|
||
await request.post('/work-orders/auto-schedule/apply', { orderNo: sched.orderNo, items })
|
||
ElMessage.success('排产已确认(待人工启用)')
|
||
sched.show = false
|
||
} finally {
|
||
sched.applying = false
|
||
}
|
||
}
|
||
|
||
onMounted(async () => { load(); loadProducts(); loadComboData() })
|
||
</script>
|
||
|
||
<style scoped>
|
||
.sched-tip { font-size: 12px; color: #909399; margin-top: 4px; }
|
||
.piece-toolbar { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
|
||
.piece-pagination { margin-top: 10px; justify-content: flex-end; }
|
||
.detail-subtitle { font-size: 13px; font-weight: 600; color: #303133; margin: 14px 0 8px; }
|
||
.combo-group { display: flex; flex-wrap: wrap; gap: 4px 12px; align-items: flex-start; width: 100%; }
|
||
.combo-group-title { width: 100%; font-size: 12px; font-weight: 600; color: #303133; background: #f5f7fa; padding: 4px 8px; border-radius: 4px; margin-top: 4px; }
|
||
.combo-group-title.combo-empty { color: #909399; font-weight: 500; }
|
||
.combo-station-name { margin-left: 6px; font-size: 12px; color: #909399; }
|
||
.combo-route { margin-top: 8px; font-size: 13px; color: #1668dc; background: #ecf3fe; padding: 6px 10px; border-radius: 4px; width: 100%; }
|
||
.combo-route-tip { color: #909399; font-size: 12px; }
|
||
.combo-tip { font-size: 12px; color: #909399; margin-top: 6px; line-height: 1.5; width: 100%; }
|
||
.combo-table { border: 1px solid #ebeef5; border-radius: 4px; overflow: hidden; width: 100%; }
|
||
.combo-row { display: flex; align-items: center; border-bottom: 1px solid #ebeef5; }
|
||
.combo-row:last-child { border-bottom: none; }
|
||
.combo-head { background: #f5f7fa; font-weight: 600; color: #303133; font-size: 12px; }
|
||
.combo-col-seq { width: 80px; padding: 8px 10px; flex: none; text-align: center; color: #606266; }
|
||
.combo-col-flow { width: 200px; padding: 8px 10px; flex: none; color: #303133; }
|
||
.combo-col-station { flex: 1; padding: 6px 10px; }
|
||
</style>
|