From 25f128f26f0330b5431e5513c16ea035ce46099a Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 21 七月 2024 21:00:41 +0800
Subject: [PATCH] 工单更新
---
src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts | 50 ++++++++++++++++++++++++++++++++------------------
src/views/tigerprojects/system/lowcode/normal/mainTable.vue | 2 +-
src/views/components/CustModal.vue | 2 +-
3 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/src/views/components/CustModal.vue b/src/views/components/CustModal.vue
index 8d62e27..5fd3061 100644
--- a/src/views/components/CustModal.vue
+++ b/src/views/components/CustModal.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-05 15:46:07
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-20 06:31:16
+ * @LastEditTime: 2024-07-21 20:29:30
-->
<template>
<BasicModal
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
index 1f43d2f..96365ce 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-21 18:40:06
+ * @LastEditTime: 2024-07-21 20:55:33
*/
import { Ref, h, ref, render, unref } from 'vue';
@@ -25,6 +25,7 @@
import { uploadApi } from '/@/api/sys/upload';
import { initRoute } from '../data';
import { SP_MES_PROD2WO } from '/@/api/tigerapi/mes/router';
+import { cloneDeep } from 'lodash-es';
const { t } = useI18n();
const { createErrorModal } = useMessage();
@@ -280,12 +281,17 @@
try {
const form = param.values['prodinfo'];
const wo = param.values['mValues'];
- wo.ROUTE_STATUS = 1;
- wo.ROUTE_CODE = form.ROUTE_CODE;
- SaveEntity(wo, true, 'BIZ_MES_WO').then((action) => {
+ const _wo = cloneDeep(wo);
+ _wo.ROUTE_STATUS = 1;
+ _wo.ROUTE_CODE = form.ROUTE_CODE;
+ SaveEntity(_wo, true, 'BIZ_MES_WO').then((action) => {
if (action.IsSuccessed) {
- SP_MES_PROD2WO({ rotId: form.ROT_ID, wo: wo.ORDER_NO });
- resolve(action);
+ SP_MES_PROD2WO({ rotId: form.ROT_ID, wo: wo.ORDER_NO }).then((res) => {
+ if (!res.IsSuccessed) {
+ SaveEntity(wo, true, 'BIZ_MES_WO');
+ }
+ resolve(res);
+ });
} else {
reject(action);
}
@@ -395,18 +401,26 @@
edges: [],
};
initRoute(params['currlf'], params['record'].ROUTE_CODE, params['routeData'], params['currlf']);
- params['selectVals'].value['ROUTE_CODE'] = params['record'].ROUTE_CODE;
- openCustModal(true, {
- isUpdate: true,
- ctype: 'BIZ_MES_WO_Config',
- title: '宸ヨ壓閰嶇疆',
- width: '1200px',
- formEl: params['useFormData'].value, //濡傛灉鏄涓〃鍗曪紝澧炲姞澶氫釜鎻掓Ы
- formElName: ['woinfo', 'prodinfo', 'rotinfo'], //琛ㄥ崟鎻掓Ы鍚嶇О锛屾敮鎸佸涓〃鍗�
- RowKey: '',
- fnName: 'SaveCofig', //淇濆瓨鏂规硶鍚�
- others: params['routeData'].value,
- values: params['record'], //琛ㄥ崟璁板綍
+ getEntity({
+ sqlcmd: `ROT_CODE = '${params['record'].ROUTE_CODE}'`,
+ entityName: 'MES_ROUTE',
+ order: '',
+ }).then((rot) => {
+ params['selectVals'].value['ROUTE_CODE'] = params['record'].ROUTE_CODE;
+ params['selectVals'].value['ROT_ID'] =
+ !isNullOrEmpty(rot.Data) && !isNullOrEmpty(rot.Data.Items) ? rot.Data.Items[0].ID : '';
+ openCustModal(true, {
+ isUpdate: true,
+ ctype: 'BIZ_MES_WO_Config',
+ title: '宸ヨ壓閰嶇疆',
+ width: '1200px',
+ formEl: params['useFormData'].value, //濡傛灉鏄涓〃鍗曪紝澧炲姞澶氫釜鎻掓Ы
+ formElName: ['woinfo', 'prodinfo', 'rotinfo'], //琛ㄥ崟鎻掓Ы鍚嶇О锛屾敮鎸佸涓〃鍗�
+ RowKey: '',
+ fnName: 'SaveCofig', //淇濆瓨鏂规硶鍚�
+ others: params['routeData'].value,
+ values: { ...params['record'], ...params['selectVals'].value }, //琛ㄥ崟璁板綍
+ });
});
}
diff --git a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
index f076804..3df755c 100644
--- a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
@@ -406,7 +406,7 @@
}
//寮瑰嚭妗嗙‘瀹氳繑鍥�
function custSuccess(d) {
- // reload();
+ reload();
}
/**
--
Gitblit v1.9.3