shawenguan преди 2 години
родител
ревизия
ccd8e8c91a
променени са 3 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 4 4
      Scripts/gandart/gandartComposite.js
  2. 4 4
      Scripts/gandart/gandartExchange.js
  3. 0 0
      Scripts/gandart/gandartHelper.js

+ 4 - 4
Scripts/gandart/gandartComposite.js

@@ -481,7 +481,7 @@ async function doExecFinalComposite(taskId, taskInfo, finalGroups) {
                 });
                 startIdx += 1;
             }
-            let ret = await confirmCompositeV2(taskId, taskInfo, compositeList);
+            let ret = await confirmCompositeV3(taskId, taskInfo, compositeList);
             if (ret) {
                 for (let idx = startIdx - batchMaxNum; idx < startIdx; idx++) {
                     retWillDelLst.push(idx);
@@ -498,7 +498,7 @@ async function doExecFinalComposite(taskId, taskInfo, finalGroups) {
                 materialDetailList: finalGroups[i]
             }
         ];
-        let ret = await confirmCompositeV2(taskId, taskInfo, compositeList);
+        let ret = await confirmCompositeV3(taskId, taskInfo, compositeList);
         if (ret) {
             retWillDelLst.push(idx);
             retOrderLst.push(ret);
@@ -961,7 +961,7 @@ async function getDetailByCasting(castingId, collectionName, pageSize = 50, page
     });
 }
 
-async function confirmCompositeV2(taskId, taskInfo, compositeList) {
+async function confirmCompositeV3(taskId, taskInfo, compositeList) {
     return new Promise((resolve, _reject) => {
         try {
             const headers = GCommonGandartHeads;
@@ -973,7 +973,7 @@ async function confirmCompositeV2(taskId, taskInfo, compositeList) {
             };
             let body = JSON.stringify(data);
             let url = {
-                url: `${config.BASE_API}/v2/composite/v3/confirmCompositeV2`,
+                url: `${config.BASE_API}/v2/composite/v3/confirmCompositeV3`,
                 headers: headers,
                 body: body
             };

+ 4 - 4
Scripts/gandart/gandartExchange.js

@@ -484,7 +484,7 @@ async function doExecFinalExchange(taskId, taskInfo, finalGroups) {
                 });
                 startIdx += 1;
             }
-            let ret = await confirmCompositeV2(taskId, taskInfo, compositeList);
+            let ret = await confirmCompositeV3(taskId, taskInfo, compositeList);
             if (ret) {
                 for (let idx = startIdx - batchMaxNum; idx < startIdx; idx++) {
                     retWillDelLst.push(idx);
@@ -501,7 +501,7 @@ async function doExecFinalExchange(taskId, taskInfo, finalGroups) {
                 materialDetailList: finalGroups[i]
             }
         ];
-        let ret = await confirmCompositeV2(taskId, taskInfo, compositeList);
+        let ret = await confirmCompositeV3(taskId, taskInfo, compositeList);
         if (ret) {
             retWillDelLst.push(idx);
             retOrderLst.push(ret);
@@ -963,7 +963,7 @@ async function getDetailByCasting(castingId, collectionName, pageSize = 50, page
     });
 }
 
-async function confirmCompositeV2(taskId, taskInfo, compositeList) {
+async function confirmCompositeV3(taskId, taskInfo, compositeList) {
     return new Promise((resolve, _reject) => {
         try {
             const headers = GCommonGandartHeads;
@@ -975,7 +975,7 @@ async function confirmCompositeV2(taskId, taskInfo, compositeList) {
             };
             let body = JSON.stringify(data);
             let url = {
-                url: `${config.BASE_API}/v2/composite/v3/confirmCompositeV2`,
+                url: `${config.BASE_API}/v2/composite/v3/confirmCompositeV3`,
                 headers: headers,
                 body: body
             };

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
Scripts/gandart/gandartHelper.js


Някои файлове не бяха показани, защото твърде много файлове са промени