@kmkf-fe-packages/kmkf-work-order-service-component 2.7.2 → 2.7.3-beta.0

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.
@@ -40,7 +40,7 @@ export var FLOW_STATUS_V2 = {
40
40
  RETURNING: '回退中'
41
41
  };
42
42
  //不能回填的组件type
43
- export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'ERP_REMARK', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'JKY_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'SWAP_OUT_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
43
+ export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'ERP_REMARK', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'WLN_WAREHOUSING_STATUS', 'JKY_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'SWAP_OUT_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
44
44
  export var verifyHandle = function verifyHandle(data, componentDtoList) {
45
45
  var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
46
46
  var res = {
@@ -3,6 +3,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
3
3
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
4
4
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
5
5
  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); }
6
+ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
6
7
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
7
8
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
8
9
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -411,7 +412,7 @@ var FormRender = function FormRender(props, ref) {
411
412
  }, [labelComponent, record]);
412
413
  var queryDetail = /*#__PURE__*/function () {
413
414
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
414
- var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, _record$jsonMap3, _userInfo$companyUser3, _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _record$jsonMap4, _record$jsonMap5, currentNodeTradeIdUniqueKey, _currentNodeTid, currentNodeExpressLogisticsCodeKey, currentNodeLogisticsCode, isSkx, _userInfo, companyUserConfig, hasWdt, preTradeId, tradeId, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
415
+ var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, _record$jsonMap3, _record$jsonMap4, currentNodeTradeIdUniqueKey, _currentNodeTid, logisticsOrderBackSources, lastLogisticsOrderBackSource, preTradeId, tradeId, isSkx, _iterator, _step, source, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
415
416
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
416
417
  while (1) switch (_context2.prev = _context2.next) {
417
418
  case 0:
@@ -441,7 +442,7 @@ var FormRender = function FormRender(props, ref) {
441
442
  return prv;
442
443
  }, {});
443
444
  if (!workOrderId) {
444
- _context2.next = 58;
445
+ _context2.next = 78;
445
446
  break;
446
447
  }
447
448
  // 先初始化端上内容
@@ -474,26 +475,45 @@ var FormRender = function FormRender(props, ref) {
474
475
  // TODO: 非开始节点录入,都会有workOrderId,这里判断是否有前置组件含有订单号;如果存在订单号,进行订单反填。
475
476
  tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
476
477
  if (!notAutoFillFlag) {
477
- _context2.next = 54;
478
+ _context2.next = 74;
478
479
  break;
479
480
  }
480
481
  currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
481
482
  _currentNodeTid = record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(currentNodeTradeIdUniqueKey, "_tradeId")];
482
- currentNodeExpressLogisticsCodeKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'EXPRESS_LOGISTICS_SELECT');
483
- currentNodeLogisticsCode = record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(currentNodeExpressLogisticsCodeKey, "_expressLogisticsCode")];
484
- isSkx = ['TR3E2FYXFZCFANVG6O6AALSM'].includes(companyKey); // SKX 特殊处理逻辑
485
- _userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
486
- companyUserConfig = (_userInfo$companyUser3 = _userInfo === null || _userInfo === void 0 ? void 0 : _userInfo.companyUserConfig) !== null && _userInfo$companyUser3 !== void 0 ? _userInfo$companyUser3 : {};
487
- hasWdt = (_companyUserConfig$pl = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.wdt) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false;
488
- preTradeId = tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap4 = record.jsonMap) !== null && _record$jsonMap4 !== void 0 && _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill ? record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")] : undefined;
483
+ logisticsOrderBackSources = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (cur, component) {
484
+ if (component.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
485
+ var _initialValues$compon;
486
+ var logisticsCode = (_initialValues$compon = initialValues[component.uniqueKey]) === null || _initialValues$compon === void 0 ? void 0 : _initialValues$compon.order;
487
+ if (logisticsCode) {
488
+ cur.push({
489
+ logisticsCode: logisticsCode,
490
+ uniqueKey: component.uniqueKey
491
+ });
492
+ }
493
+ }
494
+ if (component.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
495
+ var _initialValues$compon2;
496
+ var _logisticsCode = (_initialValues$compon2 = initialValues[component.uniqueKey]) === null || _initialValues$compon2 === void 0 ? void 0 : _initialValues$compon2.interceptCode;
497
+ if (_logisticsCode) {
498
+ cur.push({
499
+ logisticsCode: _logisticsCode,
500
+ uniqueKey: component.uniqueKey
501
+ });
502
+ }
503
+ }
504
+ return cur;
505
+ }, []);
506
+ lastLogisticsOrderBackSource = logisticsOrderBackSources[logisticsOrderBackSources.length - 1];
507
+ preTradeId = tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap3 = record.jsonMap) !== null && _record$jsonMap3 !== void 0 && _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill ? record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")] : undefined;
489
508
  tradeId = _currentNodeTid || preTradeId;
509
+ isSkx = ['TR3E2FYXFZCFANVG6O6AALSM'].includes(companyKey); // SKX 特殊处理逻辑
490
510
  if (!tradeId) {
491
- _context2.next = 38;
511
+ _context2.next = 35;
492
512
  break;
493
513
  }
494
514
  queryLabels(tradeId, shopId);
495
515
  queryMemberLevels(tradeId, shopId);
496
- _context2.next = 36;
516
+ _context2.next = 33;
497
517
  return orderBack({
498
518
  companyKey: companyKey,
499
519
  order_no: tradeId,
@@ -505,17 +525,19 @@ var FormRender = function FormRender(props, ref) {
505
525
  fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
506
526
  plat: plat,
507
527
  callKey: 1,
508
- setLoading: setLoading
528
+ setLoading: setLoading,
529
+ wdtMatchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
530
+ skipOrderBackUniqueKeys: lastLogisticsOrderBackSource !== null && lastLogisticsOrderBackSource !== void 0 && lastLogisticsOrderBackSource.uniqueKey ? [lastLogisticsOrderBackSource.uniqueKey] : []
509
531
  });
510
- case 36:
511
- _context2.next = 51;
532
+ case 33:
533
+ _context2.next = 71;
512
534
  break;
513
- case 38:
535
+ case 35:
514
536
  if (!isSkx) {
515
- _context2.next = 44;
537
+ _context2.next = 41;
516
538
  break;
517
539
  }
518
- _context2.next = 41;
540
+ _context2.next = 38;
519
541
  return skxOrderBack({
520
542
  form: form,
521
543
  companyKey: companyKey,
@@ -523,40 +545,91 @@ var FormRender = function FormRender(props, ref) {
523
545
  componentOnBlur: componentOnBlur,
524
546
  jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
525
547
  });
526
- case 41:
548
+ case 38:
527
549
  // 售后单反填
528
550
  afterSaleOrderBack(form, templateDetail);
529
- _context2.next = 51;
551
+ _context2.next = 71;
530
552
  break;
531
- case 44:
532
- if (!(hasWdt && currentNodeLogisticsCode)) {
533
- _context2.next = 50;
553
+ case 41:
554
+ if (!logisticsOrderBackSources.length) {
555
+ _context2.next = 62;
534
556
  break;
535
557
  }
536
- // 售后单反填
558
+ _iterator = _createForOfIteratorHelper(logisticsOrderBackSources);
559
+ _context2.prev = 43;
560
+ _iterator.s();
561
+ case 45:
562
+ if ((_step = _iterator.n()).done) {
563
+ _context2.next = 52;
564
+ break;
565
+ }
566
+ source = _step.value;
537
567
  afterSaleOrderBack(form, templateDetail);
538
- _context2.next = 48;
539
- return componentOnBlur(currentNodeLogisticsCode, 'expressLogisticsCode');
540
- case 48:
541
- _context2.next = 51;
542
- break;
568
+ _context2.next = 50;
569
+ return onBlurExpressLogisticsCode({
570
+ form: form,
571
+ value: source.logisticsCode,
572
+ templateDetail: templateDetail,
573
+ setKmLoading: setKmLoading,
574
+ componentOnBlur: componentOnBlur,
575
+ sourceUniqueKey: source.uniqueKey
576
+ });
543
577
  case 50:
578
+ _context2.next = 45;
579
+ break;
580
+ case 52:
581
+ _context2.next = 57;
582
+ break;
583
+ case 54:
584
+ _context2.prev = 54;
585
+ _context2.t0 = _context2["catch"](43);
586
+ _iterator.e(_context2.t0);
587
+ case 57:
588
+ _context2.prev = 57;
589
+ _iterator.f();
590
+ return _context2.finish(57);
591
+ case 60:
592
+ _context2.next = 71;
593
+ break;
594
+ case 62:
544
595
  // 售后单反填
545
596
  afterSaleOrderBack(form, templateDetail);
546
- case 51:
597
+ if (!isSkx) {
598
+ _context2.next = 68;
599
+ break;
600
+ }
601
+ _context2.next = 66;
602
+ return skxOrderBack({
603
+ form: form,
604
+ companyKey: companyKey,
605
+ templateDetail: templateDetail,
606
+ componentOnBlur: componentOnBlur,
607
+ jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
608
+ });
609
+ case 66:
610
+ _context2.next = 71;
611
+ break;
612
+ case 68:
613
+ if (!(hasWdt && currentNodeLogisticsCode)) {
614
+ _context2.next = 71;
615
+ break;
616
+ }
617
+ _context2.next = 71;
618
+ return componentOnBlur(currentNodeLogisticsCode, 'expressLogisticsCode');
619
+ case 71:
547
620
  // 仅在依赖值有值且映射值为空时触发一次映射
548
621
  batchFillByMappingWhenTargetEmpty(initialValues);
549
- _context2.next = 56;
622
+ _context2.next = 76;
550
623
  break;
551
- case 54:
624
+ case 74:
552
625
  // 如果没有订单反填,则单独更新remark
553
626
  fetchRemark(shopId, currentNodeTid);
554
627
  // 售后单反填
555
628
  afterSaleOrderBack(form, templateDetail);
556
- case 56:
557
- _context2.next = 82;
629
+ case 76:
630
+ _context2.next = 102;
558
631
  break;
559
- case 58:
632
+ case 78:
560
633
  fillByShopId(shopId);
561
634
  initFormValues = null;
562
635
  if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -575,7 +648,7 @@ var FormRender = function FormRender(props, ref) {
575
648
 
576
649
  // console.log(orderNo, initFormValues);
577
650
  if (!initFormValues) {
578
- _context2.next = 69;
651
+ _context2.next = 89;
579
652
  break;
580
653
  }
581
654
  form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -592,9 +665,9 @@ var FormRender = function FormRender(props, ref) {
592
665
  _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
593
666
  }
594
667
  fetchRemark(_shopId, _orderNo);
595
- _context2.next = 82;
668
+ _context2.next = 102;
596
669
  break;
597
- case 69:
670
+ case 89:
598
671
  _transData = calcWorkOrderList([{
599
672
  jsonMap: jsonMap
600
673
  }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -606,12 +679,12 @@ var FormRender = function FormRender(props, ref) {
606
679
  batchFillByMapping(_initialValues);
607
680
  //如果有订单号 订单返填 通过订单号入口进行工单录入,需要将订单数据反填到工单
608
681
  if (!(orderNo && shopId)) {
609
- _context2.next = 80;
682
+ _context2.next = 100;
610
683
  break;
611
684
  }
612
685
  queryLabels(orderNo, shopId);
613
686
  queryMemberLevels(orderNo, shopId);
614
- _context2.next = 78;
687
+ _context2.next = 98;
615
688
  return orderBack({
616
689
  companyKey: companyKey,
617
690
  order_no: orderNo,
@@ -626,15 +699,15 @@ var FormRender = function FormRender(props, ref) {
626
699
  callKey: 2,
627
700
  setLoading: setLoading
628
701
  });
629
- case 78:
630
- _context2.next = 82;
702
+ case 98:
703
+ _context2.next = 102;
631
704
  break;
632
- case 80:
705
+ case 100:
633
706
  // 如果没有订单反填,则单独更新remark
634
707
  fetchRemark(shopId, currentNodeTid);
635
708
  // 售后单反填
636
709
  afterSaleOrderBack(form, templateDetail);
637
- case 82:
710
+ case 102:
638
711
  antFormEl = document.getElementsByClassName('ant-form');
639
712
  (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
640
713
  resetMappingHideComponents();
@@ -643,11 +716,11 @@ var FormRender = function FormRender(props, ref) {
643
716
  type: 'setaAutoSubmitFlag',
644
717
  payload: true
645
718
  });
646
- case 86:
719
+ case 106:
647
720
  case "end":
648
721
  return _context2.stop();
649
722
  }
650
- }, _callee2);
723
+ }, _callee2, null, [[43, 54, 57, 60]]);
651
724
  }));
652
725
  return function queryDetail(_x4) {
653
726
  return _ref3.apply(this, arguments);
@@ -895,7 +968,7 @@ var FormRender = function FormRender(props, ref) {
895
968
 
896
969
  //订单返填
897
970
  var changeHandle = /*#__PURE__*/function () {
898
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_no) {
971
+ var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_no, options) {
899
972
  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
900
973
  while (1) switch (_context5.prev = _context5.next) {
901
974
  case 0:
@@ -928,7 +1001,9 @@ var FormRender = function FormRender(props, ref) {
928
1001
  }, 0);
929
1002
  },
930
1003
  callKey: 3,
931
- setLoading: setLoading
1004
+ setLoading: setLoading,
1005
+ wdtMatchLogisticsNo: options === null || options === void 0 ? void 0 : options.wdtMatchLogisticsNo,
1006
+ skipOrderBackUniqueKeys: options === null || options === void 0 ? void 0 : options.skipOrderBackUniqueKeys
932
1007
  });
933
1008
  case 5:
934
1009
  case "end":
@@ -936,7 +1011,7 @@ var FormRender = function FormRender(props, ref) {
936
1011
  }
937
1012
  }, _callee5);
938
1013
  }));
939
- return function changeHandle(_x9) {
1014
+ return function changeHandle(_x9, _x10) {
940
1015
  return _ref6.apply(this, arguments);
941
1016
  };
942
1017
  }();
@@ -1046,7 +1121,7 @@ var FormRender = function FormRender(props, ref) {
1046
1121
 
1047
1122
  //组件失焦事件
1048
1123
  var componentOnBlur = /*#__PURE__*/function () {
1049
- var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type, uniqueKey) {
1124
+ var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type, uniqueKey, options) {
1050
1125
  var promises;
1051
1126
  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
1052
1127
  while (1) switch (_context6.prev = _context6.next) {
@@ -1072,36 +1147,43 @@ var FormRender = function FormRender(props, ref) {
1072
1147
  setKmLoading: setKmLoading
1073
1148
  });
1074
1149
  case 4:
1075
- _context6.next = 49;
1150
+ _context6.next = 58;
1076
1151
  break;
1077
1152
  case 6:
1078
1153
  if (!(type === 'expressLogisticsCode')) {
1079
- _context6.next = 16;
1154
+ _context6.next = 18;
1155
+ break;
1156
+ }
1157
+ if ("".concat(value || '').trim()) {
1158
+ _context6.next = 9;
1080
1159
  break;
1081
1160
  }
1082
- _context6.next = 9;
1161
+ return _context6.abrupt("return");
1162
+ case 9:
1163
+ _context6.next = 11;
1083
1164
  return onBlurExpressLogisticsCode({
1084
1165
  form: form,
1085
1166
  value: value,
1086
1167
  templateDetail: templateDetail,
1087
1168
  setKmLoading: setKmLoading,
1088
- componentOnBlur: componentOnBlur
1169
+ componentOnBlur: componentOnBlur,
1170
+ sourceUniqueKey: uniqueKey
1089
1171
  });
1090
- case 9:
1172
+ case 11:
1091
1173
  if (!['TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
1092
1174
  ].includes(companyKey)) {
1093
- _context6.next = 12;
1175
+ _context6.next = 14;
1094
1176
  break;
1095
1177
  }
1096
- _context6.next = 12;
1178
+ _context6.next = 14;
1097
1179
  return onBlurSkxLogisticsCode({
1098
1180
  form: form,
1099
1181
  value: value,
1100
1182
  templateDetail: templateDetail,
1101
1183
  componentOnBlur: componentOnBlur
1102
1184
  });
1103
- case 12:
1104
- _context6.next = 14;
1185
+ case 14:
1186
+ _context6.next = 16;
1105
1187
  return onBlurReturnLogisticsCode({
1106
1188
  form: form,
1107
1189
  value: value,
@@ -1109,15 +1191,38 @@ var FormRender = function FormRender(props, ref) {
1109
1191
  componentOnBlur: componentOnBlur,
1110
1192
  orderBackRule: 'outSid'
1111
1193
  });
1112
- case 14:
1113
- _context6.next = 49;
1114
- break;
1115
1194
  case 16:
1116
- if (!(type === 'returnLogisticsCode')) {
1195
+ _context6.next = 58;
1196
+ break;
1197
+ case 18:
1198
+ if (!(type === 'interceptCode')) {
1199
+ _context6.next = 25;
1200
+ break;
1201
+ }
1202
+ if ("".concat(value || '').trim()) {
1117
1203
  _context6.next = 21;
1118
1204
  break;
1119
1205
  }
1120
- _context6.next = 19;
1206
+ return _context6.abrupt("return");
1207
+ case 21:
1208
+ _context6.next = 23;
1209
+ return onBlurExpressLogisticsCode({
1210
+ form: form,
1211
+ value: value,
1212
+ templateDetail: templateDetail,
1213
+ setKmLoading: setKmLoading,
1214
+ componentOnBlur: componentOnBlur,
1215
+ sourceUniqueKey: uniqueKey
1216
+ });
1217
+ case 23:
1218
+ _context6.next = 58;
1219
+ break;
1220
+ case 25:
1221
+ if (!(type === 'returnLogisticsCode')) {
1222
+ _context6.next = 30;
1223
+ break;
1224
+ }
1225
+ _context6.next = 28;
1121
1226
  return onBlurReturnLogisticsCode({
1122
1227
  form: form,
1123
1228
  value: value,
@@ -1125,57 +1230,57 @@ var FormRender = function FormRender(props, ref) {
1125
1230
  componentOnBlur: componentOnBlur,
1126
1231
  orderBackRule: 'logisticsCode'
1127
1232
  });
1128
- case 19:
1129
- _context6.next = 49;
1233
+ case 28:
1234
+ _context6.next = 58;
1130
1235
  break;
1131
- case 21:
1236
+ case 30:
1132
1237
  if (!(type === 'skxOutboundNoticeNo')) {
1133
- _context6.next = 27;
1238
+ _context6.next = 36;
1134
1239
  break;
1135
1240
  }
1136
1241
  //[SKX]ON出库通知单号 返填
1137
1242
  console.log('skxOutboundNoticeNo', value);
1138
- _context6.next = 25;
1243
+ _context6.next = 34;
1139
1244
  return onBlurSkxOutboundNoticeNo({
1140
1245
  form: form,
1141
1246
  value: value,
1142
1247
  templateDetail: templateDetail,
1143
1248
  componentOnBlur: componentOnBlur
1144
1249
  });
1145
- case 25:
1146
- _context6.next = 49;
1250
+ case 34:
1251
+ _context6.next = 58;
1147
1252
  break;
1148
- case 27:
1253
+ case 36:
1149
1254
  if (!(type === 'skxReturnBillNo')) {
1150
- _context6.next = 32;
1255
+ _context6.next = 41;
1151
1256
  break;
1152
1257
  }
1153
- _context6.next = 30;
1258
+ _context6.next = 39;
1154
1259
  return onBlurSkxReturnBillNo({
1155
1260
  form: form,
1156
1261
  value: value,
1157
1262
  templateDetail: templateDetail,
1158
1263
  componentOnBlur: componentOnBlur
1159
1264
  });
1160
- case 30:
1161
- _context6.next = 49;
1265
+ case 39:
1266
+ _context6.next = 58;
1162
1267
  break;
1163
- case 32:
1268
+ case 41:
1164
1269
  if (!(type === 'skxReturnTHLogisticsCode')) {
1165
- _context6.next = 37;
1270
+ _context6.next = 46;
1166
1271
  break;
1167
1272
  }
1168
- _context6.next = 35;
1273
+ _context6.next = 44;
1169
1274
  return onBlurSkxReturnTHLogisticsCode({
1170
1275
  form: form,
1171
1276
  value: value,
1172
1277
  templateDetail: templateDetail,
1173
1278
  componentOnBlur: componentOnBlur
1174
1279
  });
1175
- case 35:
1176
- _context6.next = 49;
1280
+ case 44:
1281
+ _context6.next = 58;
1177
1282
  break;
1178
- case 37:
1283
+ case 46:
1179
1284
  // 收集所有需要执行的异步操作
1180
1285
  promises = [];
1181
1286
  if (type === 'tradeId') {
@@ -1187,7 +1292,7 @@ var FormRender = function FormRender(props, ref) {
1187
1292
  promises.push(handleChangeTradeId(value));
1188
1293
  }
1189
1294
  if (value) {
1190
- _context6.next = 44;
1295
+ _context6.next = 53;
1191
1296
  break;
1192
1297
  }
1193
1298
  setReplaceValue(function (prev) {
@@ -1198,24 +1303,24 @@ var FormRender = function FormRender(props, ref) {
1198
1303
  });
1199
1304
  replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
1200
1305
  return _context6.abrupt("return");
1201
- case 44:
1306
+ case 53:
1202
1307
  promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
1203
1308
  // TODO: ERP不走订单反弹逻辑
1204
1309
  if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
1205
- promises.push(changeHandle(value));
1310
+ promises.push(changeHandle(value, options));
1206
1311
  }
1207
1312
  // 等待所有异步操作完成
1208
- _context6.next = 48;
1313
+ _context6.next = 57;
1209
1314
  return Promise.all(promises);
1210
- case 48:
1315
+ case 57:
1211
1316
  return _context6.abrupt("return", Promise.resolve());
1212
- case 49:
1317
+ case 58:
1213
1318
  case "end":
1214
1319
  return _context6.stop();
1215
1320
  }
1216
1321
  }, _callee6);
1217
1322
  }));
1218
- return function componentOnBlur(_x10, _x11, _x12) {
1323
+ return function componentOnBlur(_x11, _x12, _x13, _x14) {
1219
1324
  return _ref7.apply(this, arguments);
1220
1325
  };
1221
1326
  }();
@@ -1347,10 +1452,10 @@ var FormRender = function FormRender(props, ref) {
1347
1452
  callKey: 4,
1348
1453
  setLoading: setLoading
1349
1454
  });
1350
- } else {
1351
- // 售后单反填
1352
- afterSaleOrderBack(form, templateDetail);
1353
1455
  }
1456
+ } else {
1457
+ // 售后单反填
1458
+ afterSaleOrderBack(form, templateDetail);
1354
1459
  }
1355
1460
  };
1356
1461
 
@@ -5,12 +5,16 @@ export declare const onBlurErpAfterSaleTradeId: ({ form, value, templateDetail,
5
5
  templateDetail: any;
6
6
  setKmLoading: (loading: boolean) => void;
7
7
  }) => Promise<void>;
8
- export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
8
+ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, onlyGetTid, needTradeIdOrderBack, }: {
9
9
  form: FormInstance;
10
10
  value: string;
11
11
  templateDetail: any;
12
12
  setKmLoading: (loading: boolean) => void;
13
- componentOnBlur: (value: any, type: string) => Promise<void>;
13
+ componentOnBlur: (value: any, type: string, uniqueKey?: string, options?: {
14
+ wdtMatchLogisticsNo?: string;
15
+ skipOrderBackUniqueKeys?: string[];
16
+ }) => Promise<void>;
17
+ sourceUniqueKey?: string | undefined;
14
18
  onlyGetTid?: boolean | undefined;
15
19
  needTradeIdOrderBack?: boolean | undefined;
16
20
  }) => Promise<any>;
@@ -47,11 +47,11 @@ export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
47
47
  export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
48
48
  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
49
49
  var _kmErpVideoComponent$2;
50
- var form, value, templateDetail, setKmLoading, componentOnBlur, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, oldValue, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
50
+ var form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
51
51
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
52
52
  while (1) switch (_context2.prev = _context2.next) {
53
53
  case 0:
54
- form = _ref3.form, value = _ref3.value, templateDetail = _ref3.templateDetail, setKmLoading = _ref3.setKmLoading, componentOnBlur = _ref3.componentOnBlur, _ref3$onlyGetTid = _ref3.onlyGetTid, onlyGetTid = _ref3$onlyGetTid === void 0 ? false : _ref3$onlyGetTid, _ref3$needTradeIdOrde = _ref3.needTradeIdOrderBack, needTradeIdOrderBack = _ref3$needTradeIdOrde === void 0 ? true : _ref3$needTradeIdOrde;
54
+ form = _ref3.form, value = _ref3.value, templateDetail = _ref3.templateDetail, setKmLoading = _ref3.setKmLoading, componentOnBlur = _ref3.componentOnBlur, sourceUniqueKey = _ref3.sourceUniqueKey, _ref3$onlyGetTid = _ref3.onlyGetTid, onlyGetTid = _ref3$onlyGetTid === void 0 ? false : _ref3$onlyGetTid, _ref3$needTradeIdOrde = _ref3.needTradeIdOrderBack, needTradeIdOrderBack = _ref3$needTradeIdOrde === void 0 ? true : _ref3$needTradeIdOrde;
55
55
  hasTradeIdComponent = templateDetail.componentDtoList.some(function (item) {
56
56
  return item.workOrderComponentType === 'TRADE_ID_INPUT';
57
57
  });
@@ -72,7 +72,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
72
72
  });
73
73
  case 6:
74
74
  if (!hasTradeIdComponent) {
75
- _context2.next = 37;
75
+ _context2.next = 35;
76
76
  break;
77
77
  }
78
78
  hasKm = false;
@@ -106,63 +106,59 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
106
106
  }
107
107
  return _context2.abrupt("return");
108
108
  case 12:
109
- oldValue = form.getFieldValue('0eVTfMGEyd');
110
109
  if (!hasWdt) {
111
- _context2.next = 19;
110
+ _context2.next = 18;
112
111
  break;
113
112
  }
114
- _context2.next = 16;
113
+ _context2.next = 15;
115
114
  return queryTidByWdtOutSid({
116
115
  outSid: value
117
116
  });
118
- case 16:
117
+ case 15:
119
118
  _context2.t0 = _context2.sent;
120
- _context2.next = 22;
121
- break;
122
- case 19:
123
119
  _context2.next = 21;
120
+ break;
121
+ case 18:
122
+ _context2.next = 20;
124
123
  return queryTidByOutSid({
125
124
  outSid: value
126
125
  });
127
- case 21:
126
+ case 20:
128
127
  _context2.t0 = _context2.sent;
129
- case 22:
128
+ case 21:
130
129
  res = _context2.t0;
131
130
  tradeId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tid;
132
131
  if (!onlyGetTid) {
133
- _context2.next = 26;
132
+ _context2.next = 25;
134
133
  break;
135
134
  }
136
135
  return _context2.abrupt("return", tradeId);
137
- case 26:
136
+ case 25:
138
137
  if (tradeId) {
139
- _context2.next = 28;
138
+ _context2.next = 27;
140
139
  break;
141
140
  }
142
141
  return _context2.abrupt("return");
143
- case 28:
142
+ case 27:
144
143
  tradeIdComponent = templateDetail.componentDtoList.find(function (item) {
145
144
  return item.workOrderComponentType === 'TRADE_ID_INPUT';
146
145
  });
147
146
  newTradeId = tradeIdComponent !== null && tradeIdComponent !== void 0 && (_tradeIdComponent$com = tradeIdComponent.componentConfig) !== null && _tradeIdComponent$com !== void 0 && _tradeIdComponent$com.toUpperCase ? tradeId.toUpperCase() : tradeId;
148
- form.setFieldsValue({
149
- m3ap1EvEyd: newTradeId
150
- });
147
+ form.setFieldsValue(_defineProperty({}, (tradeIdComponent === null || tradeIdComponent === void 0 ? void 0 : tradeIdComponent.uniqueKey) || 'm3ap1EvEyd', newTradeId));
151
148
  if (!needTradeIdOrderBack) {
152
- _context2.next = 35;
149
+ _context2.next = 34;
153
150
  break;
154
151
  }
155
152
  // 创建一个异步操作的Promise
156
- blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
157
- _context2.next = 35;
153
+ blurPromise = componentOnBlur(tradeId, 'tradeId', undefined, {
154
+ wdtMatchLogisticsNo: value,
155
+ skipOrderBackUniqueKeys: sourceUniqueKey ? [sourceUniqueKey] : []
156
+ }); // 等待异步操作完成后再执行setTimeout
157
+ _context2.next = 34;
158
158
  return blurPromise;
159
- case 35:
160
- // 所有异步操作完成后执行
161
- form.setFieldsValue({
162
- '0eVTfMGEyd': oldValue
163
- });
159
+ case 34:
164
160
  return _context2.abrupt("return", res.data);
165
- case 37:
161
+ case 35:
166
162
  case "end":
167
163
  return _context2.stop();
168
164
  }
@@ -7,4 +7,4 @@
7
7
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8
8
  */
9
9
  // 切换当前店铺时,以下组件字段需要清空
10
- export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_RETURN_WAREHOUSE', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
10
+ export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_RETURN_WAREHOUSE', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
@@ -94,6 +94,18 @@ export var SKIP_NODE_TYPES_CONFIG = {
94
94
  name: '获取补发/换货单id(管易退货单接口补发/换货)',
95
95
  tips: '补发单id/换货单id'
96
96
  },
97
+ WLN_OBTAIN_REISSUE_ORDER: {
98
+ name: '获取补发单id(万里牛)',
99
+ tips: '补发单id'
100
+ },
101
+ WLN_OBTAIN_REISSUE_LOGISTICS: {
102
+ name: '获取补发物流单号(万里牛)',
103
+ tips: '补发物流信息'
104
+ },
105
+ WLN_STORE_STATUS: {
106
+ name: '退货入库状态(万里牛)',
107
+ tips: '万里牛商品入库状态'
108
+ },
97
109
  JST_REISSUE_WORK_ORDER: {
98
110
  name: '补发(聚水潭)',
99
111
  tips: '补发单id'
@@ -185,6 +185,10 @@ export var SUBMIT_COMPONENT_STATUS_MAP = {
185
185
  status: 'erpAfterSaleStatusValue',
186
186
  reason: 'erpAfterSaleStatusReason'
187
187
  },
188
+ ERP_AFTER_SALES_ORDER_REVIEW_STATUS: {
189
+ status: 'erpAfterSalesOrderReviewStatusValue',
190
+ reason: 'erpAfterSalesOrderReviewStatusReason'
191
+ },
188
192
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
189
193
  status: 'returnExchangeGoodsReviewStatusValue',
190
194
  reason: 'returnExchangeGoodsReviewStatusReason'
@@ -223,6 +227,10 @@ export var SUBMIT_COMPONENT_GOOD_STATUS_MAP = {
223
227
  list: 'wdtInStockStatusItemList',
224
228
  status: 'wdtInStockStatusList'
225
229
  },
230
+ WLN_WAREHOUSING_STATUS: {
231
+ list: 'wlnInStockStatusItemList',
232
+ status: 'wlnInStockStatusList'
233
+ },
226
234
  JKY_WAREHOUSING_STATUS: {
227
235
  list: 'jkyInStockStatusItemList',
228
236
  status: 'jkyInStockStatusList'
@@ -396,6 +404,12 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
396
404
  goods: 'jkyReissueGoods',
397
405
  shopCode: 'shopCode',
398
406
  systemOrderNo: 'jkySystemOrderNo'
407
+ },
408
+ WLN_REISSUE_GOODS: {
409
+ type: 'wlnReissueType',
410
+ goods: 'wlnReissueGoods',
411
+ shopCode: 'shopCode',
412
+ systemOrderNo: 'wlnSystemOrderNo'
399
413
  }
400
414
  };
401
415
  export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {
@@ -627,7 +627,7 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref46) {
627
627
  if (item.workOrderComponentType !== 'GY_REISSUE_GOODS') {
628
628
  addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '');
629
629
  }
630
- if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS' || item.workOrderComponentType === 'JY_REISSUE_GOODS' || item.workOrderComponentType === 'JKY_REISSUE_GOODS') {
630
+ if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS' || item.workOrderComponentType === 'JY_REISSUE_GOODS' || item.workOrderComponentType === 'JKY_REISSUE_GOODS' || item.workOrderComponentType === 'WLN_REISSUE_GOODS') {
631
631
  addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo, (reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo]) || '');
632
632
  }
633
633
  // 管易补发商品信息vipCode/shopCode未复现出丢失情况,兜底措施
@@ -931,6 +931,7 @@ var processComponent = function processComponent(_ref63) {
931
931
  case 'REPAIR_ORDER_STATUS':
932
932
  case 'REJECT_REFUND_STATUS':
933
933
  case 'ERP_AFTER_SALE_STATUS':
934
+ case 'ERP_AFTER_SALES_ORDER_REVIEW_STATUS':
934
935
  case 'AGREE_RETURN_GOODS_STATUS':
935
936
  case 'REJECT_RETURN_GOODS_STATUS':
936
937
  case 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS':
@@ -942,6 +943,7 @@ var processComponent = function processComponent(_ref63) {
942
943
  case 'BS_E3_WAREHOUSING_STATUS':
943
944
  case 'MSG_STATUS':
944
945
  case 'WDT_WAREHOUSING_STATUS':
946
+ case 'WLN_WAREHOUSING_STATUS':
945
947
  case 'JKY_WAREHOUSING_STATUS':
946
948
  wrapFn(handleGoodStatus);
947
949
  break;
@@ -1087,6 +1089,7 @@ var processComponent = function processComponent(_ref63) {
1087
1089
  case 'KM_REISSUE_GOODS':
1088
1090
  case 'JY_REISSUE_GOODS':
1089
1091
  case 'JKY_REISSUE_GOODS':
1092
+ case 'WLN_REISSUE_GOODS':
1090
1093
  wrapFn(handleBsOrWdtReissueGoods);
1091
1094
  break;
1092
1095
  case 'BS_RETURN_GOODS':
@@ -40,7 +40,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
40
40
  workOrderComponentType: string;
41
41
  uniqueKey: string;
42
42
  }[], type?: string) => any[];
43
- export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, }: any) => Promise<void>;
43
+ export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, wdtMatchLogisticsNo, skipOrderBackUniqueKeys, }: any) => Promise<void>;
44
44
  export declare const imgResize: (url: string, w?: number, h?: number) => string;
45
45
  export declare const COMPONENT_MAP: {
46
46
  [key: string]: string;
@@ -146,11 +146,11 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
146
146
  export var orderBack = /*#__PURE__*/function () {
147
147
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
148
148
  var _form$getFieldValue;
149
- var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, canModifyShopFieldValue, shouldTryAutoSetShopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _wdtReturnBillNoCompo, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _jkyOrder$value, _wdtReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _value$selectIds, _value$showOrderInfo, _afterSaleOrders$valu, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, afterSaleOrders, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, jkyOrder, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, afterSalesOrderField, value, afterSalesOrderSelectOrder, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
149
+ var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, wdtMatchLogisticsNo, skipOrderBackUniqueKeys, shopId, canModifyShopFieldValue, shouldTryAutoSetShopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _wdtReturnBillNoCompo, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _jkyOrder$value, _wdtReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _value$selectIds, _value$showOrderInfo, _afterSaleOrders$valu, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, afterSaleOrders, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, jkyOrder, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, afterSalesOrderField, value, afterSalesOrderSelectOrder, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
150
150
  return _regeneratorRuntime().wrap(function _callee$(_context) {
151
151
  while (1) switch (_context.prev = _context.next) {
152
152
  case 0:
153
- companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
153
+ companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey, wdtMatchLogisticsNo = _ref.wdtMatchLogisticsNo, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
154
154
  console.log('orderBack-run--', callKey, templateDetail);
155
155
  shopId = propsShopid;
156
156
  canModifyShopFieldValue = form === null || form === void 0 ? void 0 : (_form$getFieldValue = form.getFieldValue) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.call(form, FIXED_FIELD_CAN_MODIFY_SHOP);
@@ -422,7 +422,7 @@ export var orderBack = /*#__PURE__*/function () {
422
422
  });
423
423
  wlnInfo = wlnOrders && wlnOrderTransform(_objectSpread(_objectSpread({}, wlnOrders), {}, {
424
424
  allOrders: wlnOrders.orders
425
- }));
425
+ }), form);
426
426
  bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
427
427
  componentList: templateDetail.componentDtoList,
428
428
  orderNo: order_no,
@@ -432,7 +432,8 @@ export var orderBack = /*#__PURE__*/function () {
432
432
  componentList: templateDetail.componentDtoList,
433
433
  orderNo: order_no,
434
434
  allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || [],
435
- wdtReturnOrders: (wdtReturnOrders === null || wdtReturnOrders === void 0 ? void 0 : wdtReturnOrders.orderList) || []
435
+ wdtReturnOrders: (wdtReturnOrders === null || wdtReturnOrders === void 0 ? void 0 : wdtReturnOrders.orderList) || [],
436
+ matchLogisticsNo: wdtMatchLogisticsNo
436
437
  }), form);
437
438
  kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
438
439
  allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
@@ -751,7 +752,8 @@ export var orderBack = /*#__PURE__*/function () {
751
752
  formValue: formValue,
752
753
  templateDetail: templateDetail,
753
754
  type: type,
754
- fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo
755
+ fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
756
+ skipOrderBackUniqueKeys: skipOrderBackUniqueKeys
755
757
  });
756
758
  pushGyLog('values', values);
757
759
  // console.log('formValue', formValue);
@@ -1155,6 +1157,7 @@ export var reversalFormValues = function reversalFormValues() {
1155
1157
  case 'KM_REISSUE_GOODS':
1156
1158
  case 'JY_REISSUE_GOODS':
1157
1159
  case 'JKY_REISSUE_GOODS':
1160
+ case 'WLN_REISSUE_GOODS':
1158
1161
  case 'KM_RETURN_GOODS':
1159
1162
  prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
1160
1163
  break;
@@ -1363,7 +1366,7 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref11)
1363
1366
  orders: value.selectedRows,
1364
1367
  shopCode: wlnGoodsValue.shopCode,
1365
1368
  allOrders: value === null || value === void 0 ? void 0 : value.orders
1366
- });
1369
+ }, form);
1367
1370
  var values = wlnOrderBackFormValues(orderInfo, {
1368
1371
  componentDtoList: bsGoodsComponent
1369
1372
  });
@@ -7,7 +7,7 @@ var orderBackKeyListMap = {
7
7
  hasKm: ['KM_SYSTEM_ORDER', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'],
8
8
  hasWdt: ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS', 'WDT_SHOP', 'WDT_RETURN_BILL_NO'],
9
9
  hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
10
- hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
10
+ hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WLN_REISSUE_GOODS'],
11
11
  hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'],
12
12
  hasJy: ['JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS'],
13
13
  hasSkx: ['SKX_OUTBOUND_NOTICE_NO'],
@@ -437,6 +437,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
437
437
  status: 'erpAfterSaleStatusValue',
438
438
  reason: 'erpAfterSaleStatusReason'
439
439
  },
440
+ ERP_AFTER_SALES_ORDER_REVIEW_STATUS: {
441
+ status: 'erpAfterSalesOrderReviewStatusValue',
442
+ reason: 'erpAfterSalesOrderReviewStatusReason'
443
+ },
440
444
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
441
445
  status: 'returnExchangeGoodsReviewStatusValue',
442
446
  reason: 'returnExchangeGoodsReviewStatusReason'
@@ -465,7 +469,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
465
469
  BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
466
470
  MSG_STATUS: 'msgStatusValues',
467
471
  WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
468
- JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
472
+ JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
473
+ WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
469
474
  };
470
475
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
471
476
  };
@@ -1380,7 +1385,9 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
1380
1385
  BASIC_ADDRESS: processBasicAddress,
1381
1386
  RECEIVER_ADDRESS_INPUT: processReceiverAddressInput,
1382
1387
  SUBFORM: processSubForm,
1383
- ERP_REMARK: processCallBackStatus,
1388
+ ERP_AFTER_SALES_ORDER_REVIEW_STATUS: processCallBackStatus,
1389
+ WLN_WAREHOUSING_STATUS: processSceneStatus,
1390
+ WLN_REISSUE_GOODS: processJkyReissueGoods(templateColumns),
1384
1391
  EXPRESS_LOGISTICS_SELECT: processExpressLogisticsSelect,
1385
1392
  RETURN_LOGISTICS_SELECT: processReturnLogisticsSelect,
1386
1393
  REMARK_INPUT: processRemarkInput,
@@ -1402,6 +1409,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
1402
1409
  BS_MEMO: processBsMemo,
1403
1410
  REISSUE_LOGISTICS: processReissueLogistics,
1404
1411
  REISSUE_STATUS: processCallBackStatus,
1412
+ ERP_REMARK: processCallBackStatus,
1405
1413
  ADJUST_WORK_ORDER_STATUS: processCallBackStatus,
1406
1414
  CREATE_STATUS: processCallBackStatus,
1407
1415
  INVOICE_STATUS: processCallBackStatus,
@@ -6,7 +6,6 @@ export declare const selectFlowList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("./types").LogicFlowState;
9
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
10
9
  }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
11
10
  clearCache: () => void;
12
11
  }> & {
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
20
19
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
21
20
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
22
21
  logicFlow: import("./types").LogicFlowState;
23
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
24
22
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
25
23
  clearCache: () => void;
26
24
  }> & {
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
34
32
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
35
33
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
36
34
  logicFlow: import("./types").LogicFlowState;
37
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
38
35
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
39
36
  clearCache: () => void;
40
37
  }> & {
@@ -6,7 +6,6 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
6
6
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("../logicFlow/types").LogicFlowState;
9
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
10
9
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
11
10
  clearCache: () => void;
12
11
  }> & {
@@ -20,7 +19,6 @@ export declare const selectCurrentPaymentRecord: ((state: {
20
19
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
21
20
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
22
21
  logicFlow: import("../logicFlow/types").LogicFlowState;
23
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
24
22
  }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
25
23
  clearCache: () => void;
26
24
  }> & {
@@ -34,7 +32,6 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
34
32
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
35
33
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
36
34
  logicFlow: import("../logicFlow/types").LogicFlowState;
37
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
38
35
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
39
36
  clearCache: () => void;
40
37
  }> & {
@@ -48,7 +45,6 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
48
45
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
49
46
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
50
47
  logicFlow: import("../logicFlow/types").LogicFlowState;
51
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
52
48
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
53
49
  clearCache: () => void;
54
50
  }> & {
@@ -62,7 +58,6 @@ export declare const selectFlagPayModalVisible: ((state: {
62
58
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
63
59
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
64
60
  logicFlow: import("../logicFlow/types").LogicFlowState;
65
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
66
61
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
67
62
  clearCache: () => void;
68
63
  }> & {
@@ -76,7 +71,6 @@ export declare const selectLogModalVisible: ((state: {
76
71
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
77
72
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
78
73
  logicFlow: import("../logicFlow/types").LogicFlowState;
79
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
80
74
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
81
75
  clearCache: () => void;
82
76
  }> & {
@@ -90,7 +84,6 @@ export declare const selectPaymentFormModalVisible: ((state: {
90
84
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
91
85
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
92
86
  logicFlow: import("../logicFlow/types").LogicFlowState;
93
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
94
87
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
95
88
  clearCache: () => void;
96
89
  }> & {
@@ -104,7 +97,6 @@ export declare const selectRepeatVisible: ((state: {
104
97
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
105
98
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
106
99
  logicFlow: import("../logicFlow/types").LogicFlowState;
107
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
108
100
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
109
101
  clearCache: () => void;
110
102
  }> & {
@@ -118,7 +110,6 @@ export declare const selectRepeatWorkOrderList: ((state: {
118
110
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
119
111
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
120
112
  logicFlow: import("../logicFlow/types").LogicFlowState;
121
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
122
113
  }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
123
114
  clearCache: () => void;
124
115
  }> & {
@@ -6,7 +6,6 @@ export declare const selectorSingleTemplateList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("./types").SingleWorkOrderState;
8
8
  logicFlow: import("../logicFlow/types").LogicFlowState;
9
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
10
9
  }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
11
10
  clearCache: () => void;
12
11
  }> & {
@@ -20,7 +19,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
20
19
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
21
20
  singleWorkOrder: import("./types").SingleWorkOrderState;
22
21
  logicFlow: import("../logicFlow/types").LogicFlowState;
23
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
24
22
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
25
23
  clearCache: () => void;
26
24
  }> & {
@@ -34,7 +32,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
34
32
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
35
33
  singleWorkOrder: import("./types").SingleWorkOrderState;
36
34
  logicFlow: import("../logicFlow/types").LogicFlowState;
37
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
38
35
  }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
39
36
  clearCache: () => void;
40
37
  }> & {
@@ -48,7 +45,6 @@ export declare const selectorTemplateId: ((state: {
48
45
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
49
46
  singleWorkOrder: import("./types").SingleWorkOrderState;
50
47
  logicFlow: import("../logicFlow/types").LogicFlowState;
51
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
52
48
  }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
53
49
  clearCache: () => void;
54
50
  }> & {
@@ -62,7 +58,6 @@ export declare const selectorFormModalVisible: ((state: {
62
58
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
63
59
  singleWorkOrder: import("./types").SingleWorkOrderState;
64
60
  logicFlow: import("../logicFlow/types").LogicFlowState;
65
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
66
61
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
67
62
  clearCache: () => void;
68
63
  }> & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.7.2",
3
+ "version": "2.7.3-beta.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.7.2",
36
- "@kmkf-fe-packages/kmkf-utils": "2.7.2",
37
- "@kmkf-fe-packages/services-components": "2.7.2",
35
+ "@kmkf-fe-packages/basic-components": "2.7.3-beta.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.7.3-beta.0",
37
+ "@kmkf-fe-packages/services-components": "2.7.3-beta.0",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
75
75
  "publishConfig": {
76
76
  "access": "public"
77
77
  },
78
- "gitHead": "0935ddda3b736925b7e9cf3d6df86c85ef2f8048",
78
+ "gitHead": "8c80641421cc67b5f77f17fbe4db443014610338",
79
79
  "gitHooks": {
80
80
  "pre-commit": "lint-staged"
81
81
  }