From 7457271638984423ac3b6c2fd136f8c0fe970d40 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 17:53:39 +0800
Subject: [PATCH] feat(mes):盘号字段支持 添加和报工时间功能
---
src/views/mes/pro/mps/data.ts | 1
src/views/mes/qc/ipqc/data.ts | 4
src/views/wls/materialstock/data.ts | 2
src/views/mes/pro/feedback/modules/form.vue | 25 -----
src/views/mes/qc/pendinginspect/data.ts | 1
src/api/mes/qc/ipqc/index.ts | 1
src/api/mes/wm/productproduce/line/index.ts | 1
src/views/mes/pro/mps/modules/form.vue | 3
src/views/mes/pro/feedback/modules/product-produce-list.vue | 1
src/api/mes/qc/pendinginspect/index.ts | 1
src/api/mes/qc/oqc/index.ts | 1
src/views/mes/pro/workorder-center/modules/quick-feedback.vue | 13 +++
src/api/mes/pro/feedback/index.ts | 3
src/views/erp/sale/order/modules/print.vue | 1
src/views/erp/sale/order/modules/item-form.vue | 11 ++
src/views/wls/materialstock/components/select.vue | 1
src/api/wls/materialstock/index.ts | 1
src/views/mes/pro/mps/index.vue | 49 ++++++------
src/views/mes/pro/feedback/modules/batch-feedback.vue | 12 +++
src/views/erp/sale/order/data.ts | 6 +
src/views/mes/pro/workorder/data.ts | 2
src/views/mes/qc/oqc/data.ts | 15 +++
src/api/erp/sale/order/index.ts | 1
src/api/mes/pro/workorder/index.ts | 1
src/views/mes/pro/feedback/data.ts | 30 +------
src/api/mes/wm/materialstock/index.ts | 1
src/api/mes/pro/mps/index.ts | 13 ++
27 files changed, 121 insertions(+), 80 deletions(-)
diff --git a/src/api/erp/sale/order/index.ts b/src/api/erp/sale/order/index.ts
index 069fc90..1d90b84 100644
--- a/src/api/erp/sale/order/index.ts
+++ b/src/api/erp/sale/order/index.ts
@@ -45,6 +45,7 @@
seq?: number; // 鍓嶇琛屽彿
orderId?: number; // 閲囪喘璁㈠崟缂栧彿
productId?: number; // 浜у搧缂栧彿
+ reelNo?: string; // 鎵嬪伐褰曞叆鐨勭洏鍙�
productName?: string; // 浜у搧鍚嶇О
productBarCode?: string; // 浜у搧鏉$爜
productUnitId?: number; // 浜у搧鍗曚綅缂栧彿
diff --git a/src/api/mes/pro/feedback/index.ts b/src/api/mes/pro/feedback/index.ts
index 0580b85..09d3da3 100644
--- a/src/api/mes/pro/feedback/index.ts
+++ b/src/api/mes/pro/feedback/index.ts
@@ -36,6 +36,7 @@
checkFlag?: boolean; // 鏄惁闇�瑕佹楠�
workOrderId?: number; // 鐢熶骇璁㈠崟缂栧彿
workOrderCode?: string; // 璁㈠崟缂栫爜
+ reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
workOrderName?: string; // 璁㈠崟鍚嶇О
taskId?: number; // 鐢熶骇浠诲姟缂栧彿
taskCode?: string; // 浠诲姟缂栫爜
@@ -178,6 +179,7 @@
taskId: number;
paramValues?: MesProFeedbackApi.ParamValue[];
feedbackQuantity: number;
+ feedbackTime?: string;
remark?: string;
}
@@ -194,6 +196,7 @@
export interface BatchCreateReq {
taskIds: number[];
feedbackQuantity: number;
+ feedbackTime?: string;
remark?: string;
}
diff --git a/src/api/mes/pro/mps/index.ts b/src/api/mes/pro/mps/index.ts
index 652dbf8..9d9936b 100644
--- a/src/api/mes/pro/mps/index.ts
+++ b/src/api/mes/pro/mps/index.ts
@@ -12,6 +12,7 @@
saleOrderNo?: string; // 閿�鍞鍗曞彿
saleOrderItemId?: number; // 閿�鍞鍗曟槑缁咺D
productId?: number; // 浜у搧ID
+ reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
productCode?: string; // 浜у搧缂栫爜
productName?: string; // 浜у搧鍚嶇О
productSpecification?: string; // 瑙勬牸鍨嬪彿
@@ -29,6 +30,12 @@
mergeBatchNo?: string; // 鍚堝苟鎵规鍙�
remark?: string; // 澶囨敞
createTime?: number; // 鍒涘缓鏃堕棿
+ }
+
+ export interface BatchIssueResult {
+ mpsId: number;
+ workOrderId?: number;
+ error?: string;
}
/** MPS 鍒嗛〉鏌ヨ鍙傛暟 */
@@ -95,9 +102,9 @@
return requestClient.post(`/mes/pro-mps/issue?id=${id}`);
}
-/** 鍚堝苟涓嬪彂 MPS */
-export function mergeIssueMps(ids: number[]) {
- return requestClient.post('/mes/pro-mps/merge-issue', ids);
+/** 鎵归噺閫愭潯涓嬪彂锛屾瘡涓鍒掑垎鍒繑鍥炵粨鏋溿�� */
+export function batchIssueMps(ids: number[]) {
+ return requestClient.post<MesProMpsApi.BatchIssueResult[]>('/mes/pro-mps/batch-issue', ids);
}
/** 鍙栨秷 MPS */
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 63dcc6e..8a895f0 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -12,6 +12,7 @@
orderSourceType?: number; // 鏉ユ簮绫诲瀷
orderSourceCode?: string; // 鏉ユ簮鍗曟嵁缂栧彿
productId?: number; // 浜у搧缂栧彿
+ reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
productName?: string; // 浜у搧鍚嶇О
productCode?: string; // 浜у搧缂栫爜
itemCode?: string; // 浜у搧缂栫爜锛堢墿鏂欑紪鐮侊級
diff --git a/src/api/mes/qc/ipqc/index.ts b/src/api/mes/qc/ipqc/index.ts
index ab2804f..4d737aa 100644
--- a/src/api/mes/qc/ipqc/index.ts
+++ b/src/api/mes/qc/ipqc/index.ts
@@ -17,6 +17,7 @@
sourceLineId?: number; // 鏉ユ簮鍗曟嵁琛� ID
sourceDocCode?: string; // 鏉ユ簮鍗曟嵁缂栧彿锛堝叧鑱旀煡璇級
workOrderId?: number; // 鐢熶骇璁㈠崟 ID
+ reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
workOrderCode?: string; // 璁㈠崟缂栧彿锛堝叧鑱旀煡璇級
workOrderName?: string; // 璁㈠崟鍚嶇О锛堝叧鑱旀煡璇級
taskId?: number; // 鐢熶骇浠诲姟 ID
diff --git a/src/api/mes/qc/oqc/index.ts b/src/api/mes/qc/oqc/index.ts
index 75a07eb..d0dc650 100644
--- a/src/api/mes/qc/oqc/index.ts
+++ b/src/api/mes/qc/oqc/index.ts
@@ -15,6 +15,7 @@
sourceDocId?: number; // 鏉ユ簮鍗曟嵁 ID
sourceLineId?: number; // 鏉ユ簮鍗曟嵁琛� ID
sourceDocCode?: string; // 鏉ユ簮鍗曟嵁缂栧彿锛堝叧鑱旀煡璇級
+ reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
clientId?: number; // 瀹㈡埛 ID
clientNickname?: string; // 瀹㈡埛绠�绉帮紙鍏宠仈鏌ヨ锛�
batchCode?: string; // 鎵规鍙�
diff --git a/src/api/mes/qc/pendinginspect/index.ts b/src/api/mes/qc/pendinginspect/index.ts
index cbfbe7f..9f7c3c1 100644
--- a/src/api/mes/qc/pendinginspect/index.ts
+++ b/src/api/mes/qc/pendinginspect/index.ts
@@ -21,6 +21,7 @@
vendorName?: string; // 渚涘簲鍟嗗悕绉�
// 璁㈠崟/宸ヤ綔绔�/浠诲姟锛圛PQC/RQC 鍦烘櫙锛�
workOrderId?: number; // 鐢熶骇璁㈠崟 ID
+ reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
workstationId?: number; // 宸ヤ綔绔� ID
workstationName?: string; // 宸ヤ綔绔欏悕绉�
taskId?: number; // 鐢熶骇浠诲姟 ID
diff --git a/src/api/mes/wm/materialstock/index.ts b/src/api/mes/wm/materialstock/index.ts
index 06a2911..67b4955 100644
--- a/src/api/mes/wm/materialstock/index.ts
+++ b/src/api/mes/wm/materialstock/index.ts
@@ -14,6 +14,7 @@
unitMeasureName?: string; // 璁¢噺鍗曚綅鍚嶇О
batchId?: number; // 鎵规缂栧彿
batchCode?: string; // 鎵规鍙�
+ reelNo?: string; // 鐢熶骇杩芥函鐩樺彿
warehouseId?: number; // 浠撳簱缂栧彿
warehouseCode?: string; // 浠撳簱缂栫爜
warehouseName?: string; // 浠撳簱鍚嶇О
diff --git a/src/api/mes/wm/productproduce/line/index.ts b/src/api/mes/wm/productproduce/line/index.ts
index ab3f49f..b605ed5 100644
--- a/src/api/mes/wm/productproduce/line/index.ts
+++ b/src/api/mes/wm/productproduce/line/index.ts
@@ -15,6 +15,7 @@
unitMeasureName?: string; // 鍗曚綅
quantity?: number; // 浜у嚭鏁伴噺
batchCode?: string; // 鎵规鍙�
+ reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
qualityStatus?: number; // 璐ㄩ噺鐘舵��
locationId?: number; // 搴撲綅缂栧彿
locationName?: string; // 搴撲綅鍚嶇О
diff --git a/src/api/wls/materialstock/index.ts b/src/api/wls/materialstock/index.ts
index 137d69f..125f2fd 100644
--- a/src/api/wls/materialstock/index.ts
+++ b/src/api/wls/materialstock/index.ts
@@ -14,6 +14,7 @@
unitMeasureName?: string; // 璁¢噺鍗曚綅鍚嶇О
batchId?: number; // 鎵规缂栧彿
batchCode?: string; // 鎵规鍙�
+ reelNo?: string; // 鐢熶骇杩芥函鐩樺彿
warehouseId?: number; // 浠撳簱缂栧彿
warehouseCode?: string; // 浠撳簱缂栫爜
warehouseName?: string; // 浠撳簱鍚嶇О
diff --git a/src/views/erp/sale/order/data.ts b/src/views/erp/sale/order/data.ts
index 6e8a843..2322850 100644
--- a/src/views/erp/sale/order/data.ts
+++ b/src/views/erp/sale/order/data.ts
@@ -220,6 +220,12 @@
slots: { default: 'productId' },
},
{
+ field: 'reelNo',
+ title: '鐩樺彿',
+ minWidth: 150,
+ slots: { default: 'reelNo' },
+ },
+ {
field: 'productSpecification',
title: '瑙勬牸鍨嬪彿',
minWidth: 120,
diff --git a/src/views/erp/sale/order/modules/item-form.vue b/src/views/erp/sale/order/modules/item-form.vue
index eea4f3c..9fd0ce2 100644
--- a/src/views/erp/sale/order/modules/item-form.vue
+++ b/src/views/erp/sale/order/modules/item-form.vue
@@ -125,6 +125,7 @@
const newRow = {
id: undefined,
productId: undefined,
+ reelNo: undefined,
productUnitName: undefined,
productPrice: undefined,
stockCount: undefined,
@@ -238,6 +239,16 @@
/>
<span v-else>{{ row.productName || '-' }}</span>
</template>
+ <template #reelNo="{ row }">
+ <Input
+ v-if="!disabled"
+ v-model:value="row.reelNo"
+ :maxlength="128"
+ placeholder="鎵嬪伐濉啓鐩樺彿"
+ @change="handleRowChange(row)"
+ />
+ <span v-else>{{ row.reelNo || '-' }}</span>
+ </template>
<template #needProduction="{ row }">
<Select
v-if="!disabled"
diff --git a/src/views/erp/sale/order/modules/print.vue b/src/views/erp/sale/order/modules/print.vue
index fb64923..4dd909d 100644
--- a/src/views/erp/sale/order/modules/print.vue
+++ b/src/views/erp/sale/order/modules/print.vue
@@ -301,6 +301,7 @@
<div v-if="item.productSpecification" class="text-xs">
{{ item.productSpecification }}
</div>
+ <div v-if="item.reelNo" class="text-xs">鐩樺彿锛歿{ item.reelNo }}</div>
</td>
<td class="border border-solid border-[#dcdfe6] p-2 text-center">
{{ item.productUnitName || '-' }}
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index c7ce9fe..e4b989d 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -17,7 +17,6 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
import { getSimpleUserList } from '#/api/system/user';
import { loadParamDetails } from './param-state';
@@ -138,11 +137,14 @@
{ field: 'workstationName', title: '宸ヤ綔绔�', width: 120 },
{ field: 'processName', title: '宸ュ簭', width: 100 },
{ field: 'workOrderCode', title: '鐢熶骇璁㈠崟缂栫爜', width: 160 },
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{ field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 120 },
{ field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', minWidth: 140 },
{ field: 'itemSpecification', title: '瑙勬牸鍨嬪彿', width: 120 },
{ field: 'unitMeasureName', title: '鍗曚綅', width: 80 },
{ field: 'feedbackQuantity', title: '鎶ュ伐鏁伴噺', width: 100 },
+ { field: 'qualifiedQuantity', title: '璐ㄦ鍚堟牸鏁伴噺', width: 120 },
+ { field: 'unqualifiedQuantity', title: '璐ㄦ涓嶅悎鏍兼暟閲�', width: 130 },
{ field: 'feedbackUserNickname', title: '鎶ュ伐浜�', width: 100 },
{
field: 'feedbackTime',
@@ -176,7 +178,7 @@
* - submit / approve / detail锛氫富浣撳瓧娈靛彧璇�
*
* 鎶ュ伐鍙~鍐�"鎶ュ伐鏁伴噺"锛涘悎鏍煎搧/涓嶈壇鍝佹暟閲忕敱璐ㄦ纭畾锛屾姤宸ョ幆鑺備笉閲囬泦銆�
- * 璐ㄦ宸ュ簭鎶ュ伐鍚庤繘鍏ュ緟妫�楠岋紙uncheckQuantity = 鎶ュ伐鏁伴噺锛夛紝闈炶川妫�宸ュ簭鐩存帴瀹岀粨銆�
+ * 鎶ュ伐瀹℃壒鍚庝骇鍑哄潎寰呮楠岋紝鍚堟牸鍝佺粡妫�楠屽悗鍏ュ簱銆�
*/
export function useFormSchema(
formType: FormType,
@@ -188,12 +190,6 @@
fieldName: 'id',
component: 'Input',
dependencies: { triggerFields: [''], show: () => false },
- },
- {
- fieldName: 'checkFlag',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
- defaultValue: true,
},
{
fieldName: 'routeId',
@@ -256,7 +252,6 @@
// 璁㈠崟鍙樻洿锛氭竻绌轰换鍔″強浠诲姟甯﹀嚭鐨勪骇鍝佷俊鎭�佹暟閲忓尯鍩熸帶鍒朵綅
onChange: async () => {
await formApi?.setValues({
- checkFlag: true,
itemCode: undefined,
itemId: undefined,
itemName: undefined,
@@ -286,7 +281,7 @@
workstationId: values.workstationId,
}),
},
- // 浠诲姟鍙樻洿锛氳嚜鍔ㄥ~鍏呭叧鑱斿瓧娈点�佷骇鍝佷俊鎭�乧heckFlag锛屽苟鍔犺浇浠诲姟缁戝畾鐨勫伐鑹哄弬鏁�
+ // 浠诲姟鍙樻洿锛氳嚜鍔ㄥ~鍏呭叧鑱斿瓧娈点�佷骇鍝佷俊鎭紝骞跺姞杞戒换鍔$粦瀹氱殑宸ヨ壓鍙傛暟
componentProps: {
onChange: async (task?: MesProTaskApi.Task) => {
await loadParamDetails(task?.id);
@@ -304,21 +299,6 @@
workstationId: task.workstationId,
reportableQuantity: task.reportableQuantity,
});
- // 宸ヨ壓璺嚎宸ュ簭鐨� checkFlag 鍐冲畾鏁伴噺鍖哄煙灞曠ず
- if (task.routeId && task.processId) {
- try {
- const routeProcess = await getRouteProcessByRouteAndProcess(
- task.routeId,
- task.processId,
- );
- await formApi?.setFieldValue(
- 'checkFlag',
- routeProcess?.checkFlag ?? false,
- );
- } catch {
- await formApi?.setFieldValue('checkFlag', true);
- }
- }
},
},
rules: 'selectRequired',
diff --git a/src/views/mes/pro/feedback/modules/batch-feedback.vue b/src/views/mes/pro/feedback/modules/batch-feedback.vue
index 7458c64..12ddfc0 100644
--- a/src/views/mes/pro/feedback/modules/batch-feedback.vue
+++ b/src/views/mes/pro/feedback/modules/batch-feedback.vue
@@ -6,6 +6,7 @@
import { useVbenModal } from '@vben/common-ui';
import { Button, message, Tag } from 'ant-design-vue';
+import dayjs from 'dayjs';
import { batchCreateFeedback } from '#/api/mes/pro/feedback';
import ProTaskSelectDialog from '#/views/mes/pro/task/components/select-dialog.vue';
@@ -24,6 +25,7 @@
selectedTasks.value = [];
formData.value = {
feedbackQuantity: undefined,
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
remark: '',
};
}
@@ -34,6 +36,7 @@
const selectedTasks = ref<MesProTaskApi.Task[]>([]);
const formData = ref({
feedbackQuantity: undefined as number | undefined,
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
remark: '',
});
const submitting = ref(false);
@@ -64,6 +67,7 @@
const result = await batchCreateFeedback({
taskIds: selectedTasks.value.map((t) => t.id!),
feedbackQuantity: formData.value.feedbackQuantity,
+ feedbackTime: formData.value.feedbackTime || undefined,
remark: formData.value.remark || undefined,
});
if (result.failCount) {
@@ -110,6 +114,14 @@
class="!w-full"
/>
</a-form-item>
+ <a-form-item label="鎶ュ伐鏃堕棿">
+ <a-date-picker
+ v-model:value="formData.feedbackTime"
+ show-time
+ value-format="YYYY-MM-DD HH:mm:ss"
+ class="!w-full"
+ />
+ </a-form-item>
<a-form-item label="澶囨敞">
<a-textarea
v-model:value="formData.remark"
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 9e5a9a3..0b5594d 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -24,7 +24,6 @@
submitFeedback,
updateFeedback,
} from '#/api/mes/pro/feedback';
-import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
import { getWorkOrder } from '#/api/mes/pro/workorder';
import { $t } from '#/locales';
@@ -89,7 +88,7 @@
/** 鎻愪氦鍓嶅榻愭暟閲忥細鎶ュ伐鍙~鍐欐姤宸ユ暟閲忥紝鍚堟牸/涓嶈壇/搴熷搧鏁伴噺鐢辫川妫�纭畾锛屾姤宸ョ幆鑺備笉閲囬泦 */
function alignQuantity(data: MesProFeedbackApi.Feedback) {
- data.uncheckQuantity = data.checkFlag ? data.feedbackQuantity : 0;
+ data.uncheckQuantity = data.feedbackQuantity;
delete data.qualifiedQuantity;
delete data.unqualifiedQuantity;
delete data.laborScrapQuantity;
@@ -292,22 +291,6 @@
}
}
-/** 鍔犺浇宸ュ簭鐨� checkFlag 鐢ㄤ簬鍥炴樉鏁伴噺鍖哄煙 */
-async function resolveCheckFlag(routeId?: number, processId?: number) {
- if (!routeId || !processId) {
- return true;
- }
- try {
- const routeProcess = await getRouteProcessByRouteAndProcess(
- routeId,
- processId,
- );
- return routeProcess?.checkFlag ?? false;
- } catch {
- return true;
- }
-}
-
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
if (formType.value === 'detail' || formType.value === 'approve') {
@@ -357,12 +340,8 @@
try {
formData.value = await getFeedback(data.id);
await loadParamDetails(formData.value.taskId);
- const checkFlag = await resolveCheckFlag(
- formData.value.routeId,
- formData.value.processId,
- );
// 璁剧疆鍒� values
- await formApi.setValues({ ...formData.value, checkFlag });
+ await formApi.setValues({ ...formData.value });
// 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
originalSnapshot.value = JSON.stringify(await getAlignedData());
} finally {
diff --git a/src/views/mes/pro/feedback/modules/product-produce-list.vue b/src/views/mes/pro/feedback/modules/product-produce-list.vue
index c526f6f..054dde7 100644
--- a/src/views/mes/pro/feedback/modules/product-produce-list.vue
+++ b/src/views/mes/pro/feedback/modules/product-produce-list.vue
@@ -22,6 +22,7 @@
{ field: 'quantity', title: '浜у嚭鏁伴噺', minWidth: 100 },
{ field: 'unitMeasureName', title: '鍗曚綅', minWidth: 80 },
{ field: 'batchCode', title: '鎵规鍙�', minWidth: 120 },
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'qualityStatus',
title: '璐ㄩ噺鐘舵��',
diff --git a/src/views/mes/pro/mps/data.ts b/src/views/mes/pro/mps/data.ts
index 0ef3742..55cafc5 100644
--- a/src/views/mes/pro/mps/data.ts
+++ b/src/views/mes/pro/mps/data.ts
@@ -219,6 +219,7 @@
title: '閿�鍞鍗曞彿',
width: 180,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'productCode',
title: '浜у搧缂栫爜',
diff --git a/src/views/mes/pro/mps/index.vue b/src/views/mes/pro/mps/index.vue
index f481b13..cde46bf 100644
--- a/src/views/mes/pro/mps/index.vue
+++ b/src/views/mes/pro/mps/index.vue
@@ -8,7 +8,7 @@
import { Page, useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
-import { Button, message, Tag } from 'ant-design-vue';
+import { Button, message, Modal, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -17,7 +17,7 @@
exportMps,
getMpsPage,
issueMps,
- mergeIssueMps,
+ batchIssueMps,
} from '#/api/mes/pro/mps';
import { $t } from '#/locales';
@@ -95,35 +95,35 @@
}
}
-/** 鍚堝苟涓嬪彂 */
-async function handleMergeIssue() {
- if (checkedIds.value.length < 2) {
- message.warning('璇疯嚦灏戦�夋嫨2鏉¤褰�');
- return;
- }
- // 鏍¢獙锛氱浉鍚屼骇鍝併�佽崏绋跨姸鎬�
- const firstRow = checkedRows.value[0];
- const isSameProduct = checkedRows.value.every(
- (row) => row.productId === firstRow.productId,
- );
- if (!isSameProduct) {
- message.error('鍙兘閫夋嫨鐩稿悓浜у搧鐨凪PS杩涜鍚堝苟涓嬪彂');
+/** 鎵归噺閫愭潯涓嬪彂锛屾瘡鏉¤鍒掔敓鎴愮嫭绔嬪伐鍗曘�� */
+async function handleBatchIssue() {
+ if (checkedIds.value.length === 0) {
+ message.warning('璇疯嚦灏戦�夋嫨涓�鏉¤褰�');
return;
}
const isAllDraft = checkedRows.value.every(
(row) => row.status === MpsStatusEnum.DRAFT,
);
if (!isAllDraft) {
- message.error('鍙兘閫夋嫨鑽夌鐘舵�佺殑MPS杩涜鍚堝苟涓嬪彂');
+ message.error('璇烽�夋嫨鑽夌鐘舵�佺殑鐢熶骇璁″垝');
return;
}
const hideLoading = message.loading({
- content: '鍚堝苟涓嬪彂涓�...',
+ content: '鎵归噺涓嬪彂涓�...',
duration: 0,
});
try {
- await mergeIssueMps(checkedIds.value);
- message.success('鍚堝苟涓嬪彂鎴愬姛');
+ const results = await batchIssueMps(checkedIds.value);
+ const failures = results.filter((item) => item.error);
+ if (failures.length) {
+ const names = new Map(checkedRows.value.map((row) => [row.id, row.code]));
+ Modal.warning({
+ title: `鎴愬姛 ${results.length - failures.length} 鏉★紝澶辫触 ${failures.length} 鏉,
+ content: failures.map((item) => `${names.get(item.mpsId) || item.mpsId}锛�${item.error}`).join('锛�'),
+ });
+ } else {
+ message.success(`宸蹭笅鍙� ${results.length} 鏉$敓浜ц鍒抈);
+ }
handleRefresh();
} finally {
hideLoading();
@@ -222,14 +222,14 @@
onClick: handleExport,
},
{
- label: '鍚堝苟涓嬪彂',
+ label: '鎵归噺涓嬪彂',
type: 'primary',
- disabled: isEmpty(checkedIds) || checkedIds.length < 2,
+ disabled: isEmpty(checkedIds),
icon: ACTION_ICON.AUDIT,
- auth: ['mes:pro-mps:merge-issue'],
+ auth: ['mes:pro-mps:issue'],
popConfirm: {
- title: '纭鍚堝苟涓嬪彂閫変腑鐨凪PS鍚楋紵',
- confirm: handleMergeIssue,
+ title: '纭閫愭潯涓嬪彂閫変腑鐨勭敓浜ц鍒掑悧锛熸瘡鏉¤鍒掑皢鐢熸垚鐙珛宸ュ崟銆�',
+ confirm: handleBatchIssue,
},
},
]"
@@ -267,7 +267,6 @@
label: $t('common.detail'),
type: 'link',
icon: ACTION_ICON.VIEW,
- auth: ['mes:pro-mps:query'],
onClick: handleDetail.bind(null, row),
},
{
diff --git a/src/views/mes/pro/mps/modules/form.vue b/src/views/mes/pro/mps/modules/form.vue
index 303db37..6a758ed 100644
--- a/src/views/mes/pro/mps/modules/form.vue
+++ b/src/views/mes/pro/mps/modules/form.vue
@@ -126,6 +126,9 @@
<Descriptions.Item label="閿�鍞鍗曟槑缁咺D">
{{ formData.saleOrderItemId }}
</Descriptions.Item>
+ <Descriptions.Item label="鐩樺彿">
+ {{ formData.reelNo || '-' }}
+ </Descriptions.Item>
<Descriptions.Item label="浜у搧缂栫爜">
{{ formData.productCode }}
</Descriptions.Item>
diff --git a/src/views/mes/pro/workorder-center/modules/quick-feedback.vue b/src/views/mes/pro/workorder-center/modules/quick-feedback.vue
index 9df47ce..a8662dd 100644
--- a/src/views/mes/pro/workorder-center/modules/quick-feedback.vue
+++ b/src/views/mes/pro/workorder-center/modules/quick-feedback.vue
@@ -7,6 +7,7 @@
import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
+import dayjs from 'dayjs';
import { quickCreateFeedback } from '#/api/mes/pro/feedback';
import {
@@ -39,6 +40,7 @@
selectedTask.value = undefined;
formData.value = {
feedbackQuantity: undefined,
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
remark: '',
};
// 棰勮浠诲姟鏃跺姞杞藉叾宸ヨ壓鍙傛暟锛涘惁鍒欑瓑寰呴�夋嫨浠诲姟鍚庡啀鍔犺浇
@@ -56,6 +58,7 @@
const selectedTask = ref<MesProTaskApi.Task>();
const formData = ref({
feedbackQuantity: undefined as number | undefined,
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
remark: '',
});
const submitting = ref(false);
@@ -94,6 +97,7 @@
await quickCreateFeedback({
taskId,
feedbackQuantity: formData.value.feedbackQuantity,
+ feedbackTime: formData.value.feedbackTime || undefined,
paramValues: paramDetails.value.map((detail) => ({
detailId: detail.id,
value: detail.paramValue,
@@ -131,12 +135,19 @@
<a-input-number
v-model:value="formData.feedbackQuantity"
:min="0.01"
- :max="pendingQuantity || undefined"
:precision="2"
placeholder="璇疯緭鍏ユ姤宸ユ暟閲�"
class="!w-full"
/>
</a-form-item>
+ <a-form-item label="鎶ュ伐鏃堕棿">
+ <a-date-picker
+ v-model:value="formData.feedbackTime"
+ show-time
+ value-format="YYYY-MM-DD HH:mm:ss"
+ class="!w-full"
+ />
+ </a-form-item>
<div v-if="paramDetails.length" class="mb-4">
<div class="mb-1 font-medium">宸ヨ壓鍙傛暟</div>
<div
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index cdc4573..c4f91ac 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -424,6 +424,7 @@
title: '鏉ユ簮鍗曟嵁缂栧彿',
width: 140,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'productCode',
title: '浜у搧缂栫爜',
@@ -584,6 +585,7 @@
title: '璁㈠崟缂栧彿',
width: 140,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'productCode',
title: '浜у搧缂栧彿',
diff --git a/src/views/mes/qc/ipqc/data.ts b/src/views/mes/qc/ipqc/data.ts
index a6a4399..ca997ca 100644
--- a/src/views/mes/qc/ipqc/data.ts
+++ b/src/views/mes/qc/ipqc/data.ts
@@ -8,7 +8,6 @@
import {
DICT_TYPE,
MesAutoCodeRuleCode,
- MesProTaskStatusEnum,
} from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
@@ -191,14 +190,12 @@
component: markRaw(ProTaskSelect),
componentProps: {
placeholder: '璇烽�夋嫨鐢熶骇浠诲姟',
- statuses: [MesProTaskStatusEnum.PREPARE],
},
dependencies: {
triggerFields: ['sourceDocId', 'workOrderId', 'workstationId'],
componentProps: (values) => ({
disabled: !!values.sourceDocId || !values.workOrderId,
placeholder: '璇烽�夋嫨鐢熶骇浠诲姟',
- statuses: [MesProTaskStatusEnum.PREPARE],
workOrderId: values.workOrderId,
workstationId: values.workstationId,
}),
@@ -489,6 +486,7 @@
title: '鐢熶骇璁㈠崟缂栧彿',
width: 140,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'itemCode',
title: '浜у搧鐗╂枡缂栫爜',
diff --git a/src/views/mes/qc/oqc/data.ts b/src/views/mes/qc/oqc/data.ts
index bc0eb75..643af30 100644
--- a/src/views/mes/qc/oqc/data.ts
+++ b/src/views/mes/qc/oqc/data.ts
@@ -189,6 +189,20 @@
},
},
{
+ fieldName: 'reelNo',
+ label: '鐩樺彿',
+ component: 'Input',
+ componentProps: { maxlength: 128, placeholder: '璇疯緭鍏ョ洏鍙�' },
+ dependencies: {
+ triggerFields: ['sourceDocId'],
+ componentProps: (values) => ({
+ disabled: !!values.sourceDocId,
+ maxlength: 128,
+ placeholder: values.sourceDocId ? '淇濆瓨鍚庝粠閿�鍞槑缁嗗甫鍏�' : '璇疯緭鍏ョ洏鍙�',
+ }),
+ },
+ },
+ {
fieldName: 'outQuantity',
label: '鍙戣揣鏁伴噺',
component: 'InputNumber',
@@ -422,6 +436,7 @@
title: '鎵规鍙�',
width: 130,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'itemCode',
title: '浜у搧鐗╂枡缂栫爜',
diff --git a/src/views/mes/qc/pendinginspect/data.ts b/src/views/mes/qc/pendinginspect/data.ts
index 71c6adc..7d07c90 100644
--- a/src/views/mes/qc/pendinginspect/data.ts
+++ b/src/views/mes/qc/pendinginspect/data.ts
@@ -59,6 +59,7 @@
title: '鏉ユ簮鍗曟嵁缂栧彿',
width: 160,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'qcType',
title: '妫�楠岀被鍨�',
diff --git a/src/views/wls/materialstock/components/select.vue b/src/views/wls/materialstock/components/select.vue
index cbd0599..290c12f 100644
--- a/src/views/wls/materialstock/components/select.vue
+++ b/src/views/wls/materialstock/components/select.vue
@@ -128,6 +128,7 @@
<div v-if="selectedItem" class="leading-6">
<div>鐗╂枡锛歿{ selectedItem.itemName || '-' }}</div>
<div>鎵规锛歿{ selectedItem.batchCode || '-' }}</div>
+ <div>鐩樺彿锛歿{ selectedItem.reelNo || '-' }}</div>
<div>鏁伴噺锛歿{ selectedItem.quantity ?? '-' }}</div>
<div>浠撳簱锛歿{ selectedItem.warehouseName || '-' }}</div>
<div>搴撳尯锛歿{ selectedItem.locationName || '-' }}</div>
diff --git a/src/views/wls/materialstock/data.ts b/src/views/wls/materialstock/data.ts
index 9c0ec40..4887418 100644
--- a/src/views/wls/materialstock/data.ts
+++ b/src/views/wls/materialstock/data.ts
@@ -97,6 +97,7 @@
title: '浜у搧鐗╂枡鍚嶇О',
minWidth: 140,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'specification',
title: '瑙勬牸鍨嬪彿',
@@ -314,6 +315,7 @@
title: '鍏ュ簱鎵规鍙�',
minWidth: 120,
},
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{
field: 'warehouseName',
title: '浠撳簱',
--
Gitblit v1.9.3