@kmkf-fe-packages/kmkf-utils 2.9.1-beta.14 → 2.9.1-beta.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -53,6 +53,7 @@ _defineProperty(GyAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#__
53
53
  instance = GyAddressData.getInstance();
54
54
  if (!GyAddressData.initSingleton) {
55
55
  GyAddressData.initSingleton = queryGyAddressData().catch(function (e) {
56
+ console.warn("init gy data e", e);
56
57
  GyAddressData.initSingleton = null;
57
58
  });
58
59
  }
@@ -53,6 +53,7 @@ _defineProperty(JkyAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
53
53
  instance = JkyAddressData.getInstance();
54
54
  if (!JkyAddressData.initSingleton) {
55
55
  JkyAddressData.initSingleton = queryJkyAddressData().catch(function (e) {
56
+ console.warn("init jst data e", e);
56
57
  JkyAddressData.initSingleton = null;
57
58
  });
58
59
  }
@@ -53,6 +53,7 @@ _defineProperty(JstAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
53
53
  instance = JstAddressData.getInstance();
54
54
  if (!JstAddressData.initSingleton) {
55
55
  JstAddressData.initSingleton = queryJstAddressData().catch(function (e) {
56
+ console.warn("init jst data e", e);
56
57
  JstAddressData.initSingleton = null;
57
58
  });
58
59
  }
@@ -53,6 +53,7 @@ _defineProperty(WdtAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
53
53
  instance = WdtAddressData.getInstance();
54
54
  if (!WdtAddressData.initSingleton) {
55
55
  WdtAddressData.initSingleton = queryWdtAddressData().catch(function (e) {
56
+ console.warn("init wdt data e", e);
56
57
  WdtAddressData.initSingleton = null;
57
58
  });
58
59
  }
@@ -20,7 +20,9 @@ var logisticsAddressData = /*#__PURE__*/function () {
20
20
  }).then(function (res) {
21
21
  var data = res.data;
22
22
  _this.addressData = data;
23
- }).catch(function (e) {});
23
+ }).catch(function (e) {
24
+ console.log(e);
25
+ });
24
26
  });
25
27
  _defineProperty(this, "getAddressData", function () {
26
28
  var _this$addressData;
@@ -17,7 +17,9 @@ var showErrorMessage = function showErrorMessage(res, options) {
17
17
  message.warning(msg);
18
18
  } else if (infoLevel === "error") {
19
19
  message.error(msg);
20
- } else {}
20
+ } else {
21
+ console.error(msg, res, options);
22
+ }
21
23
  };
22
24
  var requestApi = function requestApi(_ref) {
23
25
  var url = _ref.url,
@@ -70,7 +70,9 @@ export var getSupplierSingleton = /*#__PURE__*/function () {
70
70
  });
71
71
  });
72
72
  }
73
- }).catch(function (err) {});
73
+ }).catch(function (err) {
74
+ console.error(err);
75
+ });
74
76
  }));
75
77
  case 8:
76
78
  return _context.abrupt("return", supplierMap);
@@ -51,13 +51,14 @@ export var getOrderSubFormDataAsync = /*#__PURE__*/function () {
51
51
  return _regeneratorRuntime().wrap(function _callee$(_context) {
52
52
  while (1) switch (_context.prev = _context.next) {
53
53
  case 0:
54
- _context.next = 2;
54
+ console.log("params", params);
55
+ _context.next = 3;
55
56
  return queryOrderSubFormList(params);
56
- case 2:
57
+ case 3:
57
58
  result = _context.sent;
58
59
  orderSubFormList = (result === null || result === void 0 ? void 0 : result.data) || [];
59
60
  return _context.abrupt("return", orderSubFormList);
60
- case 5:
61
+ case 6:
61
62
  case "end":
62
63
  return _context.stop();
63
64
  }
@@ -22,6 +22,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
22
22
  case 0:
23
23
  _context.next = 2;
24
24
  return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
25
+ console.log("发货仓数据---", _this.platform, list);
25
26
  _this.sendData = list;
26
27
  });
27
28
  case 2:
@@ -151,6 +151,7 @@ exports.gyOrderTransform = function (detail, form) {
151
151
  });
152
152
  var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
153
153
  var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
154
+ console.log("触发---getGyOrderList--4");
154
155
  return {
155
156
  gySystemOrder: {
156
157
  orderNo: orderNo,
@@ -196,6 +196,7 @@ export var updateJkyGoodsHandle = function updateJkyGoodsHandle() {
196
196
  var productDates = [];
197
197
  var expireDates = [];
198
198
  if (config.orderBackGoodsLevel !== "2" && next.tradeOrderAssemblyGoodsDtoList && next.tradeOrderAssemblyGoodsDtoList.length) {
199
+ var goodsList = next.goodsDetail;
199
200
  next.tradeOrderAssemblyGoodsDtoList.forEach(function (subItem) {
200
201
  var _next$assemblyGoodsDe;
201
202
  subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
@@ -207,6 +208,10 @@ export var updateJkyGoodsHandle = function updateJkyGoodsHandle() {
207
208
  subItem.batchNo = batchNos.join(",");
208
209
  subItem.productDate = productDates.join(",");
209
210
  subItem.expireDate = expireDates.join(",");
211
+ var goodsItem = goodsList.find(function (goodItem) {
212
+ return goodItem.subTradeId === subItem.subTradeId;
213
+ });
214
+ subItem.sourceSubtradeNo = goodsItem.sourceSubtradeNo;
210
215
  prv.push(subItem);
211
216
  });
212
217
  } else {
@@ -281,6 +286,7 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
281
286
  logisticCode: next === null || next === void 0 ? void 0 : next.logisticCode,
282
287
  logisticNo: next === null || next === void 0 ? void 0 : next.mainPostid
283
288
  }];
289
+ console.log("packageDetailList", next, next.logisticCode, packageDetailList);
284
290
  var packageDetails = (packageDetailList || []).map(function (t) {
285
291
  return {
286
292
  items: items,
@@ -289,6 +295,7 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
289
295
  logisticsCode: t === null || t === void 0 ? void 0 : t.logisticNo
290
296
  };
291
297
  });
298
+ console.log("packageDetails", packageDetails);
292
299
  prv.push.apply(prv, _toConsumableArray(packageDetails));
293
300
  } else if (type === "send") {
294
301
  var params = {
@@ -189,9 +189,7 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
189
189
  return (list || []).map(function (item) {
190
190
  var _item$uuid;
191
191
  item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
192
- var sysItemOuterId = config.orderBackGoodsLevel !== "2" ? item.detailSysItemOuterId : item.sysItemOuterId;
193
192
  return _objectSpread(_objectSpread({}, item), {}, {
194
- sysItemOuterId: sysItemOuterId,
195
193
  sysTitle: item.title,
196
194
  title: item.platformTitle,
197
195
  num: item.itemNum || item.num,
@@ -215,6 +213,7 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
215
213
  subItem.suits.forEach(function (suit) {
216
214
  suit.systemOrderNo = next === null || next === void 0 ? void 0 : next.sid;
217
215
  suit.outerSkuId = suit === null || suit === void 0 ? void 0 : suit.outerId;
216
+ suit.sysItemOuterId = suit === null || suit === void 0 ? void 0 : suit.detailSysItemOuterId;
218
217
  });
219
218
  prv.push.apply(prv, _toConsumableArray(subItem.suits));
220
219
  } else {
@@ -416,6 +415,10 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
416
415
  var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
417
416
  var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
418
417
  var isReissueDefaultSelect = !!(kmReissueCom !== null && kmReissueCom !== void 0 && (_kmReissueCom$compone = kmReissueCom.componentConfig) !== null && _kmReissueCom$compone !== void 0 && _kmReissueCom$compone.showDefaultSelect);
418
+ console.log("kmOrderTransform---", {
419
+ detail: detail,
420
+ componentList: componentList
421
+ });
419
422
  var kmGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
420
423
  return item.workOrderComponentType === "KM_GOODS";
421
424
  })) === null || _componentList$find === void 0 ? void 0 : (_componentList$find$c = _componentList$find.componentConfig) === null || _componentList$find$c === void 0 ? void 0 : _componentList$find$c.orderBackGoodsLevel;
@@ -445,6 +448,7 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
445
448
  var shouldOrderBackSelectedGoods = !!matchedSystemOrders.length || onlyOneSystemOrder;
446
449
  if (shouldOrderBackSelectedGoods && selectedSystemOrders.length && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
447
450
  kmPosting = handleKmAddressIdentify(selectedSystemOrders[0]);
451
+ console.log("kmPosting", kmPosting);
448
452
  }
449
453
  return {
450
454
  kmSystemOrderNo: selectedSystemOrderNo,
@@ -290,6 +290,7 @@ export default (function (_ref) {
290
290
  var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
291
291
  var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
292
292
  var jkyValues = detail["jkyOrder"] ? jkyOrderBackFormValues(detail["jkyOrder"], templateDetail) : {};
293
+ console.log("jkyValues", detail, jkyValues);
293
294
  //不判断是否存在detail["skxOrder"],不存在直接清空所有skx相关组件值
294
295
  var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
295
296
  var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};
@@ -473,6 +473,7 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
473
473
  case "WDT_RETURN_BILL_NO":
474
474
  {
475
475
  if (config.orderBackRule === "platformOrderNumber") {
476
+ console.log("4343434");
476
477
  prv[uniqueKey] = (detail === null || detail === void 0 ? void 0 : detail.wdtReturnSystemOrder) || [];
477
478
  }
478
479
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.9.1-beta.14",
3
+ "version": "2.9.1-beta.16",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -41,7 +41,7 @@
41
41
  "publishConfig": {
42
42
  "access": "public"
43
43
  },
44
- "gitHead": "af085aafcfe80aee6c561305fe508ee5252399ff",
44
+ "gitHead": "0d4c65d4544173d9f760d4677cc695763cf78792",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }