From 547c91649da47f4dd8c6706e632797dbd9d79d87 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期六, 07 十二月 2024 16:26:49 +0800 Subject: [PATCH] 工艺路线工序节点保存更新 --- src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 78 ++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts index e62eaf2..5ae4fdb 100644 --- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts +++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts @@ -34,6 +34,7 @@ import { useProdRouteStore } from '/@/store/modules/prodRoute'; import { useWebSocketStore } from '/@/store/modules/websocket'; import { useGlobSetting } from '/@/hooks/setting'; +import { cloneDeep } from 'vue-json-pretty/types/utils'; const { t } = useI18n(); const { createErrorModal } = useMessage(); @@ -181,12 +182,17 @@ * @return {*} */ GetUseTables: (data: Ref<{}>, ...args) => { + let sortData = isNullOrUnDef(data.value['BAS_PKG_DTL']) + ? data.value['BAS_PKG_DTL'] + : data.value['BAS_PKG_DTL'].sort((a, b) => { + return a.PKG_LEVEL - b.PKG_LEVEL; + }); return { BAS_PKG_DTL: useTable({ title: '鍒楄〃淇℃伅', // api: getListByPage, // searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' }, - dataSource: data.value['BAS_PKG_DTL'], + dataSource: sortData, columns: GetBaseColumns('BAS_PKG_DTL', args[0], data), // maxHeight: 520, useSearchForm: false, @@ -353,44 +359,40 @@ entityName: 'MES_WO_NODE', order: '', }); - const values = { - 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: 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, - IF_DFT_OFFLINE: isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE) - ? 'N' - : res.Data.Items[0].IF_DFT_OFFLINE, - REMARK: res.Data.Items[0].REMARK, - WORK_ORDER: params['objParams'].value['CODE'], - CUST_CODE: params['selectedNodes'][0].cust, - PROD_CODE: params['selectedNodes'][0].prod, - }; - setFieldsValueNode(values); + + if(isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)){ + res.Data.Items[0].IS_ACTIVE = 'N' + } + if(isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)){ + res.Data.Items[0].IS_CALC_FPY = 'N' + } + if(isNullOrEmpty(res.Data.Items[0].CAN_SKIP)){ + res.Data.Items[0].CAN_SKIP = 'N' + } + if(isNullOrEmpty(res.Data.Items[0].IS_INPUT)){ + res.Data.Items[0].IS_INPUT = 'N' + } + if(isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)){ + res.Data.Items[0].IS_OUTPUT = 'N' + } + if(isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)){ + res.Data.Items[0].ALLOW_DFT_IN = 'N' + } + if(isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE)){ + res.Data.Items[0].IF_DFT_OFFLINE = 'N' + } + if(!isNullOrEmpty(params['objParams'].value['CODE'])){ + res.Data.Items[0].WORK_ORDER = params['objParams'].value['CODE'] + } + if(!isNullOrEmpty(params['selectedNodes'][0].prod)){ + res.Data.Items[0].PROD_CODE = params['selectedNodes'][0].prod + } + if(!isNullOrEmpty(params['selectedNodes'][0].cust)){ + res.Data.Items[0].CUST_CODE = params['selectedNodes'][0].cust + } + setFieldsValueNode(res.Data.Items[0]); /* 榛樿淇濆瓨 */ - SaveEntity(values, true, 'MES_WO_OPER'); + SaveEntity(res.Data.Items[0], true, 'MES_WO_OPER'); result['name'] = 'Node'; result['isShow'] = { -- Gitblit v1.9.3