@kmkf-fe-packages/kmkf-work-order-service-component 1.23.2 → 1.24.1

package/dist/esm/common/utils/tools.js

@@ -19,13 +19,14 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { message } from 'antd';
 import { get, last, cloneDeep, isEqual, set } from 'lodash';
-import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail } from "../../model/servers/api";
+import { orderDetail } from "../../model/servers/api";
 import moment from 'moment';
 import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import transformWorkOrderData from "./transformWorkOrderData";
 import submitDataTransOldFormat from "./submitDataTransOldFormat";
+import { orderBackMap } from "./tools_constants";
 
 // 淘宝商品组件信息处理
 
@@ -153,7 +154,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasKm, hasWdt, hasBsE3, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _data$value3, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _kmOrders$orderDetail, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, _data$value2, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey, cacheOrderInfo, _objectSpread3, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _data$value3, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _kmOrders$orderDetail, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, _data$value2, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey, cacheOrderInfo, _objectSpread3, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -161,40 +162,30 @@ export var orderBack = /*#__PURE__*/function () {
           //是否是对接平台，只有对接平台才能返填订单号
           JOIN_SHOP = shopList.find(function (item) {
             return !item.notJoin && item.shopId == shopId;
-          }); //判断是否有百胜组件 有就请求bs订单接口
-          hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); // 判断是否有快麦组件, 有就请求wdt订单接口
-          // 根据系统订单号反填，所以只要判断是否有系统订单号就行
-          hasKm = HasFilterHandle(templateDetail, ['KM_SYSTEM_ORDER'
-          // 'KM_SEND_GOOD',
-          // 'ITEM_SELECT_THIRD',
-          ]); //判断是否有旺店通组件 有就请求wdt订单接口
-          hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS'
-          // 'WDT_SIGNING_TIME',
-          // 'WDT_SEND_TIME',
-          // 'WDT_TRADE_PAYMENT_TIME',
-          // 'WDT_NET_RECEIPTS',
-          // 'WDT_PACKAGE_WEIGHT',
-          // 'WDT_DEPOSIT',
-          // 'WDT_POSTING',
-          // 'WDT_DELIVERY_NO',
-          ]); // 判断是否有旺店通组件 有就请求bsE3订单接口
-          hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD']); //判断是否有万里牛组件 有就请求wln订单接口
-          hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且三方erp组件也没有
-          if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt && !hasBsE3 && !hasKm)) {
-            _context.next = 9;
+          });
+          hasFlagMap = orderBackMap({
+            templateDetail: templateDetail,
+            order_no: order_no
+          }); //如果不是对接店铺且三方erp组件也没
+          if (!(!JOIN_SHOP && Object.values(hasFlagMap).filter(function (item) {
+            return !item.andJsonShop;
+          }).map(function (item) {
+            return item.flag;
+          }).every(function (item) {
+            return item === false;
+          }))) {
+            _context.next = 5;
             break;
           }
           return _context.abrupt("return");
-        case 9:
+        case 5:
           _ref3 = shopList.find(function (item) {
             return item.shopId == shopId;
           }) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick;
-          _context.prev = 10;
+          _context.prev = 6;
           promise = [];
           if (!JOIN_SHOP) {
-            promise.push(new Promise(function (resolve) {
-              resolve([]);
-            }));
+            promise.push(Promise.resolve([]));
           } else {
             promise.push(orderDetail({
               shopId: shopId,
@@ -204,66 +195,26 @@ export var orderBack = /*#__PURE__*/function () {
               templateId: templateDetail.uniqueKey
             }));
           }
-
-          //判断是否有聚水潭组件 有就请求jst订单接口
-          hasJst = HasFilterHandle(templateDetail, ['JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD']);
-          if (hasJst) {
-            if (!JOIN_SHOP) {
-              promise.push(new Promise(function (resolve) {
-                resolve([]);
-              }));
+          Object.keys(hasFlagMap).forEach(function (key) {
+            var _hasFlagMap$key = hasFlagMap[key],
+              flag = _hasFlagMap$key.flag,
+              andJsonShop = _hasFlagMap$key.andJsonShop,
+              promiseRequest = _hasFlagMap$key.promiseRequest;
+            if (flag) {
+              if (andJsonShop && !JOIN_SHOP) {
+                promise.push(Promise.resolve([]));
+              } else {
+                promise.push(promiseRequest());
+              }
             } else {
-              promise.push(jstOrderDetail({
-                soId: order_no
-              }));
+              promise.push(Promise.resolve([]));
             }
-          } else {
-            promise.push(new Promise(function (resolve) {
-              resolve([]);
-            }));
-          }
-          if (hasBs) {
-            promise.push(bsOrderDetail({
-              billNo: order_no
-            }));
-          } else {
-            promise.push(new Promise(function (resolve) {
-              resolve({});
-            }));
-          }
-          if (hasWln) {
-            promise.push(wlnOrderDetail({
-              billCode: order_no
-            }));
-          } else {
-            promise.push(new Promise(function (resolve) {
-              resolve({});
-            }));
-          }
-          if (hasWdt) {
-            promise.push(wdtOrderDetail({
-              billNo: order_no
-            }));
-          } else {
-            promise.push(new Promise(function (resolve) {
-              resolve([]);
-            }));
-          }
-          if (hasBsE3) {
-            promise.push(bsE3OrderDetail({
-              billNo: order_no
-            }));
-          } else {
-            promise.push(new Promise(function (resolve) {
-              resolve([]);
-            }));
-          }
-          promise.push(hasKm ? kmOrderDetail({
-            tid: order_no
-          }) : Promise.resolve([]));
-          _context.next = 22;
+          });
+
+          //需按照orderBackMap中的顺序结构
+          _context.next = 12;
           return Promise.allSettled(promise);
-        case 22:
+        case 12:
           _yield$Promise$allSet = _context.sent;
           _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 7);
           data = _yield$Promise$allSet2[0];
@@ -389,7 +340,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 72;
+            _context.next = 62;
             break;
           }
           list = detail['itemList'];
@@ -407,10 +358,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 62;
-          _context.next = 65;
+          _context.prev = 52;
+          _context.next = 55;
           return Promise.all(promises);
-        case 65:
+        case 55:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -420,13 +371,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 72;
+          _context.next = 62;
           break;
-        case 69:
-          _context.prev = 69;
-          _context.t0 = _context["catch"](62);
+        case 59:
+          _context.prev = 59;
+          _context.t0 = _context["catch"](52);
           console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 72:
+        case 62:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -458,17 +409,17 @@ export var orderBack = /*#__PURE__*/function () {
           // console.log('orderback', values);
           form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 83;
+          _context.next = 73;
           break;
-        case 80:
-          _context.prev = 80;
-          _context.t1 = _context["catch"](10);
+        case 70:
+          _context.prev = 70;
+          _context.t1 = _context["catch"](6);
           console.error(_context.t1);
-        case 83:
+        case 73:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[10, 80], [62, 69]]);
+    }, _callee, null, [[6, 70], [52, 59]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);

package/dist/esm/common/utils/tools_constants.d.ts

@@ -0,0 +1,9 @@
+export declare const orderBackMap: (params: {
+    [key: string]: any;
+}) => {
+    [key: string]: {
+        flag: boolean;
+        andJsonShop?: boolean | undefined;
+        promiseRequest: () => Promise<any>;
+    };
+};

package/dist/esm/common/utils/tools_constants.js

@@ -0,0 +1,71 @@
+import { HasFilterHandle } from "./tools";
+import { jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail } from "../../model/servers/api";
+var orderBackKeyListMap = {
+  hasJst: ['JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
+  hasBs: ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO'],
+  hasKm: ['KM_SYSTEM_ORDER'],
+  hasWdt: ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS'],
+  hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
+  hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']
+};
+export var orderBackMap = function orderBackMap(_ref) {
+  var templateDetail = _ref.templateDetail,
+    order_no = _ref.order_no;
+  return {
+    //判断是否有聚水潭组件 有就请求jst订单接口
+    hasJst: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJst),
+      andJsonShop: true,
+      promiseRequest: function promiseRequest() {
+        return jstOrderDetail({
+          soId: order_no
+        });
+      }
+    },
+    //判断是否有百胜组件 有就请求bs订单接口
+    hasBs: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasBs),
+      promiseRequest: function promiseRequest() {
+        return bsOrderDetail({
+          billNo: order_no
+        });
+      }
+    },
+    //判断是否有万里牛组件 有就请求wln订单接口
+    hasWln: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasWln),
+      promiseRequest: function promiseRequest() {
+        return wlnOrderDetail({
+          billCode: order_no
+        });
+      }
+    },
+    //判断是否有旺店通组件 有就请求wdt订单接口
+    hasWdt: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasWdt),
+      promiseRequest: function promiseRequest() {
+        return wdtOrderDetail({
+          billNo: order_no
+        });
+      }
+    },
+    // 判断是否有旺店通组件 有就请求bsE3订单接口
+    hasBsE3: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasBsE3),
+      promiseRequest: function promiseRequest() {
+        return bsE3OrderDetail({
+          billNo: order_no
+        });
+      }
+    },
+    // 根据系统订单号反填，所以只要判断是否有系统订单号就行
+    hasKm: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasKm),
+      promiseRequest: function promiseRequest() {
+        return kmOrderDetail({
+          tid: order_no
+        });
+      }
+    }
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.23.2",
+  "version": "1.24.1",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "1.23.2",
-    "@kmkf-fe-packages/kmkf-utils": "1.23.2",
-    "@kmkf-fe-packages/services-components": "1.23.2",
+    "@kmkf-fe-packages/basic-components": "1.24.1",
+    "@kmkf-fe-packages/kmkf-utils": "1.24.1",
+    "@kmkf-fe-packages/services-components": "1.24.1",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fb0d17c3136b7c2354ba16bc9855b5b0b0feecf1",
+  "gitHead": "45f0772326420f1924a97e96ab4599e947cacf28",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }