@kmkf-fe-packages/kmkf-utils 1.1.0 → 1.1.2

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

@@ -8,6 +8,7 @@ export declare const queryWdtWarehouseList: (pageNo: number, pageSize: number) =
     warehouses: {
         warehouseNo: string;
         name: string;
+        is_disabled: boolean;
     }[];
     totalCount?: number | undefined;
 }>>;

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -150,6 +150,35 @@ var updateWdtItemListByConfigHandle = function updateWdtItemListByConfigHandle(l
     return prv;
   }, []);
 };
+
+// WDT根据订单号请求返回的srcTid会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
+var handleOrderNo = function handleOrderNo(detail, form) {
+  var _detail$componentList, _detail$componentList2;
+  var tradeIdComp = detail === null || detail === void 0 ? void 0 : (_detail$componentList = detail.componentList) === null || _detail$componentList === void 0 ? void 0 : (_detail$componentList2 = _detail$componentList.find) === null || _detail$componentList2 === void 0 ? void 0 : _detail$componentList2.call(_detail$componentList, function (item) {
+    return item.workOrderComponentType === 'TRADE_ID_INPUT';
+  });
+  var tradeIdValue = form.getFieldValue(tradeIdComp.uniqueKey) || form.getFieldValue("".concat(tradeIdComp.uniqueKey, "_tradeId"));
+  var currentTrades = ((detail === null || detail === void 0 ? void 0 : detail.trades) || []).filter(function (item) {
+    return (item.srcTid || '').split(',').includes(tradeIdValue);
+  }).map(function (item) {
+    if (Array.isArray(item.goodDetails)) {
+      item.goodDetails = item.goodDetails.filter(function (good) {
+        return good.srcTid === tradeIdValue;
+      });
+    }
+    return item;
+  });
+  if (currentTrades.length) {
+    return {
+      currentTrades: currentTrades,
+      orderNo: tradeIdValue
+    };
+  }
+  return {
+    currentTrades: [],
+    orderNo: ''
+  };
+};
 export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -212,25 +241,26 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
 };
 //wdt订单信息转换
 export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
-  var _detail$trades, _detail$trades$find, _detail$trades2, _ref, _detail$trades3, _detail$trades3$find, _detail$trades3$find$;
+  var _detail$trades, _currentTrades$find, _currentTrades$find$c;
   // const advItem: any =
   //   detail?.orders?.[0]?.advancedDistributionInfos?.[0] || {};
+  var _handleOrderNo = handleOrderNo(detail, form),
+    currentTrades = _handleOrderNo.currentTrades,
+    orderNo = _handleOrderNo.orderNo;
   return {
     wdtSystemOrder: {
-      orderNo: (detail === null || detail === void 0 ? void 0 : (_detail$trades = detail.trades) === null || _detail$trades === void 0 ? void 0 : (_detail$trades$find = _detail$trades.find(function (item) {
-        return item.srcTid;
-      })) === null || _detail$trades$find === void 0 ? void 0 : _detail$trades$find.srcTid) || '',
-      orders: ((detail === null || detail === void 0 ? void 0 : detail.trades) || []).map(function (item) {
+      orderNo: orderNo,
+      orders: currentTrades.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
           billTag: item.tagName
         });
       }),
-      selectIds: (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1 ? detail === null || detail === void 0 ? void 0 : detail.trades.map(function (item) {
+      selectIds: (detail === null || detail === void 0 ? void 0 : (_detail$trades = detail.trades) === null || _detail$trades === void 0 ? void 0 : _detail$trades.length) === 1 ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
-      showOrderInfo: (_ref = (detail === null || detail === void 0 ? void 0 : detail.trades) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
+      showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
         return {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
@@ -239,13 +269,13 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       })
     },
     wdtGoods: {
-      shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$trades3 = detail.trades) === null || _detail$trades3 === void 0 ? void 0 : (_detail$trades3$find = _detail$trades3.find) === null || _detail$trades3$find === void 0 ? void 0 : (_detail$trades3$find$ = _detail$trades3$find.call(_detail$trades3, function (item) {
+      shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find = currentTrades.find) === null || _currentTrades$find === void 0 ? void 0 : (_currentTrades$find$c = _currentTrades$find.call(currentTrades, function (item) {
         return item.shopNo;
-      })) === null || _detail$trades3$find$ === void 0 ? void 0 : _detail$trades3$find$.shopNo) || null,
-      wdtGoods: updateWdtGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.trades)
+      })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopNo) || null,
+      wdtGoods: updateWdtGoodsHandle(currentTrades)
     },
-    wdtLogistics: updateWdtItemListHandle(detail === null || detail === void 0 ? void 0 : detail.trades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
-    wdtSendGood: updateWdtItemListHandle(detail === null || detail === void 0 ? void 0 : detail.trades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
+    wdtLogistics: updateWdtItemListHandle(currentTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    wdtSendGood: updateWdtItemListHandle(currentTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
     // wdtSingingTime: detail?.receiptDate,
     // wdtSendTime:
     //   detail?.orders?.[0]?.advancedDistributionInfos?.[0]?.deliveryDate,

package/dist/esm/wdt/warehouseData/index.js

@@ -13,11 +13,14 @@ var getWarehouseDataAsync = function getWarehouseDataAsync() {
           var warehouses = (data === null || data === void 0 ? void 0 : data.warehouses) || [];
           warehouses.map(function (_ref) {
             var warehouseNo = _ref.warehouseNo,
-              name = _ref.name;
-            list.push({
-              label: name,
-              value: warehouseNo
-            });
+              name = _ref.name,
+              is_disabled = _ref.is_disabled;
+            if (!is_disabled) {
+              list.push({
+                label: name,
+                value: warehouseNo
+              });
+            }
           });
           pageNo++;
           if (pageSize === warehouses.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -40,7 +40,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7234f433e97adce6c27bbd7c087cb043a1627739",
+  "gitHead": "4561254272f4a9cc7e4adc47be66e2e8c77a49c7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }