@kmkf-fe-packages/kmkf-work-order-service-component 2.2.44-beta.28 → 2.2.44-beta.29

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

@@ -21,7 +21,7 @@ import { message } from 'antd';
 import { get, last, cloneDeep, isEqual, set } from 'lodash';
 import { orderDetail, queryShopByTid } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, jkyOrderTransform, filterJkyOrders, jkyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, jkyOrderTransform, jkyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import transformWorkOrderData from "./transformWorkOrderData";
@@ -369,7 +369,9 @@ export var orderBack = /*#__PURE__*/function () {
           jyOrders = jyOrder === null || jyOrder === void 0 ? void 0 : (_jyOrder$value = jyOrder.value) === null || _jyOrder$value === void 0 ? void 0 : _jyOrder$value.data;
           skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
           skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
-          jkyOrders = jkyOrder === null || jkyOrder === void 0 ? void 0 : (_jkyOrder$value = jkyOrder.value) === null || _jkyOrder$value === void 0 ? void 0 : _jkyOrder$value.data;
+          jkyOrders = {
+            trades: (jkyOrder === null || jkyOrder === void 0 ? void 0 : (_jkyOrder$value = jkyOrder.value) === null || _jkyOrder$value === void 0 ? void 0 : _jkyOrder$value.data) || []
+          };
           wdtReturnOrders = wdtReturnOrder === null || wdtReturnOrder === void 0 ? void 0 : (_wdtReturnOrder$value = wdtReturnOrder.value) === null || _wdtReturnOrder$value === void 0 ? void 0 : _wdtReturnOrder$value.data;
           console.log('skxOrders', {
             skxOrders: skxOrders,
@@ -381,7 +383,6 @@ export var orderBack = /*#__PURE__*/function () {
           if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
           if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
           if (jyOrders) jyOrders.trades = filterJyOrders(jyOrders, order_no);
-          if (jkyOrders) jkyOrders.trades = filterJkyOrders(jkyOrders, order_no);
           if (skxOrders) skxOrders.trades = (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.orderDetailInfoList) || []; //需要看实际接口返回字段
           if (skxReturnOrders) skxReturnOrders.trades = (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.skqReturnOrderDetailInfoDtos) || [];
           pushGyLog('gyOrders', gyOrders);
@@ -435,11 +436,13 @@ export var orderBack = /*#__PURE__*/function () {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
+          console.log('jkyOrders', jkyOrders);
           jkyInfo = jkyOrders && jkyOrderTransform(_objectSpread(_objectSpread({}, jkyOrders), {}, {
             allOrders: jkyOrders === null || jkyOrders === void 0 ? void 0 : jkyOrders.trades,
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
+          console.log('jkyInfo', jkyInfo);
           jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no,
@@ -611,12 +614,13 @@ export var orderBack = /*#__PURE__*/function () {
             jyOrder: jyInfo,
             skxOrder: skxInfo,
             orderSubFormOrder: orderSubFormInfo,
-            skxReturnOrder: skxReturnInfo
+            skxReturnOrder: skxReturnInfo,
+            jkyOrder: jkyInfo
           });
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 149;
+            _context.next = 150;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -628,7 +632,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 133;
+            _context.next = 134;
             break;
           }
           list = detail['itemList'];
@@ -646,10 +650,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 123;
-          _context.next = 126;
+          _context.prev = 124;
+          _context.next = 127;
           return Promise.all(promises);
-        case 126:
+        case 127:
           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), {}, {
@@ -659,25 +663,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 133;
+          _context.next = 134;
           break;
-        case 130:
-          _context.prev = 130;
-          _context.t1 = _context["catch"](123);
+        case 131:
+          _context.prev = 131;
+          _context.t1 = _context["catch"](124);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 133:
+        case 134:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 149;
+            _context.next = 150;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 148;
+            _context.next = 149;
             break;
           }
-          _context.prev = 136;
-          _context.next = 139;
+          _context.prev = 137;
+          _context.next = 140;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -687,21 +691,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 139:
+        case 140:
           signDatetime = _context.sent;
           detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
-          _context.next = 146;
+          _context.next = 147;
           break;
-        case 143:
-          _context.prev = 143;
-          _context.t2 = _context["catch"](136);
+        case 144:
+          _context.prev = 144;
+          _context.t2 = _context["catch"](137);
           console.error('调用签收时间错误', _context.t2);
-        case 146:
-          _context.next = 149;
+        case 147:
+          _context.next = 150;
           break;
-        case 148:
-          detail['tradeSigningDateTime'] = '';
         case 149:
+          detail['tradeSigningDateTime'] = '';
+        case 150:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -754,21 +758,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 161;
+          _context.next = 162;
           break;
-        case 158:
-          _context.prev = 158;
+        case 159:
+          _context.prev = 159;
           _context.t3 = _context["catch"](27);
           console.error(_context.t3);
-        case 161:
-          _context.prev = 161;
+        case 162:
+          _context.prev = 162;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(161);
-        case 164:
+          return _context.finish(162);
+        case 165:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[7, 14, 17, 20], [27, 158, 161, 164], [123, 130], [136, 143]]);
+    }, _callee, null, [[7, 14, 17, 20], [27, 159, 162, 165], [124, 131], [137, 144]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.44-beta.28",
+  "version": "2.2.44-beta.29",
   "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": "2.2.44-beta.26",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.26",
-    "@kmkf-fe-packages/services-components": "2.2.44-beta.28",
+    "@kmkf-fe-packages/basic-components": "2.2.44-beta.29",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.29",
+    "@kmkf-fe-packages/services-components": "2.2.44-beta.29",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "69aafb8def27f6cca3ea2e9e5db02384e8bd5de7",
+  "gitHead": "0b8d55a96caae2226e4251995d6c6ab430400d81",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }