@kmkf-fe-packages/kmkf-work-order-service-component 2.0.17 → 2.0.18

package/dist/esm/common/utils/tools_constants.js

@@ -1,5 +1,11 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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 { HasFilterHandle } from "./tools";
-import { jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail } from "../../model/servers/api";
+import { jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, jstOrderOutList } from "../../model/servers/api";
 var orderBackKeyListMap = {
   hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
   hasBs: ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO'],
@@ -9,6 +15,37 @@ var orderBackKeyListMap = {
   hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
   hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS']
 };
+
+/**
+ * 将订单接口数据转成出库单数据结构
+ */
+function jstOrderDetailDataToOrderOutData(res) {
+  return _objectSpread(_objectSpread({}, res), {}, {
+    data: res.data.orders.map(function (order) {
+      return _objectSpread(_objectSpread({}, order), {}, {
+        orderType: order.erpOrderType
+      });
+    })
+  });
+}
+var jstOrderDetailWrap = function jstOrderDetailWrap(soId) {
+  return jstOrderDetail({
+    soId: soId
+  }).then(function (res) {
+    var _res$data, _res$data$orders;
+    if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$orders = _res$data.orders) !== null && _res$data$orders !== void 0 && _res$data$orders.length)) {
+      return jstOrderOutList({
+        soId: soId
+      });
+    }
+    return jstOrderDetailDataToOrderOutData(res);
+  }).catch(function (e) {
+    // console.log('***** in e', e);
+    return jstOrderOutList({
+      soId: soId
+    });
+  });
+};
 export var orderBackMap = function orderBackMap(_ref) {
   var templateDetail = _ref.templateDetail,
     order_no = _ref.order_no;
@@ -17,9 +54,7 @@ export var orderBackMap = function orderBackMap(_ref) {
     hasJst: {
       flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJst),
       promiseRequest: function promiseRequest() {
-        return jstOrderDetail({
-          soId: order_no
-        });
+        return jstOrderDetailWrap(order_no);
       }
     },
     //判断是否有百胜组件 有就请求bs订单接口

package/dist/esm/model/servers/api.d.ts

@@ -59,6 +59,7 @@ export declare const addLogicFlowWorkOrder: (data: any) => Promise<any>;
 export declare const queryAllWorkOrderList: (s: string, data: any) => Promise<any>;
 export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
 export declare const jstOrderDetail: (data: any) => Promise<any>;
+export declare const jstOrderOutList: (data: any) => Promise<any>;
 export declare const bsOrderDetail: (data: any) => Promise<any>;
 export declare const wdtOrderDetail: (data: any) => Promise<any>;
 export declare const bsE3OrderDetail: (data: any) => Promise<any>;

package/dist/esm/model/servers/api.js

@@ -361,6 +361,16 @@ export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
 };
 // jst订单详情
 export var jstOrderDetail = function jstOrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/order/jstOrderDetail',
+    method: 'post',
+    data: data,
+    infoLevel: 'warning'
+  });
+};
+
+// jst订单详情
+export var jstOrderOutList = function jstOrderOutList(data) {
   return request({
     url: '/qy/gdfw/jst/erp/orderOut/list',
     method: 'post',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.0.17",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.17",
-    "@kmkf-fe-packages/services-components": "2.0.17",
+    "@kmkf-fe-packages/basic-components": "2.0.18",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.18",
+    "@kmkf-fe-packages/services-components": "2.0.18",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5c8da8bf3e0ca213a31946282f6c6411167589d5",
+  "gitHead": "6b9ac6412c233e92616caf732da997ece8ae946e",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }