@kmkf-fe-packages/kmkf-utils 2.2.44-beta.8 → 2.2.44-beta.80

package/README.md

@@ -1 +1 @@
-11231
+1123111111

package/dist/esm/constants/constant.d.ts

@@ -83,6 +83,8 @@ export declare const DATA_SPLIT_COMPONENT_FIELDS_MAP: {
     KM_LOGISTICS: string[];
     KM_GOODS: string[];
     KM_REISSUE_GOODS: string[];
+    KM_RETURN_GOODS: string[];
+    KM_EXCHANGE_GOODS: string[];
     JST_LOGISTICS: string[];
     WDT_REISSUE_GOODS: string[];
     WDT_GOODS: string[];
@@ -100,6 +102,7 @@ export declare const DATA_SPLIT_COMPONENT_FIELDS_MAP: {
     JST_SYSTEM_ORDER: string[];
     JST_GOODS: string[];
     JST_REISSUE_GOODS: string[];
+    JKY_SYSTEM_ORDER: string[];
     PICTURE_PRO: string[];
 };
 export declare const SEARCH_OPTIONS: {

package/dist/esm/constants/constant.js

@@ -156,6 +156,8 @@ export var DATA_SPLIT_COMPONENT_FIELDS_MAP = {
   KM_LOGISTICS: ["kmLogisticsList"],
   KM_GOODS: ["kmGoods"],
   KM_REISSUE_GOODS: ["kmReissueGoods"],
+  KM_RETURN_GOODS: ["kmReturnGoods"],
+  KM_EXCHANGE_GOODS: ["kmExchangeGoods"],
   JST_LOGISTICS: ["jstItemList"],
   WDT_REISSUE_GOODS: ["wdtReissueGoods"],
   WDT_GOODS: ["wdtGoods"],
@@ -173,6 +175,7 @@ export var DATA_SPLIT_COMPONENT_FIELDS_MAP = {
   JST_SYSTEM_ORDER: ["jstSystemShowOrder"],
   JST_GOODS: ["jstGoods"],
   JST_REISSUE_GOODS: ["jstReissueGoods"],
+  JKY_SYSTEM_ORDER: ["jkySystemShowOrder"],
   PICTURE_PRO: ["pictureProList"]
 };
 export var SEARCH_OPTIONS = [{

package/dist/esm/constants/msgTypeMapping.js

@@ -20,6 +20,7 @@ var msgTypeCh = {
   EXCHANGE: "换货",
   logistics: "中通/圆通/申通售后群消息",
   negotiate: "协商售后",
-  QN_LOGISTICS_INTERCEPTION: "物流拦截（平台）"
+  QN_LOGISTICS_INTERCEPTION: "物流拦截（平台）",
+  GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息"
 };
 export default msgTypeCh;

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/servers/JY/logisticsData.js

@@ -25,8 +25,8 @@ export var getLogisticsDataAsync = /*#__PURE__*/function () {
           logisticsList = (result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.logisticsList) || [];
           logisticsList === null || logisticsList === void 0 ? void 0 : logisticsList.map(function (item) {
             list.push({
-              label: item.globalExpressName,
-              value: item.globalExpressCode
+              label: item.logisticsName,
+              value: item.logisticsNo
             });
           });
           return _context.abrupt("return", list);

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,
@@ -79,7 +85,7 @@ export var SendDataCenter = /*#__PURE__*/function () {
       if (!platform) throw new Error("获取实例需要传入平台类型");
       if (platform === "WDT_SEND_GOOD") platform = "wdt";
       if (platform === "BS_E3_SEND_GOOD") platform = "bsE3";
-      if (platform === "KM_SEND_GOOD") platform = "km";
+      if (platform === "KM_SEND_GOOD" || platform === "KM_RETURN_WAREHOUSE") platform = "km";
       if (platform === "GY_SEND_GOOD") platform = "gy";
       if (platform === "JST_SEND_GOOD") platform = "jst";
       if (platform === "JY_SEND_GOOD") platform = "jy";

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

@@ -2,6 +2,7 @@ export declare const BS_E3_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: ({
         title: string;
         dataIndex: string;

package/dist/esm/utils/bsE3OrderBackFormValues.js

@@ -16,6 +16,7 @@ export var BS_E3_SYSTEM_ORDER_CONFIG = {
   key: "bsE3SystemShowOrder",
   name: "百胜",
   selectId: "bsE3SystemSelectIds",
+  orderNo: "bsE3SystemOrderNo",
   columns: [{
     title: "系统订单号",
     dataIndex: "orderSn",

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

@@ -2,6 +2,7 @@ export declare const BS_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         title: string;
         dataIndex: string;

package/dist/esm/utils/bsOrderBackFormValues.js

@@ -18,6 +18,7 @@ export var BS_SYSTEM_ORDER_CONFIG = {
   key: "bsSystemShowOrder",
   name: "百胜",
   selectId: "bsSystemSelectIds",
+  orderNo: "bsSystemOrderNo",
   columns: [{
     title: "订单类型",
     dataIndex: "billType",

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

@@ -5,6 +5,7 @@ export declare const GY_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         dataIndex: string;
         title: string;

package/dist/esm/utils/gyOrderBackFormValues.js

@@ -20,6 +20,7 @@ export var GY_SYSTEM_ORDER_CONFIG = {
   key: "gySystemShowOrder",
   name: "管易",
   selectId: "gySystemSelectIds",
+  orderNo: "gySystemOrderNo",
   columns: [{
     dataIndex: "billType",
     title: "订单类型",

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, 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, 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

@@ -2,37 +2,111 @@ export declare const JKY_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
-    columns: {
+    columns: ({
         dataIndex: string;
         title: string;
         width: number;
-    }[];
+        render?: undefined;
+        renderExport?: undefined;
+    } | {
+        dataIndex: string;
+        title: string;
+        width: number;
+        render: (val: number) => "否" | "是";
+        renderExport: (val: number) => "否" | "是";
+    })[];
+};
+export declare const JKY_ORDER_FROM_MAP: {
+    "1": string;
+    "2": string;
+    "3": string;
+    "4": string;
+    "6": string;
+    "7": string;
+    "8": string;
+    "9": string;
+    "10": string;
+    "11": string;
+    "12": string;
+    "13": string;
+    "14": string;
+    "15": string;
+    "16": string;
+    "17": string;
+    "18": string;
+    "19": string;
+    "20": string;
+    "21": string;
+    "22": string;
+    "23": string;
+    "24": string;
+    "25": string;
+    "26": string;
+    "27": string;
+    "28": string;
+    "29": string;
 };
 export declare const JKY_ORDER_TYPE_MAP: {
-    SALES: string;
-    EXPENSE: string;
-    SUBSCRIBES: string;
-    EXCHANGE: string;
-    REISSUE: string;
-    INVOICE: string;
-    WELFARE: string;
-    OTHERS: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+    6: string;
+    7: string;
+    8: string;
+    9: string;
+    10: string;
+    11: string;
+    12: string;
+    13: string;
+    14: string;
+    15: string;
+    16: string;
+    91: string;
+    92: string;
+    93: string;
+    94: string;
+    95: string;
+    96: string;
+    97: string;
+    98: string;
+    99: string;
+    100: string;
 };
 export declare const JKY_ORDER_STATUS_MAP: {
-    CREATED: string;
-    AUDITED_ABNORMAL: string;
-    AUDITED: string;
-    DISPATCHED_ABNORMAL: string;
-    DISPATCHED: string;
-    DELIVERY_ABNORMAL: string;
-    DELIVERED: string;
-    INVALID: string;
+    1010: string;
+    1020: string;
+    1030: string;
+    1050: string;
+    2000: string;
+    2010: string;
+    2020: string;
+    2030: string;
+    2040: string;
+    3010: string;
+    4040: string;
+    4041: string;
+    4110: string;
+    4111: string;
+    4112: string;
+    4113: string;
+    4121: string;
+    4122: string;
+    4123: string;
+    4130: string;
+    5010: string;
+    5020: string;
+    5030: string;
+    6000: string;
+    9090: string;
 };
 export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
 export declare const updateJkyGoodsHandle: (orders?: any[], config?: {
     orderBackGoodsLevel?: string;
     canEdit?: boolean;
 }) => any[];
+export declare const getJkyLogisticInfo: (item: any, typeKey: string) => any;
 export declare const jkyOrderTransform: (detail: any, form: any) => {
     jkySystemOrder: {
         orderNo: any;

package/dist/esm/utils/jkyOrderBackFormValues.js

@@ -12,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: "吉客云",
@@ -35,7 +36,13 @@ export var JKY_SYSTEM_ORDER_CONFIG = {
   }, {
     dataIndex: "isDelete",
     title: "是否删除",
-    width: 150
+    width: 150,
+    render: function render(val) {
+      return val === undefined ? val : val == 1 ? "是" : "否";
+    },
+    renderExport: function renderExport(val) {
+      return val === undefined ? val : val == 1 ? "是" : "否";
+    }
   }, {
     dataIndex: "flagNames",
     title: "标记名称",
@@ -66,25 +73,90 @@ export var JKY_SYSTEM_ORDER_CONFIG = {
     width: 150
   }]
 };
+export var JKY_ORDER_FROM_MAP = {
+  "1": "网店下载",
+  "2": "手工新建",
+  "3": "订单导入",
+  "4": "吉商城",
+  "6": "售后",
+  "7": "门店",
+  "8": "分销",
+  "9": "吉链采购",
+  "10": "吉链分销",
+  "11": "吉商城分销",
+  "12": "奇门分销",
+  "13": "销售返利",
+  "14": "门店补货",
+  "15": "吉秘机器人",
+  "16": "调拨",
+  "17": "吉客发",
+  "18": "开放平台",
+  "19": "生产推单",
+  "20": "吉秘助手",
+  "21": "意向单",
+  "22": "吉会员",
+  "23": "账单",
+  "24": "销售合同",
+  "25": "商机",
+  "26": "导购开单",
+  "27": "寄售结算",
+  "28": "货主收费",
+  "29": "WMS创建"
+};
 export var JKY_ORDER_TYPE_MAP = {
-  SALES: "销售订单",
-  EXPENSE: "费用订单",
-  SUBSCRIBES: "预订订单",
-  EXCHANGE: "换货订单",
-  REISSUE: "补发订单",
-  INVOICE: "补发票订单",
-  WELFARE: "福利订单",
-  OTHERS: "其他订单"
+  1: "零售业务",
+  2: "代发货（来自分销商）",
+  3: "预售订单",
+  4: "周期性订购",
+  5: "代销售（供货商发货）",
+  6: "现款现货",
+  7: "售后发货",
+  8: "售后退货",
+  9: "批发业务（B2B）",
+  10: "试销业务",
+  11: "错漏调整",
+  12: "仅退款",
+  13: "销售返利",
+  14: "大B2B业务",
+  15: "物流买赔",
+  16: "销售对账差异",
+  91: "自定义1",
+  92: "自定义2",
+  93: "自定义3",
+  94: "自定义4",
+  95: "自定义5",
+  96: "自定义6",
+  97: "自定义7",
+  98: "自定义8",
+  99: "自定义9",
+  100: "自定义10"
 };
 export var JKY_ORDER_STATUS_MAP = {
-  CREATED: "新建",
-  AUDITED_ABNORMAL: "审核失败",
-  AUDITED: "已审核",
-  DISPATCHED_ABNORMAL: "配货异常",
-  DISPATCHED: "已配货",
-  DELIVERY_ABNORMAL: "平台发货异常",
-  DELIVERED: "已发货",
-  INVALID: "作废"
+  1010: "待审核",
+  1020: "审核中",
+  1030: "预售",
+  1050: "待复核",
+  2000: "备货等待",
+  2010: "备货等待等补货",
+  2020: "服务等待",
+  2030: "备货等待等生产",
+  2040: "采购等待",
+  3010: "虚拟发货",
+  4040: "代销发货待递交",
+  4041: "代销发货已递交",
+  4110: "待发货待递交",
+  4111: "待发货递交中",
+  4112: "待发货已递交",
+  4113: "待发货-递交失败",
+  4121: "待发货-取消中",
+  4122: "待发货已取消",
+  4123: "待发货取消失败",
+  4130: "待发货部分发货",
+  5010: "已取消",
+  5020: "已取消被合并",
+  5030: "已取消被拆分",
+  6000: "发货在途",
+  9090: "已完成"
 };
 export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
   var getSortedList = function getSortedList(str) {
@@ -114,27 +186,45 @@ export var updateJkyGoodsHandle = function updateJkyGoodsHandle() {
       item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
       return _objectSpread(_objectSpread({}, item), {}, {
         canDelete: true,
-        canEdit: (_config$canEdit = config === null || config === void 0 ? void 0 : config.canEdit) !== null && _config$canEdit !== void 0 ? _config$canEdit : false,
-        divideOrderFee: Number(item.divideOrderFee).toFixed(2),
-        sellTotal: Number(item.sellTotal).toFixed(2),
-        sellPrice: Number(item.sellPrice).toFixed(2),
-        settlementPrice: Number(item.settlementPrice).toFixed(2),
-        mallSellingPrice: Number(item.mallSellingPrice).toFixed(2)
+        canEdit: (_config$canEdit = config === null || config === void 0 ? void 0 : config.canEdit) !== null && _config$canEdit !== void 0 ? _config$canEdit : false
       });
     });
   };
   return mappingGoodsItem((orders || []).reduce(function (prv, next) {
-    if (next.subOrderDetails && next.subOrderDetails.length) {
-      next.subOrderDetails.forEach(function (subItem) {
-        if (config.orderBackGoodsLevel !== "2" && subItem.tradeOrderAssemblyGoodsDtoList && subItem.tradeOrderAssemblyGoodsDtoList.length) {
-          // subItem.tradeOrderAssemblyGoodsDtoList.forEach(suit => {
-          //   suit.systemOrderNo = next?.tradeNo;
-          // });
-          prv.push.apply(prv, _toConsumableArray(subItem.tradeOrderAssemblyGoodsDtoList));
-        } else {
-          subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
-          prv.push(subItem);
-        }
+    var batchNos = [];
+    var sendCounts = [];
+    var productDates = [];
+    var expireDates = [];
+    if (config.orderBackGoodsLevel !== "2" && next.tradeOrderAssemblyGoodsDtoList && next.tradeOrderAssemblyGoodsDtoList.length) {
+      next.tradeOrderAssemblyGoodsDtoList.forEach(function (subItem) {
+        var _next$assemblyGoodsDe;
+        subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
+        next === null || next === void 0 ? void 0 : (_next$assemblyGoodsDe = next.assemblyGoodsDelivery) === null || _next$assemblyGoodsDe === void 0 ? void 0 : _next$assemblyGoodsDe.forEach(function (nxt) {
+          batchNos.push(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo);
+          productDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.productDate));
+          expireDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.expireDate));
+        });
+        subItem.batchNo = batchNos.join(",");
+        subItem.productDate = productDates.join(",");
+        subItem.expireDate = expireDates.join(",");
+        prv.push(subItem);
+      });
+    } else {
+      var _next$goodsDetail;
+      next === null || next === void 0 ? void 0 : (_next$goodsDetail = next.goodsDetail) === null || _next$goodsDetail === void 0 ? void 0 : _next$goodsDetail.forEach(function (subItem) {
+        var _next$goodsDelivery;
+        subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
+        next === null || next === void 0 ? void 0 : (_next$goodsDelivery = next.goodsDelivery) === null || _next$goodsDelivery === void 0 ? void 0 : _next$goodsDelivery.forEach(function (nxt) {
+          batchNos.push(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo);
+          sendCounts.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.sendCount));
+          productDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.productDate));
+          expireDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.expireDate));
+        });
+        subItem.batchNo = batchNos.join(",");
+        subItem.sendCount = sendCounts.join(",");
+        subItem.productDate = productDates.join(",");
+        subItem.expireDate = expireDates.join(",");
+        prv.push(subItem);
       });
     }
     return prv;
@@ -144,7 +234,7 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
   var _newList;
   if (type === "logistics") {
     var _comList$find, _currentCom$component;
-    //巨益物流信息组件
+    //吉客云物流信息组件
     var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
       return item.workOrderComponentType === "JKY_LOGISTICS";
     });
@@ -175,26 +265,41 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
     }
   }
   var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    var items = ((next === null || next === void 0 ? void 0 : next.subOrderDetails) || []).map(function (t) {
+    var items = ((next === null || next === void 0 ? void 0 : next.goodsDetail) || []).map(function (t) {
       return {
-        title: (t === null || t === void 0 ? void 0 : t.productName) || "",
-        picUrl: (t === null || t === void 0 ? void 0 : t.imageUrl) || "",
+        title: (t === null || t === void 0 ? void 0 : t.goodsName) || "",
+        picUrl: (t === null || t === void 0 ? void 0 : t.skuImgUrl) || "",
         platform: "jky",
-        skuId: (t === null || t === void 0 ? void 0 : t.productCode) || ""
+        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 _next$packageDetail;
+      // 吉客云单个系统子订单存在拆单，会包含多个物流信息
+      var packageDetailList = next !== null && next !== void 0 && next.packageDetail && (next === null || next === void 0 ? void 0 : (_next$packageDetail = next.packageDetail) === null || _next$packageDetail === void 0 ? void 0 : _next$packageDetail.length) > 1 ? next === null || next === void 0 ? void 0 : next.packageDetail : [{
+        logisticName: next === null || next === void 0 ? void 0 : next.logisticName,
+        logisticCode: next === null || next === void 0 ? void 0 : next.logisticCode,
+        logisticNo: next === null || next === void 0 ? void 0 : next.mainPostid
+      }];
+      console.log("packageDetailList", next, next.logisticCode, packageDetailList);
+      var packageDetails = (packageDetailList || []).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
+        };
+      });
+      console.log("packageDetails", packageDetails);
+      prv.push.apply(prv, _toConsumableArray(packageDetails));
     } else if (type === "send") {
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseId;
+      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.warehouseId;
+      params.sendName = warehouseCode;
       params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
       prv.push(params);
     }
@@ -222,8 +327,18 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
   }
   return newList;
 };
-
-//巨益订单信息转换
+export var getJkyLogisticInfo = function getJkyLogisticInfo(item, typeKey) {
+  var _item$packageDetail, _packageDetail$map, _packageDetail$;
+  var packageDetail = item !== null && item !== void 0 && item.packageDetail && (item === null || item === void 0 ? void 0 : (_item$packageDetail = item.packageDetail) === null || _item$packageDetail === void 0 ? void 0 : _item$packageDetail.length) > 1 ? item === null || item === void 0 ? void 0 : item.packageDetail : [{
+    logisticName: item === null || item === void 0 ? void 0 : item.logisticName,
+    logisticCode: item === null || item === void 0 ? void 0 : item.logisticCode,
+    logisticNo: item === null || item === void 0 ? void 0 : item.mainPostid
+  }];
+  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$;
   var _detail$allOrders = detail.allOrders,
@@ -254,8 +369,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), {}, {
+      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, "logisticName"),
+      logisticCode: getJkyLogisticInfo(item, "logisticCode"),
+      logisticNo: getJkyLogisticInfo(item, "logisticNo")
     });
   });
   return {
@@ -380,13 +499,13 @@ var updateJkyItemListByConfigHandle = function updateJkyItemListByConfigHandle(l
   }, []);
 };
 
-// 巨益根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
+// 根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
 export var filterJkyOrders = function filterJkyOrders(trades, order_no) {
-  var currentTrades = (trades || []).filter(function (item) {
-    return getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no);
-  });
-  if (currentTrades.length) {
-    return currentTrades;
-  }
-  return [];
+  // const currentTrades = (trades || []).filter((item: Record<string, any>) =>
+  //   getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no),
+  // );
+  // if (currentTrades.length) {
+  //   return currentTrades;
+  // }
+  return trades || [];
 };

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

@@ -2,6 +2,7 @@ export declare const JST_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         dataIndex: string;
         title: string;

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -17,6 +17,7 @@ export var JST_SYSTEM_ORDER_CONFIG = {
   key: "jstSystemShowOrder",
   name: "聚水潭",
   selectId: "jstSystemSelectIds",
+  orderNo: "jstSystemOrderNo",
   columns: [{
     dataIndex: "orderType",
     title: "订单类型",

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

@@ -2,11 +2,23 @@ export declare const JY_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         dataIndex: string;
         title: string;
         width: number;
     }[];
+    compoundConfig: (id: string) => ({
+        name: string;
+        id: string;
+        standardDateType?: undefined;
+        exampleValue?: undefined;
+    } | {
+        name: string;
+        id: string;
+        standardDateType: string;
+        exampleValue: string;
+    })[];
 };
 export declare const JY_ORDER_TYPE_MAP: {
     SALES: string;

package/dist/esm/utils/jyOrderBackFormValues.js

@@ -6,10 +6,27 @@ 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";
+var getCompoundConfig = function getCompoundConfig(id) {
+  return [{
+    name: "\u7ED1\u5B9A\u8BA2\u5355\u53F7",
+    id: "".concat(id, "_jySystemOrderNo")
+  }, {
+    name: "\u9009\u4E2D\u7CFB\u7EDF\u8BA2\u5355\u53F7",
+    id: "".concat(id, "_jySystemSelectIds"),
+    standardDateType: "Array",
+    exampleValue: '["1"]'
+  }, {
+    name: "\u5546\u54C1\u5217\u8868",
+    id: "".concat(id, "_jySystemShowOrder"),
+    standardDateType: "Array",
+    exampleValue: '[{"country":"","select":false,"payTime":"","isMallDeliveryAbnormal":0,"shopName":"","warehouseName":"","sourcePlatformName":"","fuzzyMobile":"","cityName":"","contact":"","modified":"","shopId":0,"tradeType":"","fuzzyAddress":"","tradeNo":"","districtName":"","mobile":"","sendTime":"","tradeTime":"","subOrderDetails":[{"gift":"","mallSellingPrice":0,"bfit":"","mallSkuId":"","productId":"","specCode":"","sellTotal":0,"mallProductId":"","sellPrice":0,"mallProductName":"","oid":"","uuid":"","productName":"","skuName":"","productCode":"","specName":"","mallSkuName":"","sellCount":0,"divideOrderFee":0,"settlementPrice":0,"goodsCode":"","systemOrderNo":"","goodsName":"","skuCode":""}],"sourcePlatformCode":"","warehouseId":0,"tradeStatus":"","endTime":"","provinceName":"","tradeId":"","fuzzyContact":""}]'
+  }];
+};
 export var JY_SYSTEM_ORDER_CONFIG = {
   key: "jySystemShowOrder",
   name: "巨益",
   selectId: "jySystemSelectIds",
+  orderNo: "jySystemOrderNo",
   columns: [{
     dataIndex: "tradeNo",
     title: "系统订单号",
@@ -26,7 +43,8 @@ export var JY_SYSTEM_ORDER_CONFIG = {
     dataIndex: "sourcePlatformName",
     title: "来源平台",
     width: 150
-  }]
+  }],
+  compoundConfig: getCompoundConfig
 };
 export var JY_ORDER_TYPE_MAP = {
   SALES: "销售订单",

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

@@ -80,7 +80,7 @@ declare const KM_ORDER_TYPE_MAP: {
 export declare const updateKmGoodsHandle: (orders?: any[], config?: {
     orderBackGoodsLevel?: string;
     canEdit?: boolean;
-}) => any[];
+}, type?: string) => any[];
 export declare const getKmOrderTypeValue: (key: keyof typeof KM_ORDER_TYPE_MAP) => string;
 declare const KM_ORDER_STATUS: {
     WAIT_BUYER_PAY: string;
@@ -103,6 +103,7 @@ export declare const KM_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: ({
         dataIndex: string;
         title: string;
@@ -145,6 +146,7 @@ export declare const kmOrderTransform: (detail: any, form: any) => {
     };
     kmReissueGoods: any[];
     kmReturnGoods: any[];
+    kmExchangeGoods: any[];
     kmPosting: any;
 };
 export {};

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -81,6 +81,16 @@ export var kmOrderBackFormValues = function kmOrderBackFormValues() {
           };
         }
         break;
+      case "KM_EXCHANGE_GOODS":
+        {
+          var _detail$kmGoods3;
+          prv[uniqueKey] = {
+            kmSystemOrder: detail === null || detail === void 0 ? void 0 : detail.kmSystemOrder,
+            kmExchangeGoods: detail === null || detail === void 0 ? void 0 : detail.kmExchangeGoods,
+            shopCode: detail === null || detail === void 0 ? void 0 : (_detail$kmGoods3 = detail.kmGoods) === null || _detail$kmGoods3 === void 0 ? void 0 : _detail$kmGoods3.shopCode
+          };
+        }
+        break;
       case "POSTING":
         {
           if (detail !== null && detail !== void 0 && detail.kmPosting) {
@@ -174,6 +184,7 @@ var KM_ORDER_TYPE_MAP = {
 export var updateKmGoodsHandle = function updateKmGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var type = arguments.length > 2 ? arguments[2] : undefined;
   var mappingGoodsItem = function mappingGoodsItem(list) {
     return (list || []).map(function (item) {
       var _item$uuid;
@@ -190,7 +201,9 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
         sysPicPath: item.picUrl,
         canDelete: true,
         canEdit: !!config.canEdit
-      });
+      }, type === "KM_RETURN_GOODS" ? {
+        refundMoney: item.price * (item.itemNum || item.num)
+      } : {});
     });
   };
   return mappingGoodsItem((orders || []).reduce(function (prv, next) {
@@ -235,6 +248,7 @@ export var KM_SYSTEM_ORDER_CONFIG = {
   key: "kmSystemShowOrder",
   name: "快麦",
   selectId: "kmSystemSelectIds",
+  orderNo: "kmSystemOrderNo",
   columns: [{
     dataIndex: "billType",
     title: "订单类型",
@@ -471,6 +485,12 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
     kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
       orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
       canEdit: true
+    }, "KM_RETURN_GOODS").filter(function (good) {
+      return !isStrict || !orderNo || good.sid === orderNo;
+    }) : [],
+    kmExchangeGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
+      orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
+      canEdit: true
     }).filter(function (good) {
       return !isStrict || !orderNo || good.sid === orderNo;
     }) : [],

package/dist/esm/utils/orderBackFormValues.js

@@ -19,6 +19,7 @@ import { gyOrderBackFormValues } from "./gyOrderBackFormValues";
 import { jyOrderBackFormValues } from "./jyOrderBackFormValues";
 import { skxOrderBackFormValues } from "./skxOrderBackFormValues";
 import { skxReturnOrderBackFormValues } from "./skxReturnOrderBackFormValues";
+import { jkyOrderBackFormValues } from "./jkyOrderBackFormValues";
 import { pushGyLog } from "../utils";
 
 // 淘宝商品组件信息处理
@@ -252,11 +253,12 @@ export default (function (_ref) {
   var kmValues = detail["kmOrder"] ? kmOrderBackFormValues(detail["kmOrder"], templateDetail) : {};
   var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
   var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
+  var jkyValues = detail["jkyOrder"] ? jkyOrderBackFormValues(detail["jkyOrder"], templateDetail) : {};
   //不判断是否存在detail["skxOrder"]，不存在直接清空所有skx相关组件值
   var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
   var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};
   pushGyLog("gyValues", gyValues);
   // console.log("bsE3Values", bsE3Values);
 
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), jyValues), skxValues), skxReturnValues);
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), jyValues), skxValues), skxReturnValues), jkyValues);
 });

package/dist/esm/utils/transformList.js

@@ -21,7 +21,7 @@ import { BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packa
 import ExpressInterceptData from "../expressInterceptData";
 var interceptExpress = ExpressInterceptData.getInstance();
 export var unTransField = function unTransField(key) {
-  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "erpAfterSaleTradeItemList", "erpAfterSaleTradeIdList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "flowTags", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "msgStatusValues", "msgStatus4Search", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "trajectoryMoreStatus", "trajectoryMoreLastLogisticsInfo", "trajectoryMoreLastUpdateTime", "trajectoryApiStatus", "wdtGoods", "wdtSendGood", "wdtReissueType", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSystemOrderNo", "wdtLogisticsList", "wdtSystemShowOrder", "kmSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsE3Goods", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptApiStatusList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "interceptLogisticsApiStatus", "productList", "label", "kmSendGood", "kmGoods", "bsE3ReissueType", "bsE3ReissueGoods", "gyGoods", "gySendGood", "gyReissueType", "gyReissueGoods", "gySystemOrderNo", "gyLogisticsList", "gySystemShowOrder", "gySystemSelectIds", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "wdtTags", "kmVideo", "jstAftersaleGoods"].reduce(function (cur, nxt) {
+  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "erpAfterSaleTradeItemList", "erpAfterSaleTradeIdList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "flowTags", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "msgStatusValues", "msgStatus4Search", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "trajectoryMoreStatus", "trajectoryMoreLastLogisticsInfo", "trajectoryMoreLastUpdateTime", "trajectoryApiStatus", "wdtGoods", "wdtSendGood", "wdtReissueType", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSystemOrderNo", "wdtLogisticsList", "wdtSystemShowOrder", "kmSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsE3Goods", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptApiStatusList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "interceptLogisticsApiStatus", "productList", "label", "kmSendGood", "kmReturnWarehouse", "kmGoods", "bsE3ReissueType", "bsE3ReissueGoods", "gyGoods", "gySendGood", "gyReissueType", "gyReissueGoods", "gySystemOrderNo", "gyLogisticsList", "gySystemShowOrder", "gySystemSelectIds", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "wdtTags", "kmVideo", "jstAftersaleGoods"].reduce(function (cur, nxt) {
     return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
   }, false);
 };

package/dist/esm/utils/unTransField.js

@@ -1,5 +1,5 @@
 export default (function (key) {
-  return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "jstOutboundStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "jkyGoods", "jkySystemOrderNo", "jkySystemSelectIds", "jkySystemShowOrder", "jkySendGood", "jkySendId", "jkySendName", "jkyLogisticsList", "jkyLogisticsCompany", "jkyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics", "jyReissueGoods", "jyReissueType", "jstAftersaleGoods"].reduce(function (cur, nxt) {
+  return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "jstOutboundStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "jkyInStockStatusItemList", "jkyInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmReturnWarehouse", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "jkyGoods", "jkySystemOrderNo", "jkySystemSelectIds", "jkySystemShowOrder", "jkySendGood", "jkySendId", "jkySendName", "jkyLogisticsList", "jkyLogisticsCompany", "jkyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics", "jyReissueGoods", "jyReissueType", "jstAftersaleGoods"].reduce(function (cur, nxt) {
     return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
   }, false);
 });

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

@@ -3,6 +3,7 @@ export declare const WDT_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         title: string;
         dataIndex: string;
@@ -14,6 +15,7 @@ export declare const WDT_RETURN_BILL_NO_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: ({
         title: string;
         dataIndex: string;

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -12,6 +12,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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; }
 import uuid from "./getUUid";
 import isNull from "./isNull";
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
 export var tradeStatusMap = {
   flagship: {
     4: "线下退款",
@@ -83,6 +84,7 @@ export var WDT_SYSTEM_ORDER_CONFIG = {
   key: "wdtSystemShowOrder",
   name: "旺店通",
   selectId: "wdtSystemSelectIds",
+  orderNo: "wdtSystemOrderNo",
   columns: [{
     title: "订单类型",
     dataIndex: "billType",
@@ -134,6 +136,7 @@ export var WDT_RETURN_BILL_NO_CONFIG = {
   key: "wdtReturnBillShowOrder",
   name: "旺店通退换",
   selectId: "wdtReturnBillSelectIds",
+  orderNo: "wdtReturnBillNo",
   columns: [{
     title: "订单号",
     dataIndex: "srcTids",
@@ -538,10 +541,11 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName || item.tags // 网页版取tags，其他版本用tagName
+          billTag: item.tagName || item.tags,
+          // 网页版取tags，其他版本用tagName
+          logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       }),
-
       selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
@@ -551,7 +555,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
           billTag: item.tagName || item.tags,
           // 网页版取tags，其他版本用tagName
-          tradeStatusValue: item.tradeStatusValue
+          logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       })
     },

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

@@ -2,6 +2,7 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         title: string;
         dataIndex: string;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -19,6 +19,7 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
   key: "wlnSystemShowOrder",
   name: "万里牛",
   selectId: "wlnSystemSelectIds",
+  orderNo: "wlnSystemOrderNo",
   columns: [{
     title: "订单类型",
     dataIndex: "billType",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.44-beta.8",
+  "version": "2.2.44-beta.80",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0e6cd65c6478d634713bce566f8fa78fd754f82b",
+  "gitHead": "3b83023559bca6258217a8cc14d9145c60c3d292",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }