@kmkf-fe-packages/kmkf-utils 2.7.3-beta.3 → 2.7.3-beta.4

package/dist/esm/utils/SendData.js

@@ -90,6 +90,7 @@ export var SendDataCenter = /*#__PURE__*/function () {
       if (platform === "JST_SEND_GOOD") platform = "jst";
       if (platform === "JY_SEND_GOOD") platform = "jy";
       if (platform === "JKY_SEND_GOOD") platform = "jky";
+      if (platform === "WLN_SEND_GOOD") platform = "wln";
       if (!this.instanceMap.has(platform)) {
         this.instanceMap.set(platform, new SendData(platform));
       }

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

@@ -9,9 +9,15 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
         width: number;
     }[];
 };
-export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
+export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
+export declare const updateWlnGoodsHandle: (orders?: any[], options?: {
+    canEdit?: boolean;
+    orderBackGoodsLevel?: string;
+}) => any;
 export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
 export declare const wlnOrderTransform: (detail: any, form: any) => {
+    jstReissueGoods: any;
+    wlnReissueGoods: any;
     wlnSystemOrder: {
         orderNo: any;
         orders: any;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -15,6 +15,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import ExpressData from "../expressData";
 import uuid from "./getUUid";
+import isNull from "./isNull";
 export var WLN_SYSTEM_ORDER_CONFIG = {
   key: "wlnSystemShowOrder",
   name: "万里牛",
@@ -82,36 +83,85 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
     width: 150
   }]
 };
+export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
+  var getSortedList = function getSortedList(str) {
+    try {
+      var parts = str.split(";");
+      var bigInts = parts.map(BigInt);
+      var sortedBigInts = bigInts.sort(function (a, b) {
+        if (a < b) return -1;
+        if (a > b) return 1;
+        return 0;
+      });
+      return sortedBigInts.map(String).join(";");
+    } catch (error) {
+      return "";
+    }
+  };
+  var platformCodesSortStr = getSortedList(platformCodes || "");
+  var orderNosSortStr = getSortedList(orderNos || "");
+  return platformCodesSortStr.includes(orderNosSortStr);
+};
 export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    canEdit: false,
+    orderBackGoodsLevel: "1"
+  };
+  console.log('*** updateWlnGoodsHandle');
+  var wrapItem = function wrapItem(item, systemOrderNo) {
+    item.uuid = item.uuid || uuid();
+    item.systemOrderNo = systemOrderNo;
+    item.canDelete = true;
+    item.canEdit = !!options.canEdit;
+    var picPath = item.picPath,
+      itemId = item.itemId,
+      itemName = item.itemName,
+      skuId = item.skuId,
+      skuName = item.skuName,
+      isGift = item.isGift,
+      size = item.size,
+      payment = item.payment,
+      price = item.price,
+      others = _objectWithoutProperties(item, _excluded);
+    return _objectSpread(_objectSpread({}, others), {}, {
+      skuName: skuName,
+      pic: picPath,
+      name: itemName,
+      code: itemId,
+      sku: skuId,
+      money: payment || 0,
+      number: size,
+      share: price,
+      type: isGift
+    });
+  };
   var list = orders.reduce(function (prv, next) {
-    var goods = next.items.map(function (item) {
-      item.uuid = item.uuid || uuid();
-      item.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
-      var picPath = item.picPath,
-        itemId = item.itemId,
-        itemName = item.itemName,
-        skuId = item.skuId,
-        skuName = item.skuName,
-        isGift = item.isGift,
-        size = item.size,
-        payment = item.payment,
-        price = item.price,
-        others = _objectWithoutProperties(item, _excluded);
-      return _objectSpread(_objectSpread({}, others), {}, {
-        skuName: skuName,
-        pic: picPath,
-        name: itemName,
-        code: itemId,
-        sku: skuId,
-        money: payment || 0,
-        number: size,
-        share: price,
-        type: isGift,
-        canDelete: true
+    if (options.orderBackGoodsLevel !== "2") {
+      var _next$items;
+      // 反填子商品
+      next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.forEach(function (item) {
+        if (item.skuType === 'combine') {
+          item.subItems.forEach(function (subItem) {
+            var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.tradeNo);
+            // TODO: 调整下属性
+            // newSubItem.batchId = item.batchId
+            // newSubItem.isGift = item.isGift
+            // newSubItem.qty = subItem.qty * item.qty
+            prv.push(newSubItem);
+          });
+        } else {
+          prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo));
+        }
       });
-    });
-    prv.push.apply(prv, _toConsumableArray(goods));
+    } else {
+      var _next$items2;
+      // 反填组合商品
+      var goods = (next === null || next === void 0 ? void 0 : (_next$items2 = next.items) === null || _next$items2 === void 0 ? void 0 : _next$items2.map(function (item) {
+        return wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo);
+      })) || [];
+      prv.push.apply(prv, _toConsumableArray(goods));
+    }
     return prv;
   }, []);
   return list;
@@ -226,6 +276,17 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
       case "WLN_SYSTEM_ORDER":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder;
         break;
+      case "WLN_REISSUE_GOODS":
+        {
+          var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
+          prv[uniqueKey] = {
+            wlnSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder,
+            wlnReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.wlnReissueGoods,
+            wlnSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrderNo,
+            wlnReissueType: [initReason]
+          };
+        }
+        break;
       case "WLN_GOODS":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnGoods;
         break;
@@ -241,7 +302,7 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
 };
 //wln订单信息转换
 export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
-  var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
+  var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _wlnReissueCom$compon3, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
   console.log("\uD83D\uDE80 ~ wlnOrderBackFormValues.ts:265 ~ wlnOrderTransform ~ detail:", detail);
   var _detail$allOrders = detail.allOrders,
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
@@ -263,7 +324,11 @@ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
   var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
   var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
   var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
-  console.log('**** ', {
+  var newOrderList = filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.map(function (item) {
+    return _objectSpread({}, item);
+  });
+  var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
+  console.log("**** ", {
     isStrict: isStrict,
     onlyOneSystemOrder: onlyOneSystemOrder,
     isReissueDefaultSelect: isReissueDefaultSelect,
@@ -271,6 +336,17 @@ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
     wlnReissueGoodsOrderBackGoodsLevel: wlnReissueGoodsOrderBackGoodsLevel
   });
   return {
+    jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
+      orderBackGoodsLevel: wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon3 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon3 === void 0 ? void 0 : _wlnReissueCom$compon3.orderBackGoodsLevel,
+      canEdit: true
+    }).filter(function (good) {
+      return !isStrict || !orderNo || good.originalDealCode === orderNo;
+    }) : [],
+    wlnReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
+      canEdit: true
+    }).filter(function (good) {
+      return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
+    }) : [],
     wlnSystemOrder: {
       orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
       orders: ((detail === null || detail === void 0 ? void 0 : detail.orders) || []).map(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.7.3-beta.3",
+  "version": "2.7.3-beta.4",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17c3e4f893ab465e7dd65db2541ce63d9d9f984d",
+  "gitHead": "006184824679eeb9a994787da6e31518e6d6f981",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/dist/esm/utils/dist/gyOrderBackFormValues.js

@@ -1,285 +0,0 @@
-"use strict";
-
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
-exports.__esModule = true;
-exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
-var getUUid_1 = require("./getUUid");
-var deliveryStateMap = {
-  0: "未发货",
-  2: "全部发货"
-};
-exports.GY_SYSTEM_ORDER_CONFIG = {
-  key: "gySystemShowOrder",
-  name: "管易",
-  selectId: "gySystemSelectIds",
-  columns: [{
-    dataIndex: "billType",
-    title: "订单类型",
-    width: 150
-  }, {
-    dataIndex: "billNo",
-    title: "系统订单号",
-    width: 160
-  }, {
-    dataIndex: "tradeTagName",
-    title: "订单标记名称",
-    width: 150
-  }, {
-    dataIndex: "billTag",
-    title: "订单标签",
-    width: 150
-  }, {
-    dataIndex: "deliveryState",
-    title: "发货状态",
-    width: 150
-  }]
-};
-exports.updateGyGoodsHandle = function (orders) {
-  if (orders === void 0) {
-    orders = [];
-  }
-  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
-    if (Array.isArray(cur.details)) {
-      acc.push.apply(acc, cur.details.map(function (item) {
-        var _a;
-        item.goodName = item.itemName;
-        item.goodShortName = item.itemSimpleName;
-        item.goodNo = item.itemCode;
-        item.specNo = item.skuCode;
-        item.specName = item.skuName;
-        item.canDelete = true;
-        item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
-        return item;
-      }));
-    }
-    return acc;
-  }, []);
-};
-var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
-  var _a, _b;
-  if (type === "logistics") {
-    //管易物流信息组件先不做
-    // const currentCom = comList?.find?.(
-    //   (item) => item.workOrderComponentType === "GY_LOGISTICS"
-    // );
-    // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
-    // if (notOrderBack) {
-    //   let currentValue = form.getFieldValue(currentCom.uniqueKey);
-    //   currentValue = currentValue?.length
-    //     ? currentValue
-    //     : [{ logisticsCode: "", logisticsCompany: "" }];
-    //   return currentValue;
-    // }
-  } else if (type === "send") {
-    var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
-      return item.workOrderComponentType === "GY_SEND_GOOD";
-    });
-    var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
-    if (notOrderBack) {
-      var currentValue = form.getFieldValue(currentCom.uniqueKey);
-      currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
-        sendId: "",
-        sendName: ""
-      }];
-      return currentValue;
-    }
-  }
-  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
-      return {
-        title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
-        picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
-        platform: "gy",
-        skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
-      };
-    });
-    var params = {
-      items: items
-    };
-    if (type === "logistics") {
-      // params.logisticsCompany = next?.shippingCode;
-      // params.logisticsCode = next?.shippingSn;
-    } else if (type === "send") {
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      //下拉框，取id
-      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
-    }
-    prv.push(params);
-    return prv;
-  }, []);
-  if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
-    switch (type) {
-      case "logistics":
-        newList = [{
-          logisticsCode: ""
-        }];
-        break;
-      case "supply":
-        newList = [{
-          supplyId: ""
-        }];
-        break;
-      case "send":
-        newList = [{
-          sendId: "",
-          sendName: ""
-        }];
-        break;
-    }
-  }
-  return newList;
-};
-//管易订单信息转换
-exports.gyOrderTransform = function (detail, form) {
-  var _a, _b, _c, _d, _e, _f;
-  var orderNo = detail.orderNo,
-    _g = detail.trades,
-    currentTrades = _g === void 0 ? [] : _g,
-    componentList = detail.componentList;
-  var gyGoodsCom = (componentList || []).find(function (com) {
-    return com.workOrderComponentType === "GY_GOODS";
-  });
-  var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
-  var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
-  console.log("触发---getGyOrderList--4");
-  return {
-    gySystemOrder: {
-      orderNo: orderNo,
-      isTest: 4,
-      orders: currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      }),
-      selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
-        return item.code;
-      }) : [],
-      showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      })
-    },
-    gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
-    gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
-      return !isStrict || !orderNo || good.platformCode === orderNo;
-    }) : [],
-    gyGoods: {
-      // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: currentTrades,
-      orderNo: orderNo,
-      shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
-        return item.shopCode;
-      })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
-      vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
-        return item.vipCode;
-      })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
-      gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
-        return !isStrict || !orderNo || good.platformCode === orderNo;
-      })
-    },
-    // gyLogistics: updateGyItemListHandle(
-    //   currentTrades,
-    //   "logistics",
-    //   componentList || [],
-    //   form
-    // ),
-    gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
-  };
-};
-exports.gyOrderBackFormValues = function (detail, templateDetail) {
-  if (detail === void 0) {
-    detail = {};
-  }
-  if (templateDetail === void 0) {
-    templateDetail = {};
-  }
-  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-    var _a, _b;
-    var uniqueKey = next.uniqueKey;
-    var config = next.componentConfig;
-    switch (next.workOrderComponentType) {
-      case "GY_SYSTEM_ORDER":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
-        break;
-      case "GY_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
-        break;
-      case "GY_REISSUE_GOODS":
-        prv[uniqueKey] = {
-          gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
-          gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
-          gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
-          gyReissueType: ["1"],
-          shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
-          vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
-        };
-        break;
-      case "GY_LOGISTICS":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
-        break;
-      case "GY_SEND_GOOD":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
-    }
-    return prv;
-  }, {});
-};
-var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
-  if (config === void 0) {
-    config = {};
-  }
-  var showField = config.showField,
-    _a = config.notOrderBack,
-    notOrderBack = _a === void 0 ? false : _a;
-  if (notOrderBack) {
-    return list;
-  }
-  return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    if (type === "logistics") {
-      if (!["logisticsCompany", ""].includes(showField || "")) {
-        next.logisticsCompany = undefined;
-      }
-      if (!["logisticsCode", ""].includes(showField || "")) {
-        next.logisticsCode = undefined;
-      }
-    } else if (type === "send") {
-      if (!["sendId", "all"].includes(showField || "")) {
-        next.sendId = undefined;
-      }
-      if (!["sendName", "all"].includes(showField || "")) {
-        next.sendName = undefined;
-        next.sendSnapshotName = undefined;
-      }
-    }
-    prv.push(next);
-    return prv;
-  }, []);
-};
-// 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
-exports.filterGyOrders = function (trades, order_no) {
-  var currentTrades = (trades || []).filter(function (item) {
-    return (item.platformCode || "").split(",").includes(order_no);
-  });
-  if (currentTrades.length) {
-    return currentTrades;
-  }
-  return [];
-};