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

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 warehouseCode = _ref2.warehouseCode,
+        warehouseName = _ref2.warehouseName;
       list.push({
-        label: name,
-        value: code,
-        disabled: isDeleted
+        label: warehouseName,
+        value: warehouseCode
       });
     });
     var valueMap = {};
@@ -33,6 +31,9 @@ export var getWarehouseDataAsync = function getWarehouseDataAsync() {
     });
 
     return Object.values(valueMap);
+  }, {
+    pageNo: 1,
+    pageSize: 100
   });
 };
 export default getWarehouseDataAsync;

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.11",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "47dfe63d335ce97d8cec334125f9dc506aa63888",
+  "gitHead": "08f751ed4f907685178ea27d4fba6111a4b42f48",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }