@kmkf-fe-packages/kmkf-utils 2.0.19-beta.3 → 2.0.19-beta.30

package/README.md

@@ -1 +1 @@
-1112263322
+111226332211

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/gyOrderBackFormValues.js

@@ -242,7 +242,7 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var testIndex = arguments.length > 2 ? arguments[2] : undefined;
   return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-    var _detail$gyGoods, _detail$gySystemOrder, _detail$gySystemOrder2, _detail$gySystemOrder3, _detail$gySystemOrder4, _detail$gySystemOrder5, _detail$gySystemOrder6, _detail$gyGoods2, _detail$gySystemOrder7, _detail$gySystemOrder8, _detail$gySystemOrder9, _detail$gySystemOrder10, _detail$gySystemOrder11, _detail$gySystemOrder12;
+    var _detail$gyGoods, _detail$gySystemOrder, _detail$gySystemOrder2, _detail$gySystemOrder3, _detail$gySystemOrder4, _detail$gySystemOrder5, _detail$gySystemOrder6, _detail$gyGoods2, _detail$gySystemOrder7, _detail$gySystemOrder8, _detail$gySystemOrder9, _detail$gySystemOrder10, _detail$gySystemOrder11, _detail$gySystemOrder12, _detail$gyGoods3, _detail$gySystemOrder13, _detail$gySystemOrder14, _detail$gySystemOrder15, _detail$gySystemOrder16, _detail$gySystemOrder17, _detail$gySystemOrder18;
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
     switch (next.workOrderComponentType) {
@@ -283,6 +283,7 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
           gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
           gyReturnGoods: detail === null || detail === void 0 ? void 0 : detail.gyReturnGoods,
           gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
+          shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods3 = detail.gyGoods) === null || _detail$gyGoods3 === void 0 ? void 0 : _detail$gyGoods3.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder13 = detail.gySystemOrder) === null || _detail$gySystemOrder13 === void 0 ? void 0 : (_detail$gySystemOrder14 = _detail$gySystemOrder13.orders) === null || _detail$gySystemOrder14 === void 0 ? void 0 : (_detail$gySystemOrder15 = _detail$gySystemOrder14[0]) === null || _detail$gySystemOrder15 === void 0 ? void 0 : _detail$gySystemOrder15.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder16 = detail.gySystemOrder) === null || _detail$gySystemOrder16 === void 0 ? void 0 : (_detail$gySystemOrder17 = _detail$gySystemOrder16.showOrderInfo) === null || _detail$gySystemOrder17 === void 0 ? void 0 : (_detail$gySystemOrder18 = _detail$gySystemOrder17[0]) === null || _detail$gySystemOrder18 === void 0 ? void 0 : _detail$gySystemOrder18.shopCode),
           gyReturnType: ["1"]
         };
         break;

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -110,9 +110,10 @@ var updateJstItemListHandle = function updateJstItemListHandle(list, type, comLi
       params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticsCompany;
       params.logisticsCode = next === null || next === void 0 ? void 0 : next.lId;
     } else if (type === "send") {
-      params.sendId = next === null || next === void 0 ? void 0 : next.wmsCoId;
-      params.sendName = (next === null || next === void 0 ? void 0 : next.wmsCoId) && SendDataCenter.getInstance("jst").getSendNameByCode(next === null || next === void 0 ? void 0 : next.wmsCoId);
-      params.sendSnapshotId = next === null || next === void 0 ? void 0 : next.wmsCoId;
+      var wmsCoId = (next === null || next === void 0 ? void 0 : next.wmsCoId) === "0" ? "" : next === null || next === void 0 ? void 0 : next.wmsCoId;
+      params.sendId = wmsCoId;
+      params.sendName = wmsCoId && SendDataCenter.getInstance("jst").getSendNameByCode(wmsCoId);
+      params.sendSnapshotId = wmsCoId;
     } else if (type === "supply") {
       params.supplyId = next === null || next === void 0 ? void 0 : next.drpCoIdTo;
       params.supplyName = next === null || next === void 0 ? void 0 : next.drpCoName;
@@ -305,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/dist/esm/utils/pushGyLog.js

@@ -1,14 +1,36 @@
 import Monitor from "kmkf-monitor";
 import { cloneDeep } from "lodash";
+import moment from "moment";
 export default (function (name, content) {
-  var _JSON$parse, _JSON$parse$workOrder, _JSON$parse$workOrder2;
-  var spmParam = typeof content === "string" ? content : JSON.stringify(Object.prototype.toString.call(content) === "[object Object]" ? cloneDeep(content) : {});
-  var reduxData_test = window.sessionStorage.getItem("reduxData_test");
-  if (!reduxData_test) return;
-  if (((_JSON$parse = JSON.parse(reduxData_test)) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$workOrder = _JSON$parse.workOrder) === null || _JSON$parse$workOrder === void 0 ? void 0 : (_JSON$parse$workOrder2 = _JSON$parse$workOrder.userInfo) === null || _JSON$parse$workOrder2 === void 0 ? void 0 : _JSON$parse$workOrder2.companyKey) !== "GRYUA7YIY2F6SQFESMJY3O4E") return;
-  console.log("\u57CB\u70B9gyLog_".concat(name));
-  Monitor.sendClick({
-    spmClick: "gyLog_".concat(name),
-    spmParam: spmParam
-  });
+  try {
+    var _sessionStorage$getIt;
+    var spmParam = typeof content === "string" ? content : JSON.stringify(Object.prototype.toString.call(content) === "[object Object]" || Array.isArray(content) ? cloneDeep(content) : {
+      null: null
+    });
+    var companyKey_test = sessionStorage.getItem("companyKey_test");
+    var order_no_test = sessionStorage.getItem("order_no_test");
+    console.log("\u65E5\u5FD7\uFF1AgyLog_".concat(order_no_test, "_").concat(name), {
+      spmParam: spmParam
+    });
+    var sessionStorage_test = (_sessionStorage$getIt = sessionStorage.getItem("sessionStorage_test_list")) !== null && _sessionStorage$getIt !== void 0 ? _sessionStorage$getIt : "[]";
+    var sessionStorage_test_list = JSON.parse(sessionStorage_test);
+    sessionStorage_test_list.push({
+      a_name: "\u65E5\u5FD7\uFF1AgyLog_".concat(order_no_test, "_").concat(name),
+      b_time: moment(new Date().getTime()).format("YYYY-MM-DD hh:mm:ss"),
+      c_content: content
+    });
+    sessionStorage.setItem("sessionStorage_test_list", JSON.stringify(sessionStorage_test_list.slice(sessionStorage_test_list.length - 100, sessionStorage_test_list.length)));
+    if (!companyKey_test || companyKey_test == "undefined" || companyKey_test == "null") return;
+    if (companyKey_test !== "GRYUA7YIY2F6SQFESMJY3O4E") return;
+    Monitor.sendClick({
+      spmClick: "gyLog_".concat(order_no_test, "_").concat(name),
+      spmParam: spmParam
+    });
+  } catch (error) {
+    console.log("gyLog_error", error);
+    Monitor.sendClick({
+      spmClick: "gyLog_error",
+      spmParam: error
+    });
+  }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.0.19-beta.3",
+  "version": "2.0.19-beta.30",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "955adf4b04a4f127fb61b5640b4b1196dec5f608",
+  "gitHead": "9a17bb9b438894b0d35456807efebdf6dd7393bc",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }