@kmkf-fe-packages/kmkf-utils 2.2.44-beta.30 → 2.2.44-beta.32

package/dist/esm/servers/JKY/warehouseData.d.ts

@@ -1,6 +1,7 @@
 declare type WarehouseType = {
     label: string;
     value: string;
+    id: string;
 };
 export declare const getWarehouseDataAsync: () => Promise<WarehouseType[]>;
 export default getWarehouseDataAsync;

package/dist/esm/servers/JKY/warehouseData.js

@@ -19,10 +19,12 @@ export var getWarehouseDataAsync = function getWarehouseDataAsync() {
     var warehouses = data || [];
     warehouses.map(function (_ref2) {
       var warehouseCode = _ref2.warehouseCode,
-        warehouseName = _ref2.warehouseName;
+        warehouseName = _ref2.warehouseName,
+        warehouseId = _ref2.warehouseId;
       list.push({
         label: warehouseName,
-        value: warehouseCode
+        value: warehouseCode,
+        id: warehouseId
       });
     });
     var valueMap = {};

package/dist/esm/utils/SendData.d.ts

@@ -3,6 +3,7 @@ interface OptionsItem {
     value: string | number;
     disabled: boolean;
     isMain?: boolean;
+    id?: string;
 }
 declare type SendGoodPlatform = string;
 declare class SendData {
@@ -16,6 +17,7 @@ declare class SendData {
     getSendNameByCode: (code: string | number, returnCurrentValue?: boolean) => string | number;
     getSendCodeByName: (name: string | number, returnCurrentValue?: boolean) => string | number;
     getMainWmsCoId: () => string | number;
+    getSendCodeById: (id: string) => string | number;
 }
 export declare class SendDataCenter {
     static instanceMap: Map<SendGoodPlatform, SendData>;

package/dist/esm/utils/SendData.js

@@ -58,6 +58,12 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
       return item === null || item === void 0 ? void 0 : item.isMain;
     })) === null || _this$sendData$find === void 0 ? void 0 : _this$sendData$find.value) || "";
   });
+  _defineProperty(this, "getSendCodeById", function (id) {
+    var _this$sendData$find2;
+    return ((_this$sendData$find2 = _this.sendData.find(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.id) === id;
+    })) === null || _this$sendData$find2 === void 0 ? void 0 : _this$sendData$find2.value) || "";
+  });
   this.platform = platform;
   this.service = {
     bsE3: BSE3,

package/dist/esm/utils/index.d.ts

@@ -17,7 +17,7 @@ export * from "./jstOrderBackFormValues";
 export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify, kmSkuTypeMap, } from "./kmOrderBackFormValues";
 export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders, } from "./gyOrderBackFormValues";
 export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, } from "./jyOrderBackFormValues";
-export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SYSTEM_ORDER_CONFIG, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, JKY_ORDER_FROM_MAP, filterJkyOrders, } from "./jkyOrderBackFormValues";
+export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SYSTEM_ORDER_CONFIG, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, JKY_ORDER_FROM_MAP, filterJkyOrders, getJkyLogisticInfo, } from "./jkyOrderBackFormValues";
 export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues, } from "./skxOrderBackFormValues";
 export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform, } from "./orderSubFormOrderBackFormValues";
 export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues, } from "./skxReturnOrderBackFormValues";

package/dist/esm/utils/index.js

@@ -18,7 +18,7 @@ export * from "./jstOrderBackFormValues";
 export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify, kmSkuTypeMap } from "./kmOrderBackFormValues";
 export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders } from "./gyOrderBackFormValues";
 export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP } from "./jyOrderBackFormValues";
-export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SYSTEM_ORDER_CONFIG, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, JKY_ORDER_FROM_MAP, filterJkyOrders } from "./jkyOrderBackFormValues";
+export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SYSTEM_ORDER_CONFIG, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, JKY_ORDER_FROM_MAP, filterJkyOrders, getJkyLogisticInfo } from "./jkyOrderBackFormValues";
 export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues } from "./skxOrderBackFormValues";
 export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform } from "./orderSubFormOrderBackFormValues";
 export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues } from "./skxReturnOrderBackFormValues";

package/dist/esm/utils/jkyOrderBackFormValues.d.ts

@@ -109,6 +109,7 @@ export declare const updateJkyGoodsHandle: (orders?: any[], config?: {
     orderBackGoodsLevel?: string;
     canEdit?: boolean;
 }) => any[];
+export declare const getJkyLogisticInfo: (packageDetail: any[], typeKey: string) => any;
 export declare const jkyOrderTransform: (detail: any, form: any) => {
     jkySystemOrder: {
         orderNo: any;

package/dist/esm/utils/jkyOrderBackFormValues.js

@@ -1,4 +1,10 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -6,6 +12,7 @@ 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 uuid from "./getUUid";
 import isNull from "./isNull";
+import { SendDataCenter } from "./SendData";
 export var JKY_SYSTEM_ORDER_CONFIG = {
   key: "jkySystemShowOrder",
   name: "吉客云",
@@ -271,18 +278,25 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
         skuId: (t === null || t === void 0 ? void 0 : t.goodsNo) || ""
       };
     });
-    var params = {
-      items: items
-    };
     if (type === "logistics") {
-      params.logisticsCompanyName = next === null || next === void 0 ? void 0 : next.logistName;
-      params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticId;
-      params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticNo;
-      prv.push(params);
+      // 吉客云单个系统子订单存在拆单，会包含多个物流信息
+      var packageDetails = ((next === null || next === void 0 ? void 0 : next.packageDetail) || []).map(function (t) {
+        return {
+          items: items,
+          logisticsCompanyName: t === null || t === void 0 ? void 0 : t.logisticName,
+          logisticsCompany: t === null || t === void 0 ? void 0 : t.logisticCode,
+          logisticsCode: t === null || t === void 0 ? void 0 : t.logisticNo
+        };
+      });
+      prv.push.apply(prv, _toConsumableArray(packageDetails));
     } else if (type === "send") {
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      var params = {
+        items: items
+      };
+      var warehouseCode = !(next !== null && next !== void 0 && next.warehouseCode) ? SendDataCenter.getInstance("jky").getSendCodeById(next === null || next === void 0 ? void 0 : next.warehouseId) : next === null || next === void 0 ? void 0 : next.warehouseCode;
+      params.sendId = warehouseCode;
       //下拉框，取id
-      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      params.sendName = warehouseCode;
       params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
       prv.push(params);
     }
@@ -310,7 +324,12 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
   }
   return newList;
 };
-
+export var getJkyLogisticInfo = function getJkyLogisticInfo(packageDetail, typeKey) {
+  var _packageDetail$map, _packageDetail$;
+  return (packageDetail === null || packageDetail === void 0 ? void 0 : packageDetail.length) > 1 ? packageDetail === null || packageDetail === void 0 ? void 0 : (_packageDetail$map = packageDetail.map(function (logistic, index) {
+    return "\u5305\u88F9".concat(index + 1, ":").concat(logistic === null || logistic === void 0 ? void 0 : logistic[typeKey]);
+  })) === null || _packageDetail$map === void 0 ? void 0 : _packageDetail$map.join(",") : (packageDetail === null || packageDetail === void 0 ? void 0 : (_packageDetail$ = packageDetail[0]) === null || _packageDetail$ === void 0 ? void 0 : _packageDetail$[typeKey]) || "";
+};
 //吉客云订单信息转换
 export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
   var _form$getFieldValue, _jkyReissueCom$compon, _jkyReturnCom$compone, _componentList$find, _componentList$find$c, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
@@ -342,12 +361,12 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
   var defaultOrder = filterCurrentTrades !== null && filterCurrentTrades !== void 0 && filterCurrentTrades[0] ? [filterCurrentTrades[0]] : [];
   var orders = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
-      goodsDetail: (item.goodsDetail || []).map(function (goodsItem) {
-        return _objectSpread({}, goodsItem);
-      }),
       tradeFrom: JKY_ORDER_FROM_MAP[item.tradeFrom],
       tradeType: JKY_ORDER_TYPE_MAP[item.tradeType],
-      tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus]
+      tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus],
+      logisticName: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, "logisticName"),
+      logisticCode: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, "logisticCode"),
+      logisticNo: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, "logisticNo")
     });
   });
   return {
@@ -373,13 +392,7 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
     }) : [],
     jkyGoods: {
       // allOrders用于选择订单商品，代入该订单的所有商品
-      allOrders: allOrders.map(function (item) {
-        return _objectSpread(_objectSpread({}, item), {}, {
-          goodsDetail: item.goodsDetail.map(function (goodsItem) {
-            return _objectSpread({}, goodsItem);
-          })
-        });
-      }),
+      allOrders: allOrders,
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
       orders: currentTrades,
       orderNo: orderNo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.44-beta.30",
+  "version": "2.2.44-beta.32",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "03fafd04703ba41a459dcab586efa0fbb4e27af5",
+  "gitHead": "22fe8812740ec9104f16deed222a404065771081",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }