@kmkf-fe-packages/kmkf-utils 2.0.31 → 2.0.33

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

@@ -3,6 +3,7 @@ interface RequestProps {
     method: string;
     data: any;
     headers?: any;
+    infoLevel?: "error" | "warning" | "quiet";
     handleError?: (m: string) => void;
 }
 export interface serverProps<T = any> {
@@ -12,5 +13,5 @@ export interface serverProps<T = any> {
     traceId: string;
     [key: string]: any;
 }
-declare const requestApi: <T = any>({ url, method, data, headers, handleError, }: RequestProps) => Promise<serverProps<T>>;
+declare const requestApi: <T = any>({ url, method, data, headers, handleError, infoLevel, }: RequestProps) => Promise<serverProps<T>>;
 export default requestApi;

package/dist/esm/request/index.js

@@ -6,6 +6,7 @@
  * @LastEditTime: 2022-11-24 09:11:45
  */
 import { extend } from "umi-request";
+import { message } from "antd";
 var request = extend({});
 var requestApi = function requestApi(_ref) {
   var url = _ref.url,
@@ -13,7 +14,8 @@ var requestApi = function requestApi(_ref) {
     data = _ref.data,
     _ref$headers = _ref.headers,
     headers = _ref$headers === void 0 ? {} : _ref$headers,
-    handleError = _ref.handleError;
+    handleError = _ref.handleError,
+    infoLevel = _ref.infoLevel;
   return new Promise(function (resolve, reject) {
     var params = {
       method: method,
@@ -28,7 +30,11 @@ var requestApi = function requestApi(_ref) {
       if (res.result === 100 || res.success) {
         resolve(res);
       } else {
-        handleError && handleError(res.message);
+        if (infoLevel === "warning") {
+          message.warn(res.message);
+        } else {
+          handleError && handleError(res.message);
+        }
         reject(res);
       }
     }).catch(function (e) {

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

@@ -1,2 +1,3 @@
-export * from './logisticsData';
-export * from './warehouseData';
+export * from "./logisticsData";
+export * from "./warehouseData";
+export * from "./orderDetailWrap";

package/dist/esm/servers/JST/index.js

@@ -1,2 +1,3 @@
 export * from "./logisticsData";
-export * from "./warehouseData";
+export * from "./warehouseData";
+export * from "./orderDetailWrap";

package/dist/esm/servers/JST/orderDetailWrap.d.ts

@@ -0,0 +1 @@
+export declare const jstOrderDetailWrap: (soId: string) => Promise<any>;

package/dist/esm/servers/JST/orderDetailWrap.js

@@ -0,0 +1,54 @@
+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 request from "../../request";
+var jstOrderDetail = function jstOrderDetail(data) {
+  return request({
+    url: "/qy/gdfw/order/jstOrderDetail",
+    method: "post",
+    data: data,
+    infoLevel: "warning"
+  });
+};
+
+// jst订单详情
+var jstOrderOutList = function jstOrderOutList(data) {
+  return request({
+    url: "/qy/gdfw/jst/erp/orderOut/list",
+    method: "post",
+    data: data,
+    infoLevel: "warning"
+  });
+};
+
+//将订单接口数据转成出库单数据结构
+function jstOrderDetailDataToOrderOutData(res) {
+  return _objectSpread(_objectSpread({}, res), {}, {
+    data: res.data.orders.map(function (order) {
+      return _objectSpread(_objectSpread({}, order), {}, {
+        orderType: order.erpOrderType
+      });
+    })
+  });
+}
+export 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
+    });
+  });
+};

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -306,7 +306,11 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
 
 // TODO: 确定合并单，例如: WDT根据订单号请求返回的srcTid会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
 export var filterJstOrders = function filterJstOrders(detail, order_no) {
-  var currentTrades = (detail === null || detail === void 0 ? void 0 : detail.orderList) || [];
+  var currentTrades = ((detail === null || detail === void 0 ? void 0 : detail.orderList) || []).map(function (item) {
+    return _objectSpread(_objectSpread({}, item), {}, {
+      oId: String(item.oId)
+    });
+  });
   // .filter(
   //   (item: Record<string, any>) => item?.dealCode === order_no
   // );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.0.31",
+  "version": "2.0.33",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9949d9dba69050ca4d79465016cb1ef515db1617",
+  "gitHead": "2df2af4a37692a99ec89a3463f05e87d10e0f632",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }