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

gaoluyang

13 小时以前 6c0b0dd81a98a3163e45f1b5b5417e02af165fd8

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

@@ -70,6 +70,13 @@
  export interface ParamValue {
    detailId: number;
    value?: string;
    // ---- 回显字段（报工详情/列表返回） ----
    paramCode?: string;
    paramName?: string;
    paramType?: number;
    unitMeasureName?: string;
    paramValue?: string;
    required?: boolean;
  }

  /** MES 生产报工分页查询参数 */
@@ -171,8 +178,6 @@
  taskId: number;
  paramValues?: MesProFeedbackApi.ParamValue[];
  feedbackQuantity: number;
  qualifiedQuantity?: number;
  unqualifiedQuantity?: number;
  remark?: string;
}

@@ -181,14 +186,14 @@
  feedbackId?: number;
  taskStatus?: number;
  workOrderStatus?: number;
  /** 报工后剩余可报工数量 */
  reportableQuantity?: number;
}

/** 批量报工请求 */
export interface BatchCreateReq {
  taskIds: number[];
  feedbackQuantity: number;
  qualifiedQuantity?: number;
  unqualifiedQuantity?: number;
  remark?: string;
}