From 16257dd099d9811fb5caf78047ffc2425c401e0e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 05 八月 2024 03:11:20 +0800
Subject: [PATCH] 工单工艺路线更新
---
src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 438 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 356 insertions(+), 82 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index 0d84b3d..7bfc72b 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
@@ -4,16 +4,13 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-08-01 19:46:42
+ * @LastEditTime: 2024-08-05 00:43:08
*/
import { Ref, h, ref, render, unref } from 'vue';
import {
DeleteWoRoute,
- GetRoutePTree,
GetWoPTree,
- RouteToCust,
- RouteToProd,
SP_MES_PROD2WO,
SP_MES_WO2CUST,
} from '/@/api/tigerapi/mes/router';
@@ -24,13 +21,13 @@
import { NavItem } from '/@/api/tigerapi/model/basModel';
import { useMessage } from '/@/hooks/web/useMessage';
import { useModal } from '/@/components/Modal';
-import { FormSchema } from '/@/components/Table';
-import { initRoute } from '../data';
+import { BasicColumn, FormSchema, useTable } from '/@/components/Table';
import { CustModalParams } from '/@/api/tigerapi/model/systemModel';
import { useUserStore } from '/@/store/modules/user';
import { EventDataNode } from 'ant-design-vue/lib/tree';
import { ContextMenuItem } from '/@/components/TigerTree';
import { UpdateWoStatus } from '/@/api/tigerapi/mes/wo';
+import { useForm } from '/@/components/Form';
const { t } = useI18n();
const { createErrorModal } = useMessage();
@@ -126,6 +123,9 @@
case 'Node':
form = nodeFormShema;
break;
+ case 'BAS_PKG_DTL':
+ form = crudForms[type];
+ break;
}
return form;
},
@@ -137,74 +137,162 @@
return ['scanadd', 'assyadd', 'testadd', 'auditadd', 'printadd', 'pkgadd'];
},
/**
+ * @description: 鑾峰彇琛ㄦ牸use鍒楄〃
+ * @param {string} type
+ * @param {array} args
+ * @return {*}
+ */
+ GetUseTables: (data: Ref<{}>, ...args) => {
+ return {
+ Table: useTable({
+ title: '鍒楄〃淇℃伅',
+ // api: getListByPage,
+ // searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
+ dataSource: data.value['Table'],
+ columns: GetBaseColumns('', args[0], data),
+ maxHeight: 520,
+ useSearchForm: false,
+ showTableSetting: false,
+ bordered: true,
+ canResize: true,
+ showIndexColumn: false,
+ // rowSelection: {
+ // type: 'radio', //'checkbox'
+ // },
+ actionColumn: {
+ width: 100,
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ slots: { customRender: 'action' },
+ fixed: 'right',
+ }, //鑷畾涔夋搷浣滃垪
+ }),
+ };
+ },
+ GetUseForm: () => {
+ return {
+ Action: useForm({
+ labelWidth: 145,
+ schemas: methods.GetCrudForm('Action'),
+ actionColOptions: {
+ offset: 8,
+ span: 24,
+ },
+ wrapperCol: {
+ span: 15,
+ },
+ showActionButtonGroup: true,
+ submitButtonOptions: {
+ text: '淇濆瓨',
+ },
+ }),
+ Node: useForm({
+ labelWidth: 145,
+ schemas: methods.GetCrudForm('Node'),
+ actionColOptions: {
+ offset: 8,
+ span: 24,
+ },
+ wrapperCol: {
+ span: 15,
+ },
+ showActionButtonGroup: true,
+ submitButtonOptions: {
+ text: '淇濆瓨',
+ },
+ }),
+ };
+ },
+ /**
* @description: 鍒囨崲鑺傜偣鏃朵簨浠舵柟娉�
* @return {*}
*/
- nodeChange: (params: {
- resetFields: any;
- setFieldsValue: any;
- objParams: Ref<any>;
- selectedNodes: Ref<any[]>;
- }) => {
- let sqlcmd = ' 1=1 ';
- if (!isNullOrEmpty(params['objParams'].value['CODE'])) {
- sqlcmd += `And WORK_ORDER = '${params['objParams'].value['CODE']}'`;
- }
- if (!isNullOrEmpty(params['selectedNodes'].value[0].id)) {
- sqlcmd +=
- params['selectedNodes'].value[0].type == 'Action'
- ? `And ACT_ID = '${params['selectedNodes'].value[0].id}'`
- : `And NODE_ID = '${params['selectedNodes'].value[0].id}'`;
- }
- getEntity({
- sqlcmd: sqlcmd,
- entityName:
- params['selectedNodes'].value[0].type == 'Action' ? 'MES_WO_ACTION' : 'MES_WO_OPER',
- order: '',
- }).then((res) => {
- params['resetFields']();
- if (params['selectedNodes'].value[0].type == 'Action') {
- params['setFieldsValue']({
- ID: res.Data.Items[0].ID,
- ACT_ID: res.Data.Items[0].ACT_ID,
- ROT_ID: res.Data.Items[0].ROT_ID,
- NODE_ID: res.Data.Items[0].NODE_ID,
- IS_ACTIVE: res.Data.Items[0].IS_ACTIVE,
- ITEM_CODE: res.Data.Items[0].ITEM_CODE,
- RULE_CODE: res.Data.Items[0].RULE_CODE,
- TEST_CODE: res.Data.Items[0].TEST_CODE,
- SAPL_CODE: res.Data.Items[0].SAPL_CODE,
- LABEL_CODE: res.Data.Items[0].LABEL_CODE,
- PKG_CODE: res.Data.Items[0].PKG_CODE,
- ACT_CODE: res.Data.Items[0].ACT_CODE,
- REMARK: res.Data.Items[0].REMARK,
- WORK_ORDER: params['objParams'].value['CODE'],
- ACT_TYPE: res.Data.Items[0].ACT_TYPE,
- CUST_CODE: params['selectedNodes'].value[0].cust,
- PROD_CODE: params['selectedNodes'].value[0].prod,
- });
+ nodeChange: (params: { useForms: Ref<any>; objParams: Ref<any>; selectedNodes: any[] }) =>
+ new Promise<any>(async (resolve, reject) => {
+ let result = {};
+ let sqlcmd = ' 1=1 ';
+ if (!isNullOrEmpty(params['objParams'].value['CODE'])) {
+ sqlcmd += `And WORK_ORDER = '${params['objParams'].value['CODE']}'`;
}
- if (params['selectedNodes'].value[0].type == 'Node') {
- params['setFieldsValue']({
- 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,
- REMARK: res.Data.Items[0].REMARK,
- WORK_ORDER: params['objParams'].value['CODE'],
- CUST_CODE: params['selectedNodes'].value[0].cust,
- PROD_CODE: params['selectedNodes'].value[0].prod,
- });
+ if (!isNullOrEmpty(params['selectedNodes'][0].id)) {
+ sqlcmd +=
+ params['selectedNodes'][0].type == 'Action'
+ ? `And ACT_ID = '${params['selectedNodes'][0].id}'`
+ : `And NODE_ID = '${params['selectedNodes'][0].id}'`;
}
- });
- },
+ try {
+ const res = await getEntity({
+ sqlcmd: sqlcmd,
+ entityName:
+ params['selectedNodes'][0].type == 'Action' ? 'MES_WO_ACTION' : 'MES_WO_OPER',
+ order: '',
+ });
+ const setFieldsValue = params['useForms'].value['Action'][1]['setFieldsValue'];
+ const setFieldsValueNode = params['useForms'].value['Node'][1]['setFieldsValue'];
+ const resetFields = params['useForms'].value['Action'][1]['resetFields'];
+ const resetFieldsNode = params['useForms'].value['Node'][1]['resetFields'];
+ if (params['selectedNodes'][0].type == 'Action') {
+ resetFields();
+ setFieldsValue({
+ ID: res.Data.Items[0].ID,
+ ACT_ID: res.Data.Items[0].ACT_ID,
+ ROT_ID: res.Data.Items[0].ROT_ID,
+ NODE_ID: res.Data.Items[0].NODE_ID,
+ IS_ACTIVE: res.Data.Items[0].IS_ACTIVE,
+ ITEM_CODE: res.Data.Items[0].ITEM_CODE,
+ RULE_CODE: res.Data.Items[0].RULE_CODE,
+ TEST_CODE: res.Data.Items[0].TEST_CODE,
+ SAPL_CODE: res.Data.Items[0].SAPL_CODE,
+ LABEL_CODE: res.Data.Items[0].LABEL_CODE,
+ PKG_CODE: res.Data.Items[0].PKG_CODE,
+ ACT_CODE: res.Data.Items[0].ACT_CODE,
+ REMARK: res.Data.Items[0].REMARK,
+ WORK_ORDER: params['objParams'].value['CODE'],
+ ACT_TYPE: res.Data.Items[0].ACT_TYPE,
+ CUST_CODE: params['selectedNodes'][0].cust,
+ PROD_CODE: params['selectedNodes'][0].prod,
+ OPTION_1: res.Data.Items[0].OPTION_1,
+ });
+ result['isShow'] = isNullOrEmpty(res.Data.Items[0].PKG_CODE) ? false : true;
+ const ents = await getEntity({
+ sqlcmd: `RULE_CODE ='${res.Data.Items[0].PKG_CODE}'`,
+ entityName: 'V_BAS_PKG_DTL',
+ order: '',
+ });
+ result['Table'] = isNullOrEmpty(res.Data.Items[0].OPTION_1)
+ ? 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;
+ result['Action'] = res.Data.Items;
+ }
+ if (params['selectedNodes'][0].type == 'Node') {
+ resetFieldsNode();
+ 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,
+ REMARK: res.Data.Items[0].REMARK,
+ WORK_ORDER: params['objParams'].value['CODE'],
+ CUST_CODE: params['selectedNodes'][0].cust,
+ PROD_CODE: params['selectedNodes'][0].prod,
+ });
+ }
+ resolve(result);
+ } catch (e) {
+ reject(e);
+ }
+ }),
/**
* @description: 鑷畾涔夋彁浜ゆ柟娉�
* @return {*}
@@ -259,27 +347,45 @@
* @param {*} u
* @return {*}
*/
- GetSelectSuccess: (d, u, ...args) => {
+ GetSelectSuccess: async (d, u, ...args) => {
let value = {};
switch (args[0]) {
case 'scanadd':
value = {
- RULE_CODE: d.values['val'],
+ value: {
+ RULE_CODE: d.values['val'],
+ },
+ isShow: false,
};
break;
case 'assyadd':
value = {
- ITEM_CODE: d.values['val'],
+ value: {
+ ITEM_CODE: d.values['val'],
+ },
+ isShow: false,
};
break;
case 'printadd':
value = {
- LABEL_CODE: d.values['val'],
+ value: {
+ LABEL_CODE: d.values['val'],
+ },
+ isShow: false,
};
break;
case 'pkgadd':
+ const ents = await getEntity({
+ sqlcmd: `RULE_CODE ='${d.values['val']}'`,
+ entityName: 'V_BAS_PKG_DTL',
+ order: '',
+ });
value = {
- PKG_CODE: d.values['val'],
+ value: {
+ PKG_CODE: d.values['val'],
+ },
+ isShow: true,
+ data: ents.Data.Items,
};
break;
case 'addRoute':
@@ -363,6 +469,7 @@
return {
configTitle: type == 'Action' ? '琛屼负閰嶇疆' : '宸ュ簭閰嶇疆',
navTitle: type == 'Product' ? '娣诲姞宸ヨ壓璺嚎' : '宸ヨ壓璺嚎缁存姢',
+ tableTitle: type == 'Action' ? '鍖呰灞傜骇鍒楄〃' : '',
};
},
/**
@@ -376,6 +483,7 @@
showNav: false,
type: selectedNodes.value[0].type,
nodes: selectedNodes.value,
+ showOtherTable: false,
};
if (isNullOrUnDef(selectedNodes)) {
return result;
@@ -383,10 +491,16 @@
if (selectedNodes.value[0].type == 'WorkOrder' || selectedNodes.value[0].type == 'Route') {
result.showNav = true;
result.showConfig = false;
+ result.showOtherTable = false;
}
if (selectedNodes.value[0].type == 'Action' || selectedNodes.value[0].type == 'Node') {
result.showNav = false;
result.showConfig = true;
+ if (selectedNodes.value[0].type == 'Action') {
+ result.showOtherTable = true;
+ } else {
+ result.showOtherTable = false;
+ }
}
return result;
},
@@ -486,7 +600,7 @@
SP_MES_WO2CUST({ wo: args[2][0]['wo'] });
break;
case 'editRoute':
- args[1](true, { rotId: args[2][0].code, slotName: '' });
+ args[1](true, { rotId: args[2][0].wo, slotName: '', rotType: 'Wo' });
break;
}
},
@@ -541,13 +655,13 @@
* @param {array} args
* @return {*}
*/
- CustFunc: (param: CustModalParams) => {
- if (param.cType == 'Route') {
- // initRoute(args[0], args[1]);
- }
- },
- GetUseForm: () => {
- return {};
+ CustFunc: async (param: CustModalParams) => {
+ param.data.value['Table'].map((x) => {
+ if (x.PKG_CODE == param.values['PKG_CODE']) {
+ x.LABEL_CODE = param.values['LABEL_CODE'];
+ }
+ });
+ param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(param.data.value['Table']);
},
/**
* @description: 鑾峰彇鍙抽敭鑿滃崟鍒楄〃
@@ -588,6 +702,63 @@
/* 浠ヤ笅鏄唴閮ㄦ柟娉曪紝涓峞xport锛屼緵涓婇潰鐨勬柟娉曡皟鐢� */
+ let columns: BasicColumn[] = [];
+ /**
+ * @description: 鑾峰彇琛ㄦ牸瀛楁Json
+ * @param {string} type
+ * @return {*}
+ */
+ function GetBaseColumns(type: string, emit, data: Ref<{}>) {
+ columns = [
+ {
+ dataIndex: 'PKG_RULE_ID',
+ title: '鍖呰瑙勫垯ID',
+ ifShow: false,
+ sorter: true,
+ resizable: true,
+ },
+ {
+ dataIndex: 'PKG_CODE',
+ title: '鍖呰缂栫爜',
+ ifShow: false,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'PKG_NAME',
+ title: '鍖呰鍚嶇О',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'PKG_QTY',
+ title: '鍖呰鏁伴噺',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'PKG_LEVEL',
+ title: '鍖呰灞傜骇',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'LABEL_CODE',
+ title: '鏍囩妯℃澘缂栫爜',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ },
+ ];
+ return columns;
+ }
/**
* @description: 寮瑰嚭閫夋嫨妗�-鐗╂枡閫夋嫨妗嗛厤缃�
* @return {*}
@@ -932,6 +1103,13 @@
component: 'Input',
colProps: { span: 12 },
},
+ {
+ field: 'OPTION_1',
+ label: '琛屼负閫夐」1',
+ component: 'Input',
+ colProps: { span: 12 },
+ show: false,
+ },
];
/**
@@ -1131,6 +1309,102 @@
},
];
+ const crudForms = {
+ BAS_PKG_DTL: [
+ {
+ label: '鍖呰瑙勫垯ID',
+ field: 'PKG_RULE_ID',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return true;
+ },
+ },
+ {
+ label: '鍖呰灞傜骇',
+ field: 'PKG_LEVEL',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return true;
+ },
+ },
+ {
+ field: 'PKG_CODE',
+ label: '鍖呰/杞藉叿缂栫爜',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return true;
+ },
+ },
+ {
+ label: '鍖呰鏁伴噺',
+ field: 'PKG_QTY',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return true;
+ },
+ },
+ {
+ field: 'LABEL_CODE',
+ label: '妯℃澘缂栫爜',
+ component: 'Input',
+ show: true,
+ // required: true,
+ colProps: {
+ span: 22,
+ },
+ },
+ {
+ field: 'BAS_LABEL_TEMP1PSelect_0', //鎸変綆浠ｇ爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+PSelect_0锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝PSelect_0杩欐槸涓浐瀹氬悗缂�
+ label: '1',
+ defaultValue: 'BAS_LABEL_TEMP',
+ component: 'Input',
+ colProps: { span: 2 },
+ colSlot: 'BAS_LABEL_TEMP1add', //鎸変綆浠ｇ爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+add锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝add杩欐槸涓浐瀹氬悗缂�
+ },
+ {
+ label: '鍖呰鍚嶇О',
+ field: 'PKG_NAME',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ show: false,
+ },
+ {
+ label: '澶囨敞',
+ field: 'REMARK',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return true;
+ },
+ },
+ {
+ label: 'ID',
+ field: 'ID',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ show: false,
+ },
+ ] as FormSchema[],
+ };
+
return [methods];
}
--
Gitblit v1.9.3