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/ProdRouteBinding.ts | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index f654b3e..1b8ed42 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-10-22 09:28:36
+ * @LastEditTime: 2024-10-24 01:21:57
*/
import { Ref, h, ref, render, unref } from 'vue';
@@ -33,6 +33,7 @@
import { buildUUID } from '/@/utils/uuid';
import { AddOrEditLabelVarByWorkOrder } from '/@/api/tigerapi/mes/wo';
import { useProdRouteStore } from '/@/store/modules/prodRoute';
+import { useWebSocketStore } from '/@/store/modules/websocket';
const { t } = useI18n();
const { createErrorModal } = useMessage();
@@ -233,9 +234,7 @@
? 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';
@@ -853,7 +852,7 @@
resolve('OK');
break;
case 'BAS_LABEL_VAR_WO':
- param.values['WORK_ORDER'] = param.others['WORK_ORDER'];
+ param.values['PROD_CODE'] = param.others['PROD_CODE'];
param.values['ID'] = buildUUID();
var action = await AddOrEditLabelVarByWorkOrder(
param.values as unknown as BAS_LABEL_VAR_WO,
@@ -863,6 +862,14 @@
/* 璁剧疆榛樿宸ヨ壓璺嚎 */
var action = await useProdRoute.setDefaulRoute(param);
resolve(action);
+ case 'delete':
+ const webSocketStore = useWebSocketStore();
+ if (webSocketStore.GetSocketState == 1) {
+ webSocketStore.sendMessage(
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['PROD_CODE']}`,
+ );
+ }
+ break;
}
} catch (e) {
reject(e);
@@ -1846,11 +1853,17 @@
title: '宸ュ崟鍙�',
dataIndex: 'WORK_ORDER',
width: 280,
- editRow: true,
+ // editRow: true,
// editable: true,
ifShow: false,
},
{
+ title: '宸ュ崟鍙�',
+ dataIndex: 'PROD_CODE',
+ width: 280,
+ ifShow: false,
+ },
+ {
title: '鍙橀噺鍚�',
dataIndex: 'VAR_NAME',
},
--
Gitblit v1.9.3