From 5a813f3b28f3cbf1db3a3657ccf83267c6e0d315 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 24 十月 2024 11:22:02 +0800
Subject: [PATCH] 工艺路线相关优化
---
src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 87 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index 2d82b66..45b78df 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
@@ -4,14 +4,14 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-10-18 10:54:24
+ * @LastEditTime: 2024-10-23 23:55:56
*/
-import { Ref, h, ref, render, unref } from 'vue';
+import { Ref, unref } from 'vue';
import {
DeleteWoRoute,
GetWoPTree,
- SP_MES_PROD2WO,
+ ProdRouteToWo,
SP_MES_WO2CUST,
} from '/@/api/tigerapi/mes/router';
import { GetEnum, SaveEntity, convertToTree, getEntity } from '/@/api/tigerapi/system';
@@ -32,11 +32,14 @@
import { buildUUID } from '/@/utils/uuid';
import { mesApi } from '/@/api/tigerapi/mes/mesApi';
import { useProdRouteStore } from '/@/store/modules/prodRoute';
+import { useWebSocketStore } from '/@/store/modules/websocket';
+import { useGlobSetting } from '/@/hooks/setting';
const { t } = useI18n();
const { createErrorModal } = useMessage();
const useProdRoute = useProdRouteStore();
const { getLocale } = useLocale();
+const globSetting = useGlobSetting();
function _default() {
/* 瀹氫箟鍙橀噺 */
const isNormal = (type: number) => type === 0;
@@ -109,9 +112,16 @@
}
data.title = '宸ュ崟宸ヨ壓璺嚎';
data.fieldNames = { key: 'tid', title: 'name' };
- /* 淇濆瓨宸ヨ壓鏍戝舰鏁版嵁鍒扮姸鎬佺鐞� */
- useProdRoute.setCurProdRotTree(_treeData as unknown as MesRotTree[]);
- data.treeData = useProdRoute.getCurProdRotTree;
+ if (!useProdRoute.changeToCPPage || !useProdRoute.curProdRotTree.some((q) => q.name == wo)) {
+ /* 淇濆瓨宸ヨ壓鏍戝舰鏁版嵁鍒扮姸鎬佺鐞� */
+ useProdRoute.setCurProdRotTree({
+ name: wo,
+ treeInfo: _treeData as unknown as MesRotTree[],
+ });
+ }
+ if (useProdRoute.curProdRotTree.some((q) => q.name == wo)) {
+ data.treeData = useProdRoute.curProdRotTree.filter((q) => q.name == wo)[0].treeInfo;
+ }
return data;
},
/**
@@ -321,10 +331,9 @@
? ents.Data.Items
: JSON.parse(res.Data.Items[0].OPTION_1);
/* 濡傛灉OPTION_1瀛楁涓虹┖灏辨妸鍖呰淇℃伅杞琂SON瀛樺埌OPTION_1瀛楁 */
- res.Data.Items[0].OPTION_1 = isNullOrEmpty(res.Data.Items[0].OPTION_1)
- ? JSON.stringify(ents.Data.Items)
- : res.Data.Items[0].OPTION_1;
- } /* 濡傛灉鏄粍瑁呬笂鏂� */
+ res.Data.Items[0].OPTION_1 = JSON.stringify(result['BAS_PKG_DTL']);
+ }
+ /* 濡傛灉鏄粍瑁呬笂鏂� */
if (res.Data.Items[0].ACT_TYPE == 2) {
result['name'] = 'ItemCode';
result['ItemCode'] = JSON.parse(res.Data.Items[0].OPTION_1);
@@ -541,33 +550,18 @@
return;
}
/* 鏇存柊宸ュ崟鐘舵�佸苟鐢熸垚宸ュ崟鐨勫伐鑹鸿矾绾� */
- UpdateWoStatus({
- UserId: useUserStore().getUserInfo.userId as string,
- WorkOrder: args[1]['CODE'],
- Status: -1,
- RouteStatus: 1,
- WoBatch: '',
- ActLine: '',
+ ProdRouteToWo({
+ rotId: d.values.id, wo: args[1]['CODE'],
+ rotCode: '',
+ options: {
+ //鏍规嵁鎹偣鏌ヨ锛屽繀闇�甯﹁繖涓弬鏁�
+ UserId: useUserStore().getUserInfo.userId,
+ ByOrg: true,
+ CurOrg: useUserStore().getUserInfo.orgCode,
+ }
}).then((action) => {
if (action.IsSuccessed) {
- SP_MES_PROD2WO({ rotId: d.values.id, wo: args[1]['CODE'] }).then((action) => {
- if (action.IsSuccessed) {
- args[2]();
- } else {
- UpdateWoStatus({
- UserId: useUserStore().getUserInfo.userId as string,
- WorkOrder: args[1]['CODE'],
- Status: -1,
- RouteStatus: 0,
- WoBatch: '',
- ActLine: '',
- });
- createErrorModal({
- title: t('sys.api.errorTip'),
- content: t(action.LocaleMsg),
- });
- }
- });
+ args[2]();
} else {
createErrorModal({
title: t('sys.api.errorTip'),
@@ -644,7 +638,7 @@
* @param {Ref} selectedNodes
* @return {*}
*/
- SelectNode: (selectedNodes: Ref<any[]>) => {
+ SelectNode: (selectedNodes: Ref<any[]>, code: string) => {
let result = {
showConfig: false,
showNav: false,
@@ -669,6 +663,7 @@
result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
}
}
+ useProdRoute.setCurSelectedNodes({ name: code, SelectedNodes: selectedNodes.value });
return result;
},
/**
@@ -866,7 +861,25 @@
param.values['WORK_ORDER'] = param.others['WORK_ORDER'];
param.values['ID'] = buildUUID();
- await AddOrEditLabelVarByWorkOrder(param.values as unknown as BAS_LABEL_VAR_WO);
+ const apiaction = await AddOrEditLabelVarByWorkOrder(
+ param.values as unknown as BAS_LABEL_VAR_WO,
+ );
+ if (apiaction.IsSuccessed) {
+ const webSocketStore = useWebSocketStore();
+ if (webSocketStore.GetSocketState == 1) {
+ webSocketStore.sendMessage(
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['WORK_ORDER']}`,
+ );
+ }
+ }
+ case 'delete':
+ const webSocketStore = useWebSocketStore();
+ if (webSocketStore.GetSocketState == 1) {
+ webSocketStore.sendMessage(
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['WORK_ORDER']}`,
+ );
+ }
+ break;
}
resolve('OK');
} catch (e) {
--
Gitblit v1.9.3