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 | 163 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 57 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index 29c7a2a..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-09-25 15:01:51
+ * @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';
@@ -28,13 +28,18 @@
import { ContextMenuItem } from '/@/components/TigerTree';
import { AddOrEditLabelVarByWorkOrder, UpdateWoStatus } from '/@/api/tigerapi/mes/wo';
import { useForm } from '/@/components/Form';
-import { BAS_LABEL_VAR_WO } from '/@/api/tigerapi/model/mesModel';
+import { BAS_LABEL_VAR_WO, MesRotTree } from '/@/api/tigerapi/model/mesModel';
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;
@@ -90,15 +95,9 @@
fetchTreeData: async (type: string, wo: string) => {
let data = { title: '', treeData: [] as any[], fieldNames: {} };
let prodTreeData = await GetWoPTree({ wo: wo });
- // let uniqueArr = prodTreeData.reduce((acc, current) => {
- // if (!acc.some((x) => x.pid == current.pid && x.id == current.id && x.seq == current.seq && x.type == current.type)) {
- // acc.push(current);
- // }
- // return acc;
- // }, [] as V_MES_ROUTE_PTREE[]);
- data.treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
- if (data.treeData.length == 0) {
- data.treeData.push({
+ let _treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
+ if (_treeData.length == 0) {
+ _treeData.push({
pid: 'root',
tid: '',
id: '',
@@ -106,10 +105,23 @@
prod: '',
name: wo,
type: 'WorkOrder',
+ cust: '',
+ code: '',
+ seq: 0,
});
}
data.title = '宸ュ崟宸ヨ壓璺嚎';
data.fieldNames = { key: 'tid', title: 'name' };
+ 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;
},
/**
@@ -174,11 +186,12 @@
// searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
dataSource: data.value['BAS_PKG_DTL'],
columns: GetBaseColumns('BAS_PKG_DTL', args[0], data),
- maxHeight: 520,
+ // maxHeight: 520,
useSearchForm: false,
showTableSetting: false,
bordered: true,
- canResize: true,
+ isCanResizeParent: true,
+ // canResize: true,
showIndexColumn: false,
// rowSelection: {
// type: 'radio', //'checkbox'
@@ -197,11 +210,12 @@
// searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
dataSource: data.value['ItemCode'],
columns: GetBaseColumns('ItemCode', args[0], data),
- maxHeight: 520,
+ // maxHeight: 520,
useSearchForm: false,
showTableSetting: false,
bordered: true,
- canResize: true,
+ isCanResizeParent: true,
+ // canResize: true,
showIndexColumn: false,
// rowSelection: {
// type: 'radio', //'checkbox'
@@ -317,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);
@@ -333,18 +346,38 @@
}
if (params['selectedNodes'][0].type == 'Node') {
resetFieldsNode();
+ const wonode = await getEntity({
+ sqlcmd: `WORK_ORDER ='${params['objParams'].value['CODE']}' AND ID = '${res.Data.Items[0].NODE_ID}'`,
+ entityName: 'MES_WO_NODE',
+ order: '',
+ });
setFieldsValueNode({
ID: res.Data.Items[0].ID,
OPER_CODE: res.Data.Items[0].OPER_CODE,
ROT_ID: res.Data.Items[0].ROT_ID,
NODE_ID: res.Data.Items[0].NODE_ID,
NODE_NAME: res.Data.Items[0].NODE_NAME,
- IS_ACTIVE: res.Data.Items[0].IS_ACTIVE,
- IS_CALC_FPY: res.Data.Items[0].IS_CALC_FPY,
- CAN_SKIP: res.Data.Items[0].CAN_SKIP,
- IS_INPUT: res.Data.Items[0].IS_INPUT,
- IS_OUTPUT: res.Data.Items[0].IS_OUTPUT,
- ALLOW_DFT_IN: res.Data.Items[0].ALLOW_DFT_IN,
+ IS_ACTIVE: isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)
+ ? 'N'
+ : res.Data.Items[0].IS_ACTIVE,
+ IS_CALC_FPY: isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)
+ ? 'N'
+ : res.Data.Items[0].IS_CALC_FPY,
+ CAN_SKIP: isNullOrEmpty(res.Data.Items[0].CAN_SKIP)
+ ? 'N'
+ : res.Data.Items[0].CAN_SKIP,
+ IS_INPUT:
+ wonode.Data.Items[0].IS_FIRST_NODE == 'Y'
+ ? 'Y'
+ : isNullOrEmpty(res.Data.Items[0].IS_INPUT)
+ ? 'N'
+ : res.Data.Items[0].IS_INPUT,
+ IS_OUTPUT: isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)
+ ? 'N'
+ : res.Data.Items[0].IS_OUTPUT,
+ ALLOW_DFT_IN: isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)
+ ? 'N'
+ : res.Data.Items[0].ALLOW_DFT_IN,
REMARK: res.Data.Items[0].REMARK,
WORK_ORDER: params['objParams'].value['CODE'],
CUST_CODE: params['selectedNodes'][0].cust,
@@ -356,6 +389,7 @@
ItemCode: false,
};
}
+ useProdRoute.setcurDtl(result);
resolve(result);
} catch (e) {
reject(e);
@@ -377,6 +411,9 @@
}
values.AUTH_ORG = useUserStore().getUserInfo.orgCode;
values.AUTH_PROD = useUserStore().getUserInfo.prodCode;
+ if (type == 'Action') {
+ values.OPTION_1 = JSON.stringify(useProdRoute.getcurDtl['BAS_PKG_DTL']);
+ }
SaveEntity(values, true, entityName).then((action) => {
if (action.IsSuccessed) {
emit('success');
@@ -513,31 +550,18 @@
return;
}
/* 鏇存柊宸ュ崟鐘舵�佸苟鐢熸垚宸ュ崟鐨勫伐鑹鸿矾绾� */
- UpdateWoStatus({
- UserId: useUserStore().getUserInfo.userId as string,
- WorkOrder: args[1]['CODE'],
- Status: -1,
- RouteStatus: 1,
- WoBatch: '',
+ 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: '',
- });
- createErrorModal({
- title: t('sys.api.errorTip'),
- content: t(action.LocaleMsg),
- });
- }
- });
+ args[2]();
} else {
createErrorModal({
title: t('sys.api.errorTip'),
@@ -614,7 +638,7 @@
* @param {Ref} selectedNodes
* @return {*}
*/
- SelectNode: (selectedNodes: Ref<any[]>) => {
+ SelectNode: (selectedNodes: Ref<any[]>, code: string) => {
let result = {
showConfig: false,
showNav: false,
@@ -639,6 +663,7 @@
result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
}
}
+ useProdRoute.setCurSelectedNodes({ name: code, SelectedNodes: selectedNodes.value });
return result;
},
/**
@@ -657,6 +682,7 @@
url: '/addRoute',
action: 'addRoute',
isStep: false,
+ isCustEl: false,
},
// {
// title: '娣诲姞瀹㈡埛宸ヨ壓璺嚎',
@@ -677,6 +703,7 @@
url: '/editRoute',
action: 'editRoute',
isStep: false,
+ isCustEl: false,
},
];
break;
@@ -812,7 +839,7 @@
param.data.value['BAS_PKG_DTL'].map((x) => {
if (x.PKG_CODE == param.values['PKG_CODE']) {
x.LABEL_CODE = param.values['LABEL_CODE'];
- x.LABEL_ID = param.values['LABEL_CODE'];
+ x.LABEL_ID = param.values['LABEL_CODE'];
}
});
param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(
@@ -833,7 +860,26 @@
case 'BAS_LABEL_VAR_WO':
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) {
@@ -1370,7 +1416,7 @@
{
field: 'PKG_CODE',
label: '鍖呰瑙勫垯',
- colProps: { span: 11 },
+ colProps: window.screen.width == 2560 ? { span: 10 } : { span: 11 },
component: 'Input',
ifShow: ({ values }) => isPackage(values.ACT_TYPE),
},
@@ -1379,7 +1425,10 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
+ colProps:
+ window.screen.width == 2560
+ ? { span: 2, pull: 1 }
+ : { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
ifShow: ({ values }) => isPackage(values.ACT_TYPE),
colSlot: 'pkgadd',
},
@@ -1844,8 +1893,8 @@
{
title: '榛樿鍊�',
dataIndex: 'DEFAULT_VALUE',
- editRow: true,
- editRule: true,
+ // editRow: true,
+ // editRule: true,
},
] as BasicColumn[];
--
Gitblit v1.9.3