From 28a53fe81cdb551d2bf2023167487a3060e0f180 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 十月 2024 00:35:51 +0800
Subject: [PATCH] 一些更改
---
src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 62 ++++++++++++------------------
1 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index 3bc1df4..2e30e85 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-22 23:36: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';
@@ -331,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);
@@ -352,7 +351,7 @@
entityName: 'MES_WO_NODE',
order: '',
});
- setFieldsValueNode({
+ const values = {
ID: res.Data.Items[0].ID,
OPER_CODE: res.Data.Items[0].OPER_CODE,
ROT_ID: res.Data.Items[0].ROT_ID,
@@ -383,7 +382,11 @@
WORK_ORDER: params['objParams'].value['CODE'],
CUST_CODE: params['selectedNodes'][0].cust,
PROD_CODE: params['selectedNodes'][0].prod,
- });
+ };
+ setFieldsValueNode(values);
+ /* 榛樿淇濆瓨 */
+ SaveEntity(values, true, 'MES_WO_OPER');
+
result['name'] = 'Node';
result['isShow'] = {
BAS_PKG_DTL: false,
@@ -551,33 +554,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'),
@@ -884,7 +872,7 @@
const webSocketStore = useWebSocketStore();
if (webSocketStore.GetSocketState == 1) {
webSocketStore.sendMessage(
- `wsGetNew ${param.values['LABEL_ID']}_#_${ param.values['WORK_ORDER']}`,
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['WORK_ORDER']}`,
);
}
}
@@ -892,10 +880,10 @@
const webSocketStore = useWebSocketStore();
if (webSocketStore.GetSocketState == 1) {
webSocketStore.sendMessage(
- `wsGetNew ${param.values['LABEL_ID']}_#_${ param.values['WORK_ORDER']}`,
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['WORK_ORDER']}`,
);
}
- break;
+ break;
}
resolve('OK');
} catch (e) {
--
Gitblit v1.9.3