From 226ad601bb8326814c3e94efd6f476014f6a9e66 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 27 六月 2024 23:06:47 +0800
Subject: [PATCH] 产品工艺路线工序配置更新

---
 src/api/tigerapi/system.ts |   79 ++++++++++++++++++++++-----------------
 1 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index f7d1d9d..775bfba 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -31,8 +31,7 @@
   iSYS_ROLE_PROD,
 } from './model/systemModel';
 import { defHttp } from '/@/utils/http/axios';
-import { isDate, isNullOrEmpty, isTimeType } from '/@/utils/is';
-import { MES_ROUTE_EDGE, MES_ROUTE_NODE } from './model/router';
+import { isArray, isDate, isNullOrEmpty, isTimeType, isTimeViaRegExp8601, isTimeViaRegExpSimple } from '/@/utils/is';
 
 export enum Api {
   QueryUrl = '/Base/Query',
@@ -281,15 +280,23 @@
   return result;
 }
 
-export function convertToTree(data: [], parentId: string, id: string, pid?: string) {
-  const result: any[] = [];
-  let temp: any[] = [];
+/**
+ * @description: 鏍戝舰琛ㄧ粨鏋勮浆鏍戝舰Json
+ * @param {T} data
+ * @param {string} parentField 鐖跺瓧娈靛悕
+ * @param {string} idField 鍞竴key瀛楁鍚�
+ * @param {string} pid_val 鐖秈d鍊�
+ * @return {*}
+ */
+export function convertToTree<T>(data: T[], parentField: string, idField: string, pid?: string) {
+  const result: T[] = [];
+  let temp: T[] = [];
   const _pid = isNullOrEmpty(pid) ? '' : pid;
   for (let i = 0; i < data.length; i++) {
-    const currPid = data[i][parentId] == null ? '' : data[i][parentId];
+    const currPid = data[i][parentField] == null ? '' : data[i][parentField];
     if (currPid === _pid) {
-      const obj = data[i] as {};
-      temp = convertToTree(data, parentId, id, data[i][id]);
+      const obj = data[i] as T;
+      temp = convertToTree(data, parentField, idField, data[i][idField]);
       if (temp.length > 0) {
         obj['children'] = temp;
       }
@@ -712,7 +719,7 @@
       Keys[k] != '0' &&
       !Keys[k].toString().endsWith('PSelect_0')
     ) {
-      if (!isNullOrEmpty(params[Keys[k]].length) && isDate(params[Keys[k]][0])) {
+      if (!isNullOrEmpty(params[Keys[k]].length) && isTimeViaRegExp8601(params[Keys[k]][0])) {
         sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
         sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
       } else {
@@ -738,7 +745,7 @@
 }
 async function getListByPageAsync(params: any) {
   const data = await defHttp.post(
-    { url: Api.QueryUrl, params },
+    { url: Api.QueryUrl, params,timeout:50000 },
     {
       isTransformResponse: false,
     },
@@ -750,7 +757,7 @@
   return model;
 }
 
-export async function SaveEntity<T>(params: T, isUpdate: boolean, entityName: string) {
+export async function SaveEntity<T>(params: T, isUpdate: boolean, entityName: string, ...args) {
   let data;
   if (isUpdate) {
     data = await defHttp.post(
@@ -761,6 +768,12 @@
       },
     );
   } else {
+    var check = await isExist(genAction(entityName, args[0]));
+    if(check.Data){
+      check.IsSuccessed = false;
+      check.Message = '璁板綍宸茬粡瀛樺湪锛屼笉鑳芥柊澧烇紒';
+      return check;
+    }
     params.ID = buildUUID(); //鐢熸垚GUID
     data = await defHttp.post(
       { url: Api.AddEntity, params: genAction(entityName, params) },
@@ -770,6 +783,17 @@
       },
     );
   }
+  return data;
+}
+
+export async function AddListEntity<T>(params: T, entityName: string) {
+  let data = await defHttp.post(
+    { url: Api.AddListEntity, params: genAction(entityName, params) },
+    {
+      errorMessageMode: 'none',
+      isTransformResponse: false,
+    },
+  );
   return data;
 }
 
@@ -875,30 +899,17 @@
   );
 };
 
-/*
- * 杞崲宸ヨ壓璺嚎涓烘爲褰son
+/**
+ * @description: 鍒ゆ柇淇濆瓨鐨勫�煎鏋滄槸[]鏁扮粍鐨勶紝灏辩洿鎺ュ彇[0]绗竴涓�硷紝涓�鑸拡瀵逛笂浼犳ā鏉跨殑鍦板潃
+ * @param {any} values
+ * @return {*}
  */
-function convertRouteToTreeData(
-  nodes: MES_ROUTE_NODE[],
-  edges: MES_ROUTE_EDGE[],
-  parentId: string,
-  id: string,
-  pid?: string,
-) {
-  const result: treeParamsListItem[] = [];
-  let temp: treeParamsListItem[] = [];
-  const _pid = pid == undefined ? '' : pid;
-  for (let i = 0; i < nodes.length; i++) {
-    const currPid = data[i][parentId] == null ? '' : data[i][parentId];
-    if (currPid === _pid) {
-      const obj: treeParamsListItem = data[i];
-      obj.PARAM_TYPE = _pid == '' ? '0' : '1'; //澧炲姞绫诲瀷
-      temp = convertToTreeData(data, parentId, id, data[i][id]);
-      if (temp.length > 0) {
-        obj.children = temp;
-      }
-      result.push(obj);
+export function formatValues(values: any) {
+  const Keys = Object.getOwnPropertyNames(values);
+  for (const k in Keys) {
+    if (isArray(values[Keys[k]])) {
+      values[Keys[k]] = values[Keys[k]][0];
     }
   }
-  return result;
+  return values;
 }

--
Gitblit v1.9.3