From 1b419ccf217dbcace15987f1c0fe26b9e15d1d4b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 16 十月 2024 10:26:56 +0800
Subject: [PATCH] 工艺绑定优化
---
src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts
index 4c58462..86d1c76 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO_BATCH.ts
@@ -4,21 +4,22 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-09-11 23:22:41
+ * @LastEditTime: 2024-09-29 21:28:37
*/
import { Tag, Tooltip } from 'ant-design-vue';
import { ActionItem, BasicColumn, FormSchema } from '/@/components/Table';
import { useI18n } from '/@/hooks/web/useI18n';
-import { h, unref } from 'vue';
-import { getEntity, GetEnum, SaveEntity } from '/@/api/tigerapi/system';
+import { h } from 'vue';
+import { getEntity, SaveEntity } from '/@/api/tigerapi/system';
import { useLocale } from '/@/locales/useLocale';
import { useModal } from '/@/components/Modal';
import { CustModalParams, FunctionType } from '/@/api/tigerapi/model/systemModel';
import { useForm } from '/@/components/Form';
import { useMessage } from '/@/hooks/web/useMessage';
-import { UpdateWoBatchStatus, UpdateWoStatus } from '/@/api/tigerapi/mes/wo';
+import { UpdateWoBatchStatus } from '/@/api/tigerapi/mes/wo';
import { useUserStore } from '/@/store/modules/user';
+import { formatToDateTime } from '/@/utils/dateUtil';
const { getLocale } = useLocale();
const { createMessage, createErrorModal } = useMessage();
@@ -346,14 +347,16 @@
return new Promise((resolve, reject) => {
try {
const wo = param.values['mValues'];
- wo.STATUS = wo.STATUS == 3 ? wo.STATUS : 2;
- wo.ACT_LINE = param.values['forminfo'].ACT_LINE;
- SaveEntity(wo, true, 'BIZ_MES_WO_BATCH').then((action) => {
- if (action.IsSuccessed) {
- resolve(action);
- } else {
- reject(action);
- }
+ /* 鏇存柊宸ュ崟鎵规鐘舵�� */
+ return UpdateWoBatchStatus({
+ UserId: useUserStore().getUserInfo.userId as string,
+ WorkOrder: wo.ORDER_NO,
+ WoBatch: wo.BATCH_NO,
+ ActLine: param.values['forminfo'].ACT_LINE,
+ Status: 2,
+ RouteStatus: 0,
+ }).then((action) => {
+ resolve(action);
});
} catch {
reject(false);
@@ -385,12 +388,13 @@
WoBatch: params['record'].BATCH_NO,
Status: 4,
RouteStatus: 0,
+ ActLine: ''
}).then((action) => {
if (action.IsSuccessed) {
createMessage.success(t('宸叉殏鍋�'));
reload();
} else {
- createMessage.success(t('鏆傚仠鎿嶄綔澶辫触'));
+ createMessage.success(t(action.Message));
}
});
}
@@ -413,12 +417,13 @@
}
/* 鏇存柊宸ュ崟鎵规鐘舵�� */
UpdateWoBatchStatus({
- UserId: useUserStore().getUserInfo.userId as string,
- WorkOrder: params['record'].ORDER_NO,
- WoBatch: params['record'].BATCH_NO,
- Status: 3,
- RouteStatus: 0,
- }).then((action) => {
+ UserId: useUserStore().getUserInfo.userId as string,
+ WorkOrder: params['record'].ORDER_NO,
+ WoBatch: params['record'].BATCH_NO,
+ Status: 3,
+ RouteStatus: 0,
+ ActLine: ''
+ }).then((action) => {
if (action.IsSuccessed) {
createMessage.success(t('鏆傚仠宸插彇娑�'));
reload();
@@ -481,12 +486,17 @@
WoBatch: params['record'].BATCH_NO,
Status: 0, //鍙栨秷涓嬪彂鐘舵��
RouteStatus: 0,
+ ActLine: ''
}).then((action) => {
if (action.IsSuccessed) {
createMessage.success(t('涓嬪彂宸插彇娑�'));
reload();
} else {
- createMessage.success(t('鍙栨秷涓嬪彂鎿嶄綔澶辫触'));
+ createErrorModal({
+ title: t('璀﹀憡'),
+ content: t(action.Message),
+ getContainer: () => document.body,
+ });
}
});
}
--
Gitblit v1.9.3