feat: 仓库简易打印、工作站标签打印、生产订单打印工序修复
- 仓库管理(mom-frontend-vue2): 新增简易标签打印,不依赖MinIO,使用前端qrcode+window.print - 工作站(erp-frontend-vue): 新增WorkstationLabelPrint组件,支持批量打印工作站标签 - 生产订单: handlePrint改用getProcessTasksByWorkorder,从工艺路线获取工序数据,解决无pro_task时打印无数据问题 Made-with: Cursor
This commit is contained in:
@@ -152,6 +152,10 @@ export function getWorkOrderDetail(workorderId: number): Promise<WorkOrder> {
|
||||
if (data.requestDate && !data.productionDate) {
|
||||
data.productionDate = data.requestDate
|
||||
}
|
||||
// 后端返回 salesOrderCode(pp_number),确保前端有值
|
||||
if (data.ppNumber && !data.salesOrderCode) {
|
||||
data.salesOrderCode = data.ppNumber
|
||||
}
|
||||
return data
|
||||
})
|
||||
}
|
||||
@@ -260,7 +264,7 @@ export interface ProTask {
|
||||
updateTime?: string
|
||||
}
|
||||
|
||||
/** 根据工单 ID 获取工序任务列表 */
|
||||
/** 根据工单 ID 获取工序任务列表(pro_task 表,需已排产) */
|
||||
export function getTaskListByWorkorder(workorderId: number): Promise<ProTask[]> {
|
||||
return request.get('/mes/pro/protask/list', {
|
||||
params: { workorderId, pageNum: 1, pageSize: 500 }
|
||||
@@ -269,6 +273,14 @@ export function getTaskListByWorkorder(workorderId: number): Promise<ProTask[]>
|
||||
})
|
||||
}
|
||||
|
||||
/** 根据工单 ID 获取工序列表(基于工艺路线,不依赖 pro_task,用于打印等) */
|
||||
export function getProcessTasksByWorkorder(workorderId: number): Promise<ProTask[]> {
|
||||
return request.get(`/mes/pro/workorder/${workorderId}/processTasks`).then((res: any) => {
|
||||
const data = res.data ?? res
|
||||
return Array.isArray(data) ? data : []
|
||||
})
|
||||
}
|
||||
|
||||
// ============ 工艺路线选择 API ============
|
||||
|
||||
/** 工艺路线列表(选择弹窗,不默认过滤 enableFlag 以避免列表为空) */
|
||||
|
||||
Reference in New Issue
Block a user