feat: 退料闭环定稿(损耗台账/备料清单/退料AGV自动派车/剩余量参考)+ 工位托盘守卫
- MES 新增损耗台账 loss_ledger,差异确认损耗接口 ConfirmReceiveLoss(按工单归集) - 备料清单 preparation:MES 按 日计划×工单×工位×物料 实时计算,WMS 只读展示 PreparationList - 退料闭环:N5 工位托盘守卫(未完成禁止退料)、退料 AGV 自动派车(JBT21 空位判定 + 托盘回收链路)、退料参考剩余量接口(应剩余=实备-已耗-已退-已损) - 新增 AGV 车辆状态表 agv_vehicle_state 及查询 - 整合接驳台/叫料池/库存锁既有闭环,清理 sql 目录注释生成脚本与 catalog,更新文档
This commit is contained in:
@@ -166,8 +166,12 @@ export function LineModel({ data }: { data: DashboardData }) {
|
||||
const mainMap = new Map<string, LinePoint>(data.points.main.map((p) => [p.code, p]));
|
||||
const dockMap = new Map<string, LinePoint>(data.points.dock.map((p) => [p.code, p]));
|
||||
const hasMain = (n: number) => mainMap.get(`C${n}`)?.has ?? false;
|
||||
const hasDock = (g: number, r: 1 | 2) => dockMap.get(`G${g}${r === 1 ? 'L' : 'R'}`)?.has ?? false;
|
||||
const hasJbt = dockMap.get('JBT21')?.has ?? false;
|
||||
// 左右互换(2026-11-03 拍板):偶数工位 地图左槽=GxR、右槽=GxL;奇数工位 地图左槽=GxL、右槽=GxR。
|
||||
// 占用与标签都按稳定码从后端数据取(label=中文,后端下发),不再写死。
|
||||
const dockCode = (g: number, slot: 1 | 2) => (g % 2 === 0 ? (slot === 1 ? `G${g}R` : `G${g}L`) : (slot === 1 ? `G${g}L` : `G${g}R`));
|
||||
const dockLabel = (g: number, slot: 1 | 2) => dockMap.get(dockCode(g, slot))?.label || (dockCode(g, slot) === `G${g}L` ? `工位${g}左` : `工位${g}右`);
|
||||
const hasDockSlot = (g: number, slot: 1 | 2) => dockMap.get(dockCode(g, slot))?.has ?? false;
|
||||
|
||||
const inStation = stations.filter((s) => !!s.currentSn).length;
|
||||
const inMain = data.points.main.filter((p) => p.has).length;
|
||||
@@ -290,10 +294,10 @@ export function LineModel({ data }: { data: DashboardData }) {
|
||||
<StationBox x={center} y={STATION_BOT_Y} station={byNo.get(down)} no={down} />
|
||||
{!isEnd && (
|
||||
<>
|
||||
<DockBox x={dockX(center, 1)} y={DOCK_TOP_Y} has={hasDock(up, 1)} label={`工位${up}左`} />
|
||||
<DockBox x={dockX(center, 2)} y={DOCK_TOP_Y} has={hasDock(up, 2)} label={`工位${up}右`} />
|
||||
<DockBox x={dockX(center, 1)} y={DOCK_BOT_Y} has={hasDock(down, 1)} label={`工位${down}左`} below />
|
||||
<DockBox x={dockX(center, 2)} y={DOCK_BOT_Y} has={hasDock(down, 2)} label={`工位${down}右`} below />
|
||||
<DockBox x={dockX(center, 1)} y={DOCK_TOP_Y} has={hasDockSlot(up, 1)} label={dockLabel(up, 1)} />
|
||||
<DockBox x={dockX(center, 2)} y={DOCK_TOP_Y} has={hasDockSlot(up, 2)} label={dockLabel(up, 2)} />
|
||||
<DockBox x={dockX(center, 1)} y={DOCK_BOT_Y} has={hasDockSlot(down, 1)} label={dockLabel(down, 1)} below />
|
||||
<DockBox x={dockX(center, 2)} y={DOCK_BOT_Y} has={hasDockSlot(down, 2)} label={dockLabel(down, 2)} below />
|
||||
</>
|
||||
)}
|
||||
</g>
|
||||
|
||||
@@ -12,15 +12,15 @@ const C = {
|
||||
dim: '#64748b',
|
||||
};
|
||||
|
||||
/** 同屏最多展示的订单数(多订单混生产:并列展示,不再轮播;超出部分折叠为 +N) */
|
||||
/** 同屏最多展示的工单数(多工单混生产:并列展示,不再轮播;超出部分折叠为 +N) */
|
||||
const MAX_VISIBLE = 4;
|
||||
|
||||
/** 单张订单卡(单订单时占满左块):合同/工期/完成度 */
|
||||
/** 单张工单卡(单工单时占满左块):合同/工期/完成度 */
|
||||
function OrderCard({ order }: { order: ProductionProgress }) {
|
||||
return (
|
||||
<div style={{ flex: '1 1 46%', minWidth: 0, display: 'flex', flexDirection: 'column', gap: 'clamp(4px, 0.7vh, 9px)' }}>
|
||||
<div style={{ fontSize: 'clamp(15px, 1.25vw, 48px)', fontWeight: 600, color: '#eaf6ff', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
|
||||
{order.contractNo || order.orderNo || '暂无在产订单'}
|
||||
{order.contractNo || order.orderNo || '暂无在产工单'}
|
||||
</div>
|
||||
|
||||
<div style={{ fontSize: 'clamp(11px, 0.85vw, 33px)', color: C.sub, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
|
||||
@@ -63,7 +63,7 @@ function OrderCard({ order }: { order: ProductionProgress }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** 紧凑订单行(多订单并列展示):一行一单,共享左块高度 */
|
||||
/** 紧凑工单行(多工单并列展示):一行一单,共享左块高度 */
|
||||
function MiniOrderCard({ order }: { order: ProductionProgress }) {
|
||||
return (
|
||||
<div
|
||||
@@ -111,11 +111,11 @@ function MiniOrderCard({ order }: { order: ProductionProgress }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** 底部左块 · 当前订单(多订单同屏并列展示)+ 近 7 日产量趋势 */
|
||||
/** 底部左块 · 当前工单(多工单同屏并列展示)+ 近 7 日产量趋势 */
|
||||
export function ProductionBoard({ data }: { data: DashboardData }) {
|
||||
const { trends } = data;
|
||||
|
||||
// 多订单同屏:progressList 优先(后端下发,进行中排前),未升级时退回单条 progress
|
||||
// 多工单同屏:progressList 优先(后端下发,进行中排前),未升级时退回单条 progress
|
||||
const orders = useMemo<ProductionProgress[]>(() => {
|
||||
const list = (data.progressList || []).filter((o) => o && (o.orderNo || o.contractNo));
|
||||
if (list.length > 0) return list;
|
||||
@@ -158,14 +158,14 @@ export function ProductionBoard({ data }: { data: DashboardData }) {
|
||||
return (
|
||||
<div className="panel">
|
||||
<div className="panel-head">
|
||||
当前订单
|
||||
当前工单
|
||||
<span className="note">{orders.length > 1 ? '多单并行 · 合同 · 工期 · 完成度' : '合同 · 工期 · 完成度'}</span>
|
||||
{hiddenCount > 0 && (
|
||||
<span style={{ marginLeft: 'auto', fontSize: 'clamp(9px, 0.7vw, 26px)', color: C.dim }}>+{hiddenCount} 单未展示</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="panel-body" style={{ flexDirection: 'row', gap: 'clamp(8px, 0.9vw, 40px)' }}>
|
||||
{/* 左:订单信息(多订单同屏并列,进行中排前;单订单保持原大卡) */}
|
||||
{/* 左:工单信息(多工单同屏并列,进行中排前;单工单保持原大卡) */}
|
||||
<div style={{ flex: '1 1 46%', minWidth: 0, display: 'flex', flexDirection: 'column', gap: 'clamp(4px, 0.7vh, 9px)' }}>
|
||||
{visible.length === 1 && visible[0] ? (
|
||||
<OrderCard order={visible[0]} />
|
||||
|
||||
Reference in New Issue
Block a user