@kmkf-fe-packages/kmkf-utils 2.2.13-beta.1 → 2.2.13-beta.10

package/README.md

@@ -1,2 +1,2 @@
 1123111
-3
+30

package/dist/esm/servers/JY/logisticsData.js

@@ -5,13 +5,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import request from "../../request";
 var queryJYLogisticsList = function queryJYLogisticsList() {
   return request({
-    url: "/qy/gdfw/jy/erp/getLogisticsList",
+    url: "/qy/gdfw/jy/erp/logistics/jyList",
     method: "post",
     data: {}
   });
 };
 export var getLogisticsDataAsync = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _result$data;
     var result, list, logisticsList;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -21,11 +22,11 @@ export var getLogisticsDataAsync = /*#__PURE__*/function () {
         case 2:
           result = _context.sent;
           list = [];
-          logisticsList = (result === null || result === void 0 ? void 0 : result.data) || [];
+          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.logisticsName,
-              value: item.logisticsCode
+              label: item.globalExpressName,
+              value: item.globalExpressCode
             });
           });
           return _context.abrupt("return", list);

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

@@ -1,5 +1,4 @@
 declare type WarehouseType = {
-    disabled: boolean;
     label: string;
     value: string;
 };

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

@@ -4,7 +4,7 @@ var queryWarehouseList = function queryWarehouseList(_ref) {
   var pageNo = _ref.pageNo,
     pageSize = _ref.pageSize;
   return request({
-    url: "/qy/gdfw/jy/erp/getWarehouseList",
+    url: "/qy/gdfw/jy/erp/warehouse/jyList",
     method: "post",
     data: {
       pageNo: pageNo,
@@ -16,15 +16,13 @@ var queryWarehouseList = function queryWarehouseList(_ref) {
 export var getWarehouseDataAsync = function getWarehouseDataAsync() {
   return fetchAll("JY_WAREHOUSE_DATA", queryWarehouseList, function (data) {
     var list = [];
-    var warehouses = data || [];
+    var warehouses = (data === null || data === void 0 ? void 0 : data.warehouseInfoList) || [];
     warehouses.map(function (_ref2) {
-      var code = _ref2.code,
-        name = _ref2.name,
-        isDeleted = _ref2.isDeleted;
+      var warehouseId = _ref2.warehouseId,
+        warehouseName = _ref2.warehouseName;
       list.push({
-        label: name,
-        value: code,
-        disabled: isDeleted
+        label: warehouseName,
+        value: warehouseId
       });
     });
     var valueMap = {};

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

@@ -0,0 +1,285 @@
+"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 [];
+};

package/dist/esm/utils/jyOrderBackFormValues.js

@@ -50,8 +50,8 @@ export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesInclud
 export var updateJyGoodsHandle = function updateJyGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
-    if (Array.isArray(cur.details)) {
-      acc.push.apply(acc, _toConsumableArray(cur.details.map(function (item) {
+    if (Array.isArray(cur.subOrderDetails)) {
+      acc.push.apply(acc, _toConsumableArray(cur.subOrderDetails.map(function (item) {
         var _item$uuid;
         item.canDelete = true;
         item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
@@ -105,26 +105,25 @@ var updateJyItemListHandle = function updateJyItemListHandle(list, type, comList
         skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
       };
     });
+    var params = {
+      items: items
+    };
     if (type === "logistics") {
-      // 巨益的单个系统子订单存在拆单，会包含多个物流信息
-      var deliveryList = ((next === null || next === void 0 ? void 0 : next.deliveryList) || []).map(function (t) {
-        return {
-          items: items,
-          logisticsCompanyName: t === null || t === void 0 ? void 0 : t.expressName,
-          logisticsCompany: t === null || t === void 0 ? void 0 : t.expressCode,
-          logisticsCode: t === null || t === void 0 ? void 0 : t.mailNo
-        };
-      });
-      prv.push.apply(prv, _toConsumableArray(deliveryList));
-      // params.logisticsCompany = next?.expressName;
-      // params.logisticsCode = next?.mailNo;
+      // const deliveryList = (next?.deliveryList || []).map((t: any) => {
+      //   return {
+      //     items,
+      //     logisticsCompanyName: t?.expressName,
+      //     logisticsCompany: t?.expressCode,
+      //     logisticsCode: t?.mailNo,
+      //   };
+      // });
+      // prv.push(...deliveryList);
+      params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticId;
+      params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticNo;
     } else if (type === "send") {
-      var params = {
-        items: items
-      };
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseId;
       //下拉框，取id
-      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseId;
       params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
       prv.push(params);
     }
@@ -206,7 +205,7 @@ export var jyOrderTransform = function jyOrderTransform(detail, form) {
         return item.shopCode;
       })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopCode) || null,
       jyGoods: updateJyGoodsHandle(currentTrades).filter(function (good) {
-        return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
+        return !isStrict || !orderNo;
       })
     },
     shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find2 = currentTrades.find) === null || _currentTrades$find2 === void 0 ? void 0 : (_currentTrades$find2$ = _currentTrades$find2.call(currentTrades, function (item) {
@@ -298,7 +297,7 @@ var updateJyItemListByConfigHandle = function updateJyItemListByConfigHandle(lis
 // 巨益根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
 export var filterJyOrders = function filterJyOrders(trades, order_no) {
   var currentTrades = (trades || []).filter(function (item) {
-    return getIsPlatformCodesIncludeOrderNos(item.platformCode, order_no);
+    return getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no);
   });
   if (currentTrades.length) {
     return currentTrades;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.13-beta.1",
+  "version": "2.2.13-beta.10",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "47dfe63d335ce97d8cec334125f9dc506aa63888",
+  "gitHead": "8f6077349ef6d949a0f53969632fb5c3a93231e8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }