From 679c5b64e0dcbee2ea29c38c9c55c3ff1d4b6258 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 10:51:36 +0800
Subject: [PATCH] 诚发五金:入库/调整/移库/调拨/盘点表单去掉库区库位选择,改由后端默认库区库位兜底
---
src/views/mes/pro/workorder/modules/form.vue | 283 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 175 insertions(+), 108 deletions(-)
diff --git a/src/views/mes/pro/workorder/modules/form.vue b/src/views/mes/pro/workorder/modules/form.vue
index 72d0374..d5fe083 100644
--- a/src/views/mes/pro/workorder/modules/form.vue
+++ b/src/views/mes/pro/workorder/modules/form.vue
@@ -2,17 +2,16 @@
import type { FormType } from "../data";
import type { MesProWorkOrderApi } from "#/api/mes/pro/workorder";
- import type { MesProWorkOrderProcessApi } from "#/api/mes/pro/workorder/process";
import { computed, ref } from "vue";
import { confirm, useVbenModal } from "@vben/common-ui";
import {
- BarcodeBizTypeEnum,
MesProWorkOrderStatusEnum,
} from "@vben/constants";
+ import { isAiEnable } from "@vben/hooks";
- import { Button, message, Tabs } from "ant-design-vue";
+ import { Button, message, Modal as AntModal, Tabs } from "ant-design-vue";
import { useVbenForm } from "#/adapter/form";
import {
@@ -22,23 +21,26 @@
getWorkOrder,
updateWorkOrder,
} from "#/api/mes/pro/workorder";
- import { batchSaveWorkOrderProcess, getWorkOrderProcessListByWorkOrderId } from "#/api/mes/pro/workorder/process";
import { $t } from "#/locales";
- import { BarcodeDetail } from "#/views/wls/barcode/components";
+ // import { BarcodeDetail } from "#/views/wls/barcode/components";
import { useFormSchema } from "../data";
+ import PredictDelivery from "./ai/predict-delivery.vue";
+ import PredictDuration from "./ai/predict-duration.vue";
+ import PredictMaterial from "./ai/predict-material.vue";
+ import PredictRisk from "./ai/predict-risk.vue";
+ import { getWorkOrderBomItemPreview } from '#/api/mes/pro/workorder/bom';
+
import ItemList from "./item-list.vue";
- import ProcessList from "./process-list.vue";
+ import MaterialPreview from "./material-preview.vue";
const emit = defineEmits(["success"]);
const formType = ref<FormType>("create");
const formData = ref<MesProWorkOrderApi.WorkOrder>();
const originalSnapshot = ref("");
- const subTabsName = ref("process");
- const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
- const processListRef = ref<InstanceType<typeof ProcessList>>();
- const currentProductId = ref<number>(); // 褰撳墠閫変腑鐨勪骇鍝� ID锛堢敤浜庡伐搴忓姞杞斤級
- const tempProcessList = ref<MesProWorkOrderProcessApi.WorkOrderProcess[]>([]); // 涓存椂宸ュ簭鍒楄〃
+ const subTabsName = ref("item");
+ // const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+ const previewParams = ref<{ productId?: number; quantity?: number }>({}); // 杈呮枡棰勮鍙傛暟
const isEditable = computed(() =>
["create", "update"].includes(formType.value)
@@ -50,6 +52,13 @@
() =>
formType.value === "update" &&
formData.value?.status === MesProWorkOrderStatusEnum.PREPARE
+ );
+ const canUseAi = computed(
+ () =>
+ isAiEnable() &&
+ formData.value?.id &&
+ (formData.value?.status === MesProWorkOrderStatusEnum.PREPARE ||
+ formData.value?.status === MesProWorkOrderStatusEnum.CONFIRMED)
);
const getTitle = computed(() => {
const isChild = !!formData.value?.parentId;
@@ -87,47 +96,112 @@
schema: [],
showDefaultActions: false,
wrapperClass: "grid-cols-3",
- handleValuesChange: (values, fieldsChanged) => {
- // 浜у搧鍙樻洿鏃讹紝瑙﹀彂宸ュ簭鍔犺浇
- if (isCreateMode.value && fieldsChanged.includes('productId')) {
- const newProductId = values.productId;
- if (newProductId && newProductId !== currentProductId.value) {
- currentProductId.value = newProductId;
- }
+ handleValuesChange: async (values, fieldsChanged) => {
+ // 宸ュ巶鍙樻洿鏃讹紝娓呯┖宸查�夎溅闂达紙杞﹂棿蹇呴』灞炰簬鎵�閫夊伐鍘傦級
+ if (fieldsChanged.includes('factoryId')) {
+ await formApi.setFieldValue('workshopId', undefined);
+ }
+ // 鍚屾杈呮枡棰勮鍙傛暟锛堜骇鍝� / 鏁伴噺鍙樺寲鏃惰嚜鍔ㄩ噸鏂拌绠楄緟鏂欎笌搴撳瓨锛�
+ if (
+ fieldsChanged.includes('productId') ||
+ fieldsChanged.includes('quantity')
+ ) {
+ previewParams.value = {
+ productId: values.productId,
+ quantity: values.quantity,
+ };
}
},
});
/** 閲嶆柊鎸傝浇 schema 骞舵寜琛ㄥ崟鎬佹帶鍒跺簳閮ㄦ寜閽� */
+ const mainActionText = computed(() => {
+ if (isConfirm.value) return '纭';
+ if (isFinish.value) return '瀹屾垚';
+ return '鎻愪氦';
+ });
+
+ const showMainBtn = computed(() => isEditable.value || isConfirm.value || isFinish.value);
+
function applySchema() {
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
- const showBtn = isEditable.value || isConfirm.value || isFinish.value;
- modalApi.setState({
- showConfirmButton: showBtn,
- confirmText: isConfirm.value || canConfirm.value
- ? '纭'
- : isFinish.value
- ? '瀹屾垚'
- : undefined,
- });
+ modalApi.setState({ showCancelButton: false, showConfirmButton: false });
+ }
+
+ /** 浠呬繚瀛橈紙涓嶆敼鍙樼姸鎬侊級 */
+ async function handleSave() {
+ const { valid } = await formApi.validate();
+ if (!valid || !formData.value?.id) return;
+ modalApi.lock();
+ try {
+ const data = (await formApi.getValues()) as any;
+ if (Array.isArray(data.feedbackRole)) {
+ data.feedbackRole = data.feedbackRole.join(',');
+ }
+ await updateWorkOrder({ ...formData.value, ...data });
+ formData.value = { ...formData.value, ...data };
+ originalSnapshot.value = JSON.stringify(await formApi.getValues());
+ emit('success');
+ message.success($t('ui.actionMessage.operationSuccess'));
+ } finally {
+ modalApi.unlock();
+ }
}
/** 鏌ョ湅璁㈠崟鏉$爜 */
- function handleBarcode() {
- if (!formData.value?.id) {
- return;
- }
- barcodeDetailRef.value?.openByBusiness(
- formData.value.id,
- BarcodeBizTypeEnum.WORKORDER,
- formData.value.code,
- formData.value.name
- );
- }
+ // function handleBarcode() {
+ // if (!formData.value?.id) {
+ // return;
+ // }
+ // barcodeDetailRef.value?.openByBusiness(
+ // formData.value.id,
+ // BarcodeBizTypeEnum.WORKORDER,
+ // formData.value.code,
+ // formData.value.name
+ // );
+ // }
- /** 宸ュ簭鍒楄〃鍙樺寲鍥炶皟 */
- function handleProcessListChange(list: MesProWorkOrderProcessApi.WorkOrderProcess[]) {
- tempProcessList.value = list;
+ /**
+ * 鎻愪氦鍓嶆牎楠岃緟鏂欏簱瀛橈細搴撳瓨涓嶈冻鏃舵彁绀哄厛琛岄噰璐紝鐢辩敤鎴风‘璁ゆ槸鍚︾户缁彁浜�
+ *
+ * @returns true=鍙互缁х画鎻愪氦锛沠alse=鐢ㄦ埛鍙栨秷
+ */
+ async function checkMaterialStock(
+ data: MesProWorkOrderApi.WorkOrder
+ ): Promise<boolean> {
+ if (!data.productId || !data.quantity) {
+ return true;
+ }
+ let list: Awaited<ReturnType<typeof getWorkOrderBomItemPreview>> = [];
+ try {
+ list = await getWorkOrderBomItemPreview(data.productId, data.quantity);
+ } catch {
+ // 棰勮澶辫触涓嶉樆鏂伐鍗曞垱寤猴紝浜ょ敱鍚庣鍦ㄩ鏂欑幆鑺傛牎楠�
+ return true;
+ }
+ const insufficient = list.filter((item) => item.stockSufficient === false);
+ if (insufficient.length === 0) {
+ return true;
+ }
+ const detail = insufficient
+ .map((item) => {
+ const gap =
+ (item.quantity ?? 0) -
+ (item.stockQuantity ?? 0) -
+ (item.purchaseOrderQuantity ?? 0);
+ return `${item.itemName ?? item.itemCode}锛堝彲鐢ㄥ簱瀛� ${item.stockQuantity ?? 0}锛屽湪閫旈噰璐� ${item.purchaseOrderQuantity ?? 0}锛岄渶姹� ${item.quantity ?? 0}锛岃繕宸� ${gap}锛塦;
+ })
+ .join('锛�');
+ return new Promise<boolean>((resolve) => {
+ AntModal.confirm({
+ title: '杈呮枡搴撳瓨涓嶈冻',
+ content: `浠ヤ笅杈呮枡搴撳瓨涓嶈冻锛�${detail}銆傜郴缁熶粛浼氱敓鎴愬伐鍗曪紝浣嗛渶鍏堝畬鎴愰噰璐悗鍐嶉鏂欙紝鏄惁缁х画鎻愪氦锛焋,
+ okText: '浠嶇劧鎻愪氦',
+ cancelText: '杩斿洖淇敼',
+ onCancel: () => resolve(false),
+ onOk: () => resolve(true),
+ });
+ });
}
const [Modal, modalApi] = useVbenModal({
@@ -147,26 +221,15 @@
if (isEditable.value) {
const current = JSON.stringify(await formApi.getValues());
if (current !== originalSnapshot.value) {
- const data = (await formApi.getValues()) as MesProWorkOrderApi.WorkOrder;
+ const data = (await formApi.getValues()) as any;
+ if (Array.isArray(data.feedbackRole)) {
+ data.feedbackRole = data.feedbackRole.join(',');
+ }
await updateWorkOrder({ ...formData.value, ...data });
originalSnapshot.value = current;
}
}
- // 2. 鎵归噺淇濆瓨宸ュ簭锛堝鏋滄湁锛�
- if (tempProcessList.value.length > 0) {
- const processList = tempProcessList.value.map(item => ({
- ...item,
- workOrderId: formData.value!.id,
- }));
- await batchSaveWorkOrderProcess(processList);
- }
- // 3. 鏍¢獙鏄惁鏈夊伐搴�
- const processes = await getWorkOrderProcessListByWorkOrderId(formData.value.id);
- if (!processes || processes.length === 0) {
- message.warning('褰撳墠璁㈠崟鏈厤缃伐搴忥紝璇峰厛鍦ㄥ伐鍗曚腑缁存姢宸ュ簭淇℃伅鍚庡啀纭');
- return;
- }
- // 4. 纭宸ュ崟
+ // 2. 纭宸ュ崟锛堟湭閰嶇疆宸ュ簭鏃舵寜鍗曞伐搴忕敓浜э級
await confirmWorkOrder(formData.value.id);
message.success('璁㈠崟宸茬‘璁�');
await modalApi.close();
@@ -179,12 +242,6 @@
// ---- 瀹屾垚璁㈠崟妯″紡 ----
if (isFinish.value) {
if (!formData.value?.id) return;
- // 鏍¢獙鏄惁鏈夊伐搴�
- const processes = await getWorkOrderProcessListByWorkOrderId(formData.value.id);
- if (!processes || processes.length === 0) {
- message.warning('褰撳墠璁㈠崟鏈厤缃伐搴忥紝璇峰厛鍦ㄥ伐鍗曚腑缁存姢宸ュ簭淇℃伅鍚庡啀瀹屾垚');
- return;
- }
try {
await confirm('纭瑕佸畬鎴愯璁㈠崟鍚楋紵');
} catch {
@@ -209,34 +266,23 @@
const { valid } = await formApi.validate();
if (!valid) return;
modalApi.lock();
- const data = (await formApi.getValues()) as MesProWorkOrderApi.WorkOrder;
+ const data = (await formApi.getValues()) as any;
+ if (Array.isArray(data.feedbackRole)) {
+ data.feedbackRole = data.feedbackRole.join(',');
+ }
try {
if (formData.value?.id) {
// 缂栬緫妯″紡
await updateWorkOrder({ ...formData.value, ...data });
- // 鎵归噺淇濆瓨宸ュ簭
- if (tempProcessList.value.length > 0) {
- const processList = tempProcessList.value.map(item => ({
- ...item,
- workOrderId: formData.value!.id,
- }));
- await batchSaveWorkOrderProcess(processList);
- }
formData.value = { ...formData.value, ...data };
emit("success");
message.success($t("ui.actionMessage.operationSuccess"));
await modalApi.close();
} else {
- // 鏂板妯″紡
+ // 鏂板妯″紡锛氬厛鏍¢獙杈呮枡搴撳瓨锛屼笉瓒虫椂鎻愮ず鍏堣閲囪喘
+ const insufficient = await checkMaterialStock(data);
+ if (!insufficient) return;
const id = await createWorkOrder(data);
- // 鎵归噺淇濆瓨宸ュ簭
- if (tempProcessList.value.length > 0) {
- const processList = tempProcessList.value.map(item => ({
- ...item,
- workOrderId: id,
- }));
- await batchSaveWorkOrderProcess(processList);
- }
formData.value = {
...data,
id,
@@ -256,8 +302,7 @@
if (!isOpen) {
formData.value = undefined;
originalSnapshot.value = "";
- currentProductId.value = undefined;
- tempProcessList.value = [];
+ previewParams.value = {};
return;
}
const data = modalApi.getData<{
@@ -266,15 +311,17 @@
parentRow?: MesProWorkOrderApi.WorkOrder;
}>();
formType.value = data.formType;
- subTabsName.value = "process";
- tempProcessList.value = [];
+ subTabsName.value = "item";
applySchema();
if (data?.id) {
modalApi.lock();
try {
formData.value = await getWorkOrder(data.id);
- await formApi.setValues(formData.value);
- currentProductId.value = formData.value.productId;
+ const formValues: any = { ...formData.value };
+ if (formValues.feedbackRole && typeof formValues.feedbackRole === 'string') {
+ formValues.feedbackRole = formValues.feedbackRole.split(',');
+ }
+ await formApi.setValues(formValues);
} finally {
modalApi.unlock();
}
@@ -300,38 +347,58 @@
class="w-3/5"
content-class="!max-h-[80vh] overflow-y-auto">
<Form class="mx-4" />
- <!-- 宸ュ簭 / 鐗╂枡闇�姹� Tab -->
+ <!-- 鐗╂枡闇�姹傦紙杈呮枡鏄庣粏锛�-->
<template v-if="showTabs">
<Tabs v-model:active-key="subTabsName"
class="mx-4">
- <Tabs.TabPane key="process"
- tab="宸ュ簭"
- forceRender>
- <ProcessList
- ref="processListRef"
- :form-type="formType"
- :work-order="formData || {}"
- :work-order-id="formData?.id"
- :product-id="currentProductId"
- @process-list-change="handleProcessListChange"
- />
- </Tabs.TabPane>
<Tabs.TabPane key="item"
tab="鐗╂枡闇�姹�">
+ <p class="mb-3 text-xs text-gray-400 leading-relaxed">
+ 鏂板宸ュ崟鏃朵細鎸夋墍閫変骇鍝佷笌鏁伴噺棰勫厛璁$畻杈呮枡鐢ㄩ噺鍙婂簱瀛樻儏鍐碉紱宸ュ崟鐢熸垚鍚庯紝鐗╂枡闇�姹傛寜浜у搧鐢ㄩ噺鑷姩姹囨�伙紝浠呬緵鏌ョ湅銆�
+ </p>
<ItemList v-if="formData?.id"
:work-order-id="formData.id" />
- <div v-else class="text-gray-400 text-center py-8">
- 璇峰厛淇濆瓨宸ュ崟鍚庡啀鏌ョ湅鐗╂枡闇�姹�
- </div>
+ <MaterialPreview v-else
+ :product-id="previewParams.productId"
+ :quantity="previewParams.quantity" />
</Tabs.TabPane>
</Tabs>
</template>
<template #prepend-footer>
- <Button v-if="formType === 'detail' && formData?.id"
- @click="handleBarcode">
- 鏌ョ湅鏉$爜
- </Button>
+ <div class="flex flex-auto flex-col gap-2">
+ <div v-if="canUseAi" class="flex flex-wrap items-center gap-x-2 gap-y-1">
+ <span class="text-xs font-semibold text-gray-800 dark:text-gray-100">AI 鏅鸿兘鍒嗘瀽</span>
+ <div class="flex items-center gap-2">
+ <PredictMaterial :work-order-id="formData!.id" />
+ <PredictDuration :work-order-id="formData!.id" />
+ <PredictRisk :work-order-id="formData!.id" />
+ <PredictDelivery :work-order-id="formData!.id" />
+ </div>
+ <span class="text-xs text-gray-400">鍩轰簬鍘嗗彶鐢熶骇鏁版嵁浼扮畻锛屼粎渚涘弬鑰冿紝涓嶅弬涓庝笟鍔¤绠�</span>
+ </div>
+ <div v-if="canUseAi && showMainBtn" class="border-t border-gray-200" />
+ <div class="flex items-center">
+ <Button v-if="showMainBtn"
+ type="primary"
+ @click="modalApi.onConfirm()">
+ {{ mainActionText }}
+ </Button>
+ </div>
+ </div>
+ </template>
+ <template #append-footer>
+ <div class="flex gap-2">
+ <Button v-if="canConfirm"
+ @click="handleSave">
+ 淇濆瓨淇敼
+ </Button>
+ <!-- <Button v-if="formType === 'detail' && formData?.id"
+ @click="handleBarcode">
+ 鏌ョ湅鏉$爜
+ </Button> -->
+ <Button @click="modalApi.close()">鍙栨秷</Button>
+ </div>
</template>
</Modal>
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
</template>
--
Gitblit v1.9.3