From 8f8dcdae7e40ba4e94a363aa8eb91c7665810bc3 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 31 八月 2026 15:29:17 +0800
Subject: [PATCH] fix: 新疆-绿能 1.报工自动生成产品入库单 + 勾选入库 + 不合格仓库兜底
---
src/views/mes/pro/feedback/modules/form.vue | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 24 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index a295a40..6a1796f 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -25,14 +25,24 @@
updateFeedback,
} from '#/api/mes/pro/feedback';
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getTask } from '#/api/mes/pro/task';
import { getWorkOrder } from '#/api/mes/pro/workorder';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
-import { findMissingRequiredParams, loadParamDetails, paramDetails } from '../param-state';
+import {
+ findMissingRequiredParams,
+ loadParamDetails,
+ paramDetails,
+ resetWaitConfig,
+ waitDuration,
+ waitStartTime,
+ waitTaskId,
+} from '../param-state';
import BatchInputDialog from './batch-input-dialog.vue';
import ItemConsumeList from './item-consume-list.vue';
import ProductProduceList from './product-produce-list.vue';
+import WaitCountdown from './wait-countdown.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
@@ -87,27 +97,30 @@
wrapperClass: 'grid-cols-3',
});
-/** 鎻愪氦鍓嶅榻愭暟閲忥細鏍规嵁 checkFlag 鍐冲畾 uncheck/鍚堟牸/涓嶈壇褰掗浂绛栫暐 */
-function alignQuantity(data: MesProFeedbackApi.Feedback) {
- if (data.checkFlag) {
- data.uncheckQuantity = data.feedbackQuantity;
- data.qualifiedQuantity = 0;
- data.unqualifiedQuantity = 0;
- data.laborScrapQuantity = 0;
- data.materialScrapQuantity = 0;
- data.otherScrapQuantity = 0;
- } else {
- data.feedbackQuantity =
- (data.qualifiedQuantity || 0) + (data.unqualifiedQuantity || 0);
- data.uncheckQuantity = 0;
+/** 鎻愪氦鍓嶅榻愭暟閲忥細鎶ュ伐鍙～鍐欐姤宸ユ暟閲忥紝鍚堟牸/涓嶈壇/搴熷搧鏁伴噺鐢辫川妫�纭畾锛屾姤宸ョ幆鑺備笉閲囬泦 */
+function alignQuantity(
+ data: MesProFeedbackApi.Feedback,
+ needReportQuantity: boolean,
+) {
+ if (!needReportQuantity) {
+ data.feedbackQuantity = 0;
}
+ data.uncheckQuantity = data.checkFlag ? data.feedbackQuantity : 0;
+ delete data.qualifiedQuantity;
+ delete data.unqualifiedQuantity;
+ delete data.laborScrapQuantity;
+ delete data.materialScrapQuantity;
+ delete data.otherScrapQuantity;
}
/** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
- const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+ const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback & {
+ needReportQuantity?: boolean;
+ };
syncParamValues(data);
- alignQuantity(data);
+ alignQuantity(data, data.needReportQuantity !== false);
+ delete data.needReportQuantity;
return data;
}
@@ -149,7 +162,7 @@
}
const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
-const batchActionType = ref<'submit' | 'approve'>('');
+const batchActionType = ref<'' | 'submit' | 'approve'>('');
function syncParamValues(data: MesProFeedbackApi.Feedback) {
data.paramValues = paramDetails.value.map((detail) => ({
@@ -298,19 +311,24 @@
}
}
-/** 鍔犺浇宸ュ簭鐨� checkFlag 鐢ㄤ簬鍥炴樉鏁伴噺鍖哄煙 */
-async function resolveCheckFlag(routeId?: number, processId?: number) {
+/** 鍔犺浇宸ュ簭閰嶇疆锛坈heckFlag / 绛夊緟鏃堕暱 / 鎶ュ伐鏁伴噺瑙勫垯锛夌敤浜庡洖鏄� */
+async function resolveRouteProcessConfig(routeId?: number, processId?: number) {
if (!routeId || !processId) {
- return true;
+ return { checkFlag: true, needReportQuantity: true };
}
try {
const routeProcess = await getRouteProcessByRouteAndProcess(
routeId,
processId,
);
- return routeProcess?.checkFlag ?? false;
+ waitDuration.value = routeProcess?.waitDuration;
+ return {
+ checkFlag: routeProcess?.checkFlag ?? false,
+ needReportQuantity: routeProcess?.needReportQuantity ?? true,
+ };
} catch {
- return true;
+ waitDuration.value = undefined;
+ return { checkFlag: true, needReportQuantity: true };
}
}
@@ -328,6 +346,9 @@
subTabsName.value = 'itemConsume';
originalSnapshot.value = '';
paramDetails.value = [];
+ resetWaitConfig();
+ // 鍏抽棴鏃舵竻绌� id锛岄伩鍏嶄笅娆℃柊澧炴姤宸ユ椂璇甫鏃т富閿鑷翠富閿啿绐�
+ await formApi.setFieldValue('id', undefined);
return;
}
// 鍔犺浇鏁版嵁
@@ -350,6 +371,8 @@
const code = await generateAutoCode(
MesAutoCodeRuleCode.PRO_FEEDBACK_CODE,
);
+ // 娓呯┖涓婁竴鏉℃姤宸ユ畫鐣欑殑 id锛岄伩鍏嶆柊澧炴椂璇甫鏃т富閿鑷翠富閿啿绐�
+ await formApi.setFieldValue('id', undefined);
await formApi.setValues({
code,
feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -363,12 +386,26 @@
try {
formData.value = await getFeedback(data.id);
await loadParamDetails(formData.value.taskId);
- const checkFlag = await resolveCheckFlag(
+ const config = await resolveRouteProcessConfig(
formData.value.routeId,
formData.value.processId,
);
+ waitTaskId.value = formData.value.taskId;
+ waitStartTime.value = undefined;
+ if (formData.value.taskId) {
+ try {
+ const task = await getTask(formData.value.taskId);
+ waitStartTime.value = task?.waitStartTime;
+ } catch {
+ // 浠诲姟涓嶅瓨鍦ㄦ椂蹇界暐鍊掕鏃跺洖鏄�
+ }
+ }
// 璁剧疆鍒� values
- await formApi.setValues({ ...formData.value, checkFlag });
+ await formApi.setValues({
+ ...formData.value,
+ checkFlag: config.checkFlag,
+ needReportQuantity: config.needReportQuantity,
+ });
// 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
originalSnapshot.value = JSON.stringify(await getAlignedData());
} finally {
@@ -381,6 +418,18 @@
<template>
<Modal :title="getTitle" class="w-3/5">
<Form class="mx-4" />
+ <div
+ v-if="waitDuration"
+ class="mx-4 mt-4 rounded border border-gray-200 p-4"
+ >
+ <div class="mb-2 font-medium">鎶ュ伐鍊掕鏃�</div>
+ <WaitCountdown
+ :task-id="waitTaskId"
+ :wait-duration="waitDuration"
+ :wait-start-time="waitStartTime"
+ :disabled="!isEditable"
+ />
+ </div>
<div v-if="paramDetails.length" class="mx-4 mt-4 rounded border border-gray-200 p-4">
<div class="mb-3 font-medium">宸ヨ壓鍙傛暟</div>
<div class="grid grid-cols-2 gap-3">
--
Gitblit v1.9.3