From 947cafbb9c59261d0d7252a70bbbca8690c5cbc4 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 21 八月 2024 01:54:01 +0800
Subject: [PATCH] 是否称重
---
src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 924 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 790 insertions(+), 134 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index e4f26ae..eb9076c 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
@@ -4,11 +4,16 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-21 18:26:07
+ * @LastEditTime: 2024-08-21 01:51:03
*/
import { Ref, h, ref, render, unref } from 'vue';
-import { GetRoutePTree, RouteToCust, RouteToProd } from '/@/api/tigerapi/mes/router';
+import {
+ DeleteWoRoute,
+ GetWoPTree,
+ SP_MES_PROD2WO,
+ SP_MES_WO2CUST,
+} from '/@/api/tigerapi/mes/router';
import { GetEnum, SaveEntity, convertToTree, getEntity } from '/@/api/tigerapi/system';
import { useLocale } from '/@/locales/useLocale';
import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
@@ -16,10 +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();
@@ -46,8 +54,8 @@
CreateIcon: (params: Recordable<any>) => {
let icon = '';
switch (params['type']) {
- case 'Product':
- icon = 'similar-product|svg';
+ case 'WorkOrder':
+ icon = 'workorder|svg';
break;
case 'Route':
icon = 'route|svg';
@@ -68,17 +76,17 @@
* @description: 楂樼骇琛ㄥ崟鍜岃鎯呴〉闈㈣繑鍥炰富椤甸潰鐨剈rl
* @return {*}
*/
- GetHomeUrl: () => {
- return `/V_BAS_PROD/LC/${encodeURI(JSON.stringify({ ID: 'V_BAS_PROD', colSlots: [], crudColSlots: [] }))}`;
+ GetHomeUrl: (params: {}) => {
+ return `/BIZ_MES_WO/LC/${encodeURI(JSON.stringify({ ID: 'BIZ_MES_WO', colSlots: params['colSlots'], crudColSlots: [] }))}`;
},
/**
* @description: 鑾峰彇鏍戝舰鏁版嵁
* @param {string} type
* @return {*}
*/
- fetchTreeData: async (type: string, itemCode: string) => {
+ fetchTreeData: async (type: string, wo: string) => {
let data = { title: '', treeData: [] as any[], fieldNames: {} };
- let prodTreeData = await GetRoutePTree({prodCode: itemCode, orgCode: useUserStore().getUserInfo.orgCode});
+ 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);
@@ -86,7 +94,18 @@
// return acc;
// }, [] as V_MES_ROUTE_PTREE[]);
data.treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
- data.title = '宸ヨ壓璺嚎';
+ if (data.treeData.length == 0) {
+ data.treeData.push({
+ pid: 'root',
+ tid: '',
+ id: '',
+ wo: wo,
+ prod: '',
+ name: wo,
+ type: 'WorkOrder',
+ });
+ }
+ data.title = '宸ュ崟宸ヨ壓璺嚎';
data.fieldNames = { key: 'tid', title: 'name' };
return data;
},
@@ -104,6 +123,9 @@
case 'Node':
form = nodeFormShema;
break;
+ default:
+ form = crudForms[type];
+ break;
}
return form;
},
@@ -115,74 +137,206 @@
return ['scanadd', 'assyadd', 'testadd', 'auditadd', 'printadd', 'pkgadd'];
},
/**
+ * @description: 鑾峰彇琛ㄦ牸use鍒楄〃
+ * @param {string} type
+ * @param {array} args
+ * @return {*}
+ */
+ GetUseTables: (data: Ref<{}>, ...args) => {
+ return {
+ BAS_PKG_DTL: useTable({
+ title: '鍒楄〃淇℃伅',
+ // api: getListByPage,
+ // searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
+ dataSource: data.value['BAS_PKG_DTL'],
+ columns: GetBaseColumns('BAS_PKG_DTL', 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',
+ }, //鑷畾涔夋搷浣滃垪
+ }),
+ ItemCode: useTable({
+ title: '鍒楄〃淇℃伅',
+ // api: getListByPage,
+ // searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
+ dataSource: data.value['ItemCode'],
+ columns: GetBaseColumns('ItemCode', 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 PROD_CODE = '${params['objParams'].value['CODE']}'`;
- }
- if (!isNullOrEmpty(params['selectedNodes'].value[0].cust)) {
- sqlcmd += `And CUST_CODE = '${params['selectedNodes'].value[0].cust}'`;
- }
- 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_PROD_ACTION' : 'MES_PROD_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,
- PROD_CODE: params['objParams'].value['CODE'],
- ACT_TYPE: res.Data.Items[0].ACT_TYPE,
- CUST_CODE: params['selectedNodes'].value[0].cust,
- });
+ nodeChange: (params: { useForms: Ref<any>; objParams: Ref<any>; selectedNodes: any[] }) =>
+ new Promise<any>(async (resolve, reject) => {
+ let result = { isShow: {} };
+ 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,
- REMARK: res.Data.Items[0].REMARK,
- PROD_CODE: params['objParams'].value['CODE'],
- CUST_CODE: params['selectedNodes'].value[0].cust,
- });
+ 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,
+ OPTION_2: res.Data.Items[0].OPTION_2,
+ });
+ /* 濡傛灉鏄寘瑁呰鍒� */
+ if (res.Data.Items[0].ACT_TYPE == 6) {
+ result['name'] = 'BAS_PKG_DTL';
+ result['isShow'] = {
+ BAS_PKG_DTL: isNullOrEmpty(res.Data.Items[0].PKG_CODE) ? false : true,
+ ItemCode: false,
+ };
+ const ents = await getEntity({
+ sqlcmd: `RULE_CODE ='${res.Data.Items[0].PKG_CODE}'`,
+ entityName: 'V_BAS_PKG_DTL',
+ order: '',
+ });
+ result['BAS_PKG_DTL'] = 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;
+ } /* 濡傛灉鏄粍瑁呬笂鏂� */
+ if (res.Data.Items[0].ACT_TYPE == 2) {
+ result['name'] = 'ItemCode';
+ result['ItemCode'] = JSON.parse(res.Data.Items[0].OPTION_1);
+ result['isShow'] = {
+ BAS_PKG_DTL: false,
+ ItemCode: true,
+ };
+ }
+ 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,
+ });
+ result['name'] = 'Node';
+ result['isShow'] = {
+ BAS_PKG_DTL: false,
+ ItemCode: false,
+ };
+ }
+ resolve(result);
+ } catch (e) {
+ reject(e);
+ }
+ }),
/**
* @description: 鑷畾涔夋彁浜ゆ柟娉�
* @return {*}
@@ -191,12 +345,14 @@
let entityName = '';
switch (type) {
case 'Action':
- entityName = 'MES_PROD_ACTION';
+ entityName = 'MES_WO_ACTION';
break;
case 'Node':
- entityName = 'MES_PROD_OPER';
+ entityName = 'MES_WO_OPER';
break;
}
+ values.AUTH_ORG = useUserStore().getUserInfo.orgCode;
+ values.AUTH_PROD = useUserStore().getUserInfo.prodCode;
SaveEntity(values, true, entityName).then((action) => {
if (action.IsSuccessed) {
emit('success');
@@ -235,28 +391,62 @@
* @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: { BAS_PKG_DTL: false, ItemCode: false },
};
break;
case 'assyadd':
+ const items = d.values['val'].split(',');
+ let data: any[] = [];
+ if (!isNullOrEmpty(items) && items.length > 0) {
+ items.map((x) => {
+ data.push({
+ ITEM_CODE: x,
+ RULE_CODE: '',
+ IsBatchItem: 'N',
+ QTY: 1,
+ });
+ });
+ }
value = {
- ITEM_CODE: d.values['val'],
+ value: {
+ ITEM_CODE: d.values['val'],
+ },
+ isShow: { BAS_PKG_DTL: false, ItemCode: true },
+ data: data,
+ name: 'ItemCode',
};
break;
case 'printadd':
value = {
- LABEL_CODE: d.values['val'],
+ value: {
+ LABEL_CODE: d.values['val'],
+ },
+ isShow: { BAS_PKG_DTL: false, ItemCode: false },
};
break;
case 'pkgadd':
+ const ents = await getEntity({
+ sqlcmd: `RULE_CODE ='${d.values['val']}'`,
+ entityName: 'V_BAS_PKG_DTL',
+ order: '',
+ });
value = {
- pkgRULE_CODE: d.values['val'],
+ value: {
+ PKG_CODE: d.values['val'],
+ },
+ isShow: { BAS_PKG_DTL: true, ItemCode: false },
+ data: ents.Data.Items,
+ name: 'BAS_PKG_DTL',
};
+ break;
case 'addRoute':
if (isNullOrEmpty(args[1]['CODE'])) {
createErrorModal({
@@ -265,29 +455,47 @@
});
return;
}
- let codes = d.values.id.split(',');
- var i;
- for (i = 0; i < codes.length; i++) {
- if (d.which == 'addRoute') {
- RouteToProd({ rotId: codes[i], prodCode: args[1]['CODE'] });
+ /* 鏇存柊宸ュ崟鐘舵�佸苟鐢熸垚宸ュ崟鐨勫伐鑹鸿矾绾� */
+ UpdateWoStatus({
+ UserId: useUserStore().getUserInfo.userId as string,
+ WorkOrder: args[1]['CODE'],
+ Status: -1,
+ RouteStatus: 1,
+ }).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,
+ });
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: t(action.LocaleMsg),
+ });
+ }
+ });
+ } else {
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: t(action.LocaleMsg),
+ });
}
- }
-
- args[2]();
+ });
break;
case 'addCustomer':
if (isNullOrEmpty(args[1]['CODE'])) {
createErrorModal({
title: t('sys.api.errorTip'),
- content: '浜у搧涓虹┖锛屼笉鑳芥坊鍔犲伐鑹鸿矾绾匡紝璇风偣鍑诲乏渚ч�夋嫨浜у搧',
+ content: '宸ュ崟涓虹┖锛屼笉鑳芥坊鍔犲伐鑹鸿矾绾匡紝璇风偣鍑诲乏渚ч�夋嫨宸ュ崟',
});
return;
}
- let rotIds = d.ROT_ID.split(',');
- var i;
- for (i = 0; i < rotIds.length; i++) {
- RouteToCust({ rotId: rotIds[i], prodCode: args[1]['CODE'], custCode: d.CUST_CODE });
- }
+ SP_MES_WO2CUST({ wo: args[1]['CODE'] });
args[2]();
break;
@@ -303,6 +511,12 @@
addRoute: useModal(),
addCustomer: useModal(),
editRoute: useModal(),
+ scanadd: useModal(),
+ assyadd: useModal(),
+ testadd: useModal(),
+ auditadd: useModal(),
+ printadd: useModal(),
+ pkgadd: useModal(),
};
},
/**
@@ -310,10 +524,11 @@
* @param {string} type
* @return {*}
*/
- GetTitle: (type: string) => {
+ GetTitle: (type: string, item) => {
return {
configTitle: type == 'Action' ? '琛屼负閰嶇疆' : '宸ュ簭閰嶇疆',
navTitle: type == 'Product' ? '娣诲姞宸ヨ壓璺嚎' : '宸ヨ壓璺嚎缁存姢',
+ tableTitle: type == 'Action' ? (item == 'ItemCode' ? '涓婃枡鍒楄〃' : '鍖呰灞傜骇鍒楄〃') : '',
};
},
/**
@@ -327,17 +542,24 @@
showNav: false,
type: selectedNodes.value[0].type,
nodes: selectedNodes.value,
+ showOtherTable: { BAS_PKG_DTL: false, ItemCode: false },
};
if (isNullOrUnDef(selectedNodes)) {
return result;
}
- if (selectedNodes.value[0].type == 'Product' || selectedNodes.value[0].type == 'Route') {
+ if (selectedNodes.value[0].type == 'WorkOrder' || selectedNodes.value[0].type == 'Route') {
result.showNav = true;
result.showConfig = false;
+ result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: 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 = { BAS_PKG_DTL: false, ItemCode: false };
+ } else {
+ result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
+ }
}
return result;
},
@@ -348,7 +570,7 @@
GetNavItems: (type: string) => {
let item: NavItem[] = [];
switch (type) {
- case 'Product':
+ case 'WorkOrder':
item = [
{
title: '娣诲姞浜у搧宸ヨ壓璺嚎',
@@ -358,14 +580,14 @@
action: 'addRoute',
isStep: false,
},
- {
- title: '娣诲姞瀹㈡埛宸ヨ壓璺嚎',
- icon: 'add_customer|svg',
- color: '#bf0c2c',
- url: '/addCustomer',
- action: 'addCustomer',
- isStep: true,
- },
+ // {
+ // title: '娣诲姞瀹㈡埛宸ヨ壓璺嚎',
+ // icon: 'add_customer|svg',
+ // color: '#bf0c2c',
+ // url: '/addCustomer',
+ // action: 'addCustomer',
+ // isStep: true,
+ // },
];
break;
case 'Route':
@@ -427,12 +649,17 @@
});
break;
case 'addCustomer':
- args[0](true, {
- title: '璇峰畬鎴愪互涓嬫楠�',
- });
+ if (isNullOrEmpty(args[2][0]['wo'])) {
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: '宸ュ崟涓虹┖锛屼笉鑳芥坊鍔犲伐鑹鸿矾绾匡紝璇风偣鍑诲乏渚ч�夋嫨宸ュ崟',
+ });
+ return;
+ }
+ SP_MES_WO2CUST({ wo: args[2][0]['wo'] });
break;
case 'editRoute':
- args[1](true, { rotId: args[2][0].id, slotName: '' });
+ args[1](true, { rotId: args[2][0].wo, slotName: '', rotType: 'Wo', prodCode:args[3],custCode:args[2][0].cust });
break;
}
},
@@ -443,7 +670,7 @@
GetBaseCards: (type: string) => {
let reusts: any[] = [];
switch (type) {
- case 'Product':
+ case 'WorkOrder':
reusts = [];
break;
case 'Route':
@@ -487,18 +714,225 @@
* @param {array} args
* @return {*}
*/
- CustFunc: (param: CustModalParams) => {
- if (param.cType == 'Route') {
- // initRoute(args[0], args[1]);
+ CustFunc: async (param: CustModalParams) => {
+ switch (param['ctype']) {
+ case 'BAS_PKG_DTL':
+ // const ents = await getEntity({
+ // sqlcmd: `PKG_RULE_ID ='${param.values['PKG_RULE_ID']}'`,
+ // entityName: 'V_BAS_PKG_DTL',
+ // order: '',
+ // });
+ // param.data.value['Table'] = ents.Data.Items;
+ param.data.value['BAS_PKG_DTL'].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['BAS_PKG_DTL'],
+ );
+ break;
+ case 'ItemCode':
+ param.data.value['ItemCode'].map((x) => {
+ if (x.ITEM_CODE == param.values['ITEM_CODE']) {
+ x.IsBatchItem = param.values['IsBatchItem'];
+ x.RULE_CODE = param.values['RULE_CODE'];
+ }
+ });
+ param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(
+ param.data.value['ItemCode'],
+ );
+ break;
}
},
- GetUseForm: () => {
- return {};
+ /**
+ * @description: 鑾峰彇鍙抽敭鑿滃崟鍒楄〃
+ * @param {EventDataNode} node
+ * @return {*}
+ */
+ GetRightMenuList: (node: EventDataNode, ...args): ContextMenuItem[] => {
+ const emit = args[0];
+ const menu = [
+ // {
+ // label: '鏂板',
+ // handler: () => {
+ // console.log('鐐瑰嚮浜嗘柊澧�', node);
+ // },
+ // icon: 'bi:plus',
+ // },
+ {
+ label: '鍒犻櫎',
+ handler: () => {
+ console.log('鐐瑰嚮浜嗗垹闄�', node);
+ DeleteWoRoute({ rotId: '', rotCode: node.code, wo: node.wo }).then((action) => {
+ if (action.IsSuccessed) {
+ emit('deletenode', node);
+ } else {
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: t(action.LocaleMsg),
+ });
+ }
+ });
+ },
+ icon: 'bx:bxs-folder-open',
+ },
+ ];
+ return node.type == 'Route' ? menu : [];
},
};
/* 浠ヤ笅鏄唴閮ㄦ柟娉曪紝涓峞xport锛屼緵涓婇潰鐨勬柟娉曡皟鐢� */
+ let columns: BasicColumn[] = [];
+ /**
+ * @description: 鑾峰彇琛ㄦ牸瀛楁Json
+ * @param {string} type
+ * @return {*}
+ */
+ function GetBaseColumns(type: string, emit, data: Ref<{}>) {
+ switch (type) {
+ case 'BAS_PKG_DTL':
+ 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: '鏍囩妯℃澘缂栫爜',
+ // edit: true,
+ // editRule: true,
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ // editComponent: 'Input',
+ // editComponentProps: (column) => {
+ // return {
+ // onClick: (event) => {
+ // console.log(column);
+ // },
+ // };
+ // },
+ // customCell: (record, rowIndex) => {
+ // return {
+ // onClick: (event) => {
+ // console.log(record);
+ // },
+ // };
+ // },
+ },
+ ] as BasicColumn[];
+ break;
+ case 'ItemCode':
+ /*
+ public string ITEM_CODE { get; set; }
+ public string RULE_CODE { get; set; }
+ /// <summary>
+ /// 鏄惁鎵规鐗╂枡
+ /// </summary>
+ public bool IsBatchItem { get; set; }
+ /// <summary>
+ /// 涓婃枡鏁伴噺
+ /// </summary>
+ public int QTY { get; set; }
+ */
+ columns = [
+ {
+ dataIndex: 'ITEM_CODE',
+ title: '鐗╂枡缂栫爜',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ },
+ {
+ dataIndex: 'RULE_CODE',
+ title: '瑙勫垯缂栫爜',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'IsBatchItem',
+ title: '鏄惁鎵规鐗╂枡',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'QTY',
+ title: '涓婃枡鏁伴噺',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ // {
+ // dataIndex: 'LABEL_CODE',
+ // title: '鏍囩妯℃澘缂栫爜',
+ // // edit: true,
+ // // editRule: true,
+ // ifShow: true,
+ // sorter: true,
+ // resizable: true,
+ // // editComponent: 'Input',
+ // // editComponentProps: (column) => {
+ // // return {
+ // // onClick: (event) => {
+ // // console.log(column);
+ // // },
+ // // };
+ // // },
+ // // customCell: (record, rowIndex) => {
+ // // return {
+ // // onClick: (event) => {
+ // // console.log(record);
+ // // },
+ // // };
+ // // },
+ // },
+ ] as BasicColumn[];
+ break;
+ }
+ return columns;
+ }
/**
* @description: 寮瑰嚭閫夋嫨妗�-鐗╂枡閫夋嫨妗嗛厤缃�
* @return {*}
@@ -649,13 +1083,19 @@
*/
const actionFormShema: FormSchema[] = [
{
- field: 'PROD_CODE',
- label: '浜у搧缂栫爜',
+ field: 'WORK_ORDER',
+ label: '宸ュ崟鍙�',
component: 'Input',
dynamicDisabled: ({ values }) => {
return true;
},
colProps: { span: 12 },
+ },
+ {
+ field: 'PROD_CODE',
+ label: 'PROD_CODE',
+ component: 'Input',
+ show: false,
},
{
field: 'ID',
@@ -704,7 +1144,7 @@
defaultValue: 0,
componentProps: {
api: GetEnum,
- params: { name: 'MES_PROD_ACTION+ACT_TYPEs' },
+ params: { name: 'MES_WO_ACTION+ACT_TYPEs' },
resultField: 'Data',
labelField: unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name',
valueField: 'Value',
@@ -739,7 +1179,7 @@
field: 'RULE_CODE',
label: '鎵爜楠岃瘉',
component: 'Input',
- colProps: { span: 10 },
+ colProps: { span: 11 },
ifShow: ({ values }) => isScan(values.ACT_TYPE),
},
{
@@ -747,14 +1187,14 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 2, pull: 1 },
+ colProps: { span: 1, pull: 1 },
ifShow: ({ values }) => isScan(values.ACT_TYPE),
colSlot: 'scanadd',
},
{
field: 'ITEM_CODE',
label: '缁勮涓婃枡',
- colProps: { span: 10 },
+ colProps: { span: 11 },
component: 'Input',
ifShow: ({ values }) => isAssy(values.ACT_TYPE),
},
@@ -763,14 +1203,14 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 2, pull: 1 },
+ colProps: { span: 1, pull: 1 },
ifShow: ({ values }) => isAssy(values.ACT_TYPE),
colSlot: 'assyadd',
},
{
field: 'TEST_CODE',
label: '浜у搧娴嬭瘯',
- colProps: { span: 10 },
+ colProps: { span: 11 },
component: 'Input',
ifShow: ({ values }) => isTest(values.ACT_TYPE),
},
@@ -779,14 +1219,14 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 2, pull: 1 },
+ colProps: { span: 1, pull: 1 },
ifShow: ({ values }) => isTest(values.ACT_TYPE),
colSlot: 'testadd',
},
{
field: 'SAPL_CODE',
label: '浜у搧鎶芥',
- colProps: { span: 10 },
+ colProps: { span: 11 },
component: 'Input',
ifShow: ({ values }) => isAudit(values.ACT_TYPE),
},
@@ -795,14 +1235,14 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 2, pull: 1 },
+ colProps: { span: 1, pull: 1 },
ifShow: ({ values }) => isAudit(values.ACT_TYPE),
colSlot: 'auditadd',
},
{
field: 'LABEL_CODE',
label: '鏍囩鎵撳嵃',
- colProps: { span: 10 },
+ colProps: { span: 11 },
component: 'Input',
ifShow: ({ values }) => isPrint(values.ACT_TYPE),
},
@@ -811,14 +1251,14 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 2, pull: 1 },
+ colProps: { span: 1, pull: 1 },
ifShow: ({ values }) => isPrint(values.ACT_TYPE),
colSlot: 'printadd',
},
{
- field: 'pkgRULE_CODE',
+ field: 'PKG_CODE',
label: '鍖呰瑙勫垯',
- colProps: { span: 10 },
+ colProps: { span: 11 },
component: 'Input',
ifShow: ({ values }) => isPackage(values.ACT_TYPE),
},
@@ -827,15 +1267,43 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 2, pull: 1 },
+ colProps: { span: 1, pull: 1 },
ifShow: ({ values }) => isPackage(values.ACT_TYPE),
colSlot: 'pkgadd',
+ },
+ {
+ field: 'OPTION_2',
+ label: '鏄惁绉伴噸',
+ required: true,
+ component: 'Select',
+ colProps: { span: 12 },
+ componentProps: {
+ options: [
+ {
+ label: '鏄�',
+ value: 'Y',
+ key: 'Y',
+ },
+ {
+ label: '鍚�',
+ value: 'N',
+ key: 'N',
+ },
+ ],
+ },
},
{
field: 'REMARK',
label: '澶囨敞',
component: 'Input',
colProps: { span: 12 },
+ },
+ {
+ field: 'OPTION_1',
+ label: '琛屼负閫夐」1',
+ component: 'Input',
+ colProps: { span: 12 },
+ show: false,
},
];
@@ -845,13 +1313,19 @@
*/
const nodeFormShema: FormSchema[] = [
{
- field: 'PROD_CODE',
- label: '浜у搧缂栫爜',
+ field: 'WORK_ORDER',
+ label: '宸ュ崟鍙�',
component: 'Input',
dynamicDisabled: ({ values }) => {
return true;
},
colProps: { span: 12 },
+ },
+ {
+ field: 'PROD_CODE',
+ label: 'PROD_CODE',
+ component: 'Input',
+ show: false,
},
{
field: 'ID',
@@ -1002,6 +1476,27 @@
},
},
{
+ field: 'ALLOW_DFT_IN',
+ label: '鏄惁鍏佽涓嶈壇鍝佽繘绔�',
+ required: true,
+ component: 'Select',
+ colProps: { span: 12 },
+ componentProps: {
+ options: [
+ {
+ label: '鏄�',
+ value: 'Y',
+ key: 'Y',
+ },
+ {
+ label: '鍚�',
+ value: 'N',
+ key: 'N',
+ },
+ ],
+ },
+ },
+ {
field: 'REMARK',
label: '澶囨敞',
component: 'Input',
@@ -1009,6 +1504,167 @@
},
];
+ 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[],
+ ItemCode: [
+ {
+ label: '鐗╂枡缂栫爜',
+ field: 'ITEM_CODE',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return false;
+ },
+ },
+ {
+ field: 'RULE_CODE',
+ label: '瑙勫垯缂栫爜',
+ component: 'Input',
+ colProps: {
+ span: 22,
+ },
+ dynamicDisabled: ({ values }) => {
+ return false;
+ },
+ },
+ {
+ field: 'BAS_CODE_RULE1PSelect_0', //鎸変綆浠ｇ爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+PSelect_0锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝PSelect_0杩欐槸涓浐瀹氬悗缂�
+ label: '1',
+ defaultValue: 'BAS_CODE_RULE',
+ component: 'Input',
+ colProps: { span: 2 },
+ colSlot: 'BAS_CODE_RULE1add', //鎸変綆浠ｇ爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+add锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝add杩欐槸涓浐瀹氬悗缂�
+ },
+ {
+ label: '鏄惁鎵规鐗╂枡',
+ field: 'IsBatchItem',
+ colProps: {
+ span: 24,
+ },
+ component: 'Select',
+ componentProps: {
+ options: [
+ {
+ label: '鏄�',
+ value: 'Y',
+ key: 'Y',
+ },
+ {
+ label: '鍚�',
+ value: 'N',
+ key: 'N',
+ },
+ ],
+ },
+ },
+ {
+ label: '涓婃枡鏁伴噺',
+ field: 'QTY',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return false;
+ },
+ },
+ ] as FormSchema[],
+ };
+
return [methods];
}
--
Gitblit v1.9.3