Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0

云

6 天以前 5dbc69b4e792dcce998038822b92402366bec47f

 src/api/mes/pro/workorder/index.ts

@@ -1,4 +1,4 @@
import type { PageParam, PageResult } from '@vben/request';
import type { PageParam, PageResult } from '@vben/request';

import { requestClient } from '#/api/request';

@@ -14,6 +14,7 @@
    productId?: number; // 产品编号
    productName?: string; // 产品名称
    productCode?: string; // 产品编码
    itemCode?: string; // 产品编码（物料编码）
    productSpecification?: string; // 规格型号
    unitMeasureName?: string; // 单位名称
    quantity?: number; // 生产数量
@@ -33,6 +34,10 @@
    finishDate?: number; // 完成时间
    cancelDate?: number; // 取消时间
    status?: number; // 订单状态
    scheduleStatus?: number; // 排产状态
    productionStatus?: number; // 生产状态
    processProgressList?: ProcessProgress[]; // 工序生产进度
    completionProgress?: number; // 完成进度
    remark?: string; // 备注
    createTime?: number; // 创建时间
  }
@@ -55,6 +60,14 @@
  return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
    '/mes/pro/work-order/page',
    { params },
  );
}

/** 获得生产工单调度状态分页 */
export function getWorkOrderSchedulePage(params: MesProWorkOrderApi.PageParams) {
  return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
      '/mes/pro/work-order/schedule-page',
      { params },
  );
}

@@ -99,3 +112,50 @@
export function confirmWorkOrder(id: number) {
  return requestClient.put(`/mes/pro/work-order/confirm?id=${id}`);
}

/** 工单进度详情 */
export interface WorkOrderProgress {
  workOrderId?: number;
  workOrderCode?: string;
  quantity?: number;
  quantityScheduled?: number;
  quantityProduced?: number;
  progressPercent?: number;
  processList?: ProcessProgress[];
}

export interface ProcessProgress {
  processId?: number;
  processCode?: string;
  processName?: string;
  keyFlag?: boolean;
  plannedQuantity?: number;
  producedQuantity?: number;
  progressPercent?: number;
  status?: number;
  taskList?: TaskInfo[];
}

export interface TaskInfo {
  taskId?: number;
  taskCode?: string;
  workstationName?: string;
  quantity?: number;
  producedQuantity?: number;
  progressPercent?: number;
  status?: number;
}

/** 获取工单进度详情 */
export function getWorkOrderProgress(id: number) {
  return requestClient.get<WorkOrderProgress>(
    `/mes/pro/work-order/progress/${id}`,
  );
}

/** 检查并自动完成工单 */
export function checkAndAutoFinishWorkOrder(id: number) {
  return requestClient.post<boolean>(
    `/mes/pro/work-order/check-auto-finish/${id}`,
  );
}