@kmkf-fe-packages/kmkf-work-order-service-component 2.7.3-beta.6 → 2.7.3-beta.8

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -412,7 +412,7 @@ var FormRender = function FormRender(props, ref) {
   }, [labelComponent, record]);
   var queryDetail = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-      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, logisticsOrderBackSources, lastLogisticsOrderBackSource, currentNodeExpressLogisticsCodeKey, currentNodeLogisticsCode, _userInfo, companyUserConfig, hasWdt, preTradeId, tradeId, isSkx, _iterator, _step, source, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
+      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;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -442,7 +442,7 @@ var FormRender = function FormRender(props, ref) {
               return prv;
             }, {});
             if (!workOrderId) {
-              _context2.next = 83;
+              _context2.next = 70;
               break;
             }
             // 先初始化端上内容
@@ -475,7 +475,7 @@ var FormRender = function FormRender(props, ref) {
             // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
             tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
             if (!notAutoFillFlag) {
-              _context2.next = 79;
+              _context2.next = 66;
               break;
             }
             currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
@@ -504,21 +504,16 @@ var FormRender = function FormRender(props, ref) {
               return cur;
             }, []);
             lastLogisticsOrderBackSource = logisticsOrderBackSources[logisticsOrderBackSources.length - 1];
-            currentNodeExpressLogisticsCodeKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'EXPRESS_LOGISTICS_SELECT');
-            currentNodeLogisticsCode = record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(currentNodeExpressLogisticsCodeKey, "_expressLogisticsCode")];
-            _userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
-            companyUserConfig = (_userInfo$companyUser3 = _userInfo === null || _userInfo === void 0 ? void 0 : _userInfo.companyUserConfig) !== null && _userInfo$companyUser3 !== void 0 ? _userInfo$companyUser3 : {};
-            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;
-            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;
+            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;
             tradeId = _currentNodeTid || preTradeId;
             isSkx = ['TR3E2FYXFZCFANVG6O6AALSM'].includes(companyKey); // SKX 特殊处理逻辑
             if (!tradeId) {
-              _context2.next = 40;
+              _context2.next = 35;
               break;
             }
             queryLabels(tradeId, shopId);
             queryMemberLevels(tradeId, shopId);
-            _context2.next = 38;
+            _context2.next = 33;
             return orderBack({
               companyKey: companyKey,
               order_no: tradeId,
@@ -531,18 +526,18 @@ var FormRender = function FormRender(props, ref) {
               plat: plat,
               callKey: 1,
               setLoading: setLoading,
-              wdtMatchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
+              matchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
               skipOrderBackUniqueKeys: lastLogisticsOrderBackSource !== null && lastLogisticsOrderBackSource !== void 0 && lastLogisticsOrderBackSource.uniqueKey ? [lastLogisticsOrderBackSource.uniqueKey] : []
             });
-          case 38:
-            _context2.next = 76;
+          case 33:
+            _context2.next = 63;
             break;
-          case 40:
+          case 35:
             if (!isSkx) {
-              _context2.next = 46;
+              _context2.next = 41;
               break;
             }
-            _context2.next = 43;
+            _context2.next = 38;
             return skxOrderBack({
               form: form,
               companyKey: companyKey,
@@ -550,27 +545,27 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
             });
-          case 43:
+          case 38:
             // 售后单反填
             afterSaleOrderBack(form, templateDetail);
-            _context2.next = 76;
+            _context2.next = 63;
             break;
-          case 46:
+          case 41:
             if (!logisticsOrderBackSources.length) {
-              _context2.next = 67;
+              _context2.next = 62;
               break;
             }
             _iterator = _createForOfIteratorHelper(logisticsOrderBackSources);
-            _context2.prev = 48;
+            _context2.prev = 43;
             _iterator.s();
-          case 50:
+          case 45:
             if ((_step = _iterator.n()).done) {
-              _context2.next = 57;
+              _context2.next = 52;
               break;
             }
             source = _step.value;
             afterSaleOrderBack(form, templateDetail);
-            _context2.next = 55;
+            _context2.next = 50;
             return onBlurExpressLogisticsCode({
               form: form,
               value: source.logisticsCode,
@@ -579,62 +574,40 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               sourceUniqueKey: source.uniqueKey
             });
-          case 55:
-            _context2.next = 50;
+          case 50:
+            _context2.next = 45;
             break;
-          case 57:
-            _context2.next = 62;
+          case 52:
+            _context2.next = 57;
             break;
-          case 59:
-            _context2.prev = 59;
-            _context2.t0 = _context2["catch"](48);
+          case 54:
+            _context2.prev = 54;
+            _context2.t0 = _context2["catch"](43);
             _iterator.e(_context2.t0);
-          case 62:
-            _context2.prev = 62;
+          case 57:
+            _context2.prev = 57;
             _iterator.f();
-            return _context2.finish(62);
-          case 65:
-            _context2.next = 76;
+            return _context2.finish(57);
+          case 60:
+            _context2.next = 63;
             break;
-          case 67:
+          case 62:
             // 售后单反填
             afterSaleOrderBack(form, templateDetail);
-            if (!isSkx) {
-              _context2.next = 73;
-              break;
-            }
-            _context2.next = 71;
-            return skxOrderBack({
-              form: form,
-              companyKey: companyKey,
-              templateDetail: templateDetail,
-              componentOnBlur: componentOnBlur,
-              jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
-            });
-          case 71:
-            _context2.next = 76;
-            break;
-          case 73:
-            if (!(hasWdt && currentNodeLogisticsCode)) {
-              _context2.next = 76;
-              break;
-            }
-            _context2.next = 76;
-            return componentOnBlur(currentNodeLogisticsCode, 'expressLogisticsCode');
-          case 76:
+          case 63:
             // 仅在依赖值有值且映射值为空时触发一次映射
             batchFillByMappingWhenTargetEmpty(initialValues);
-            _context2.next = 81;
+            _context2.next = 68;
             break;
-          case 79:
+          case 66:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
             // 售后单反填
             afterSaleOrderBack(form, templateDetail);
-          case 81:
-            _context2.next = 107;
+          case 68:
+            _context2.next = 94;
             break;
-          case 83:
+          case 70:
             fillByShopId(shopId);
             initFormValues = null;
             if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -653,7 +626,7 @@ var FormRender = function FormRender(props, ref) {
 
             // console.log(orderNo, initFormValues);
             if (!initFormValues) {
-              _context2.next = 94;
+              _context2.next = 81;
               break;
             }
             form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -670,9 +643,9 @@ var FormRender = function FormRender(props, ref) {
               _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
             }
             fetchRemark(_shopId, _orderNo);
-            _context2.next = 107;
+            _context2.next = 94;
             break;
-          case 94:
+          case 81:
             _transData = calcWorkOrderList([{
               jsonMap: jsonMap
             }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -684,12 +657,12 @@ var FormRender = function FormRender(props, ref) {
             batchFillByMapping(_initialValues);
             //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
             if (!(orderNo && shopId)) {
-              _context2.next = 105;
+              _context2.next = 92;
               break;
             }
             queryLabels(orderNo, shopId);
             queryMemberLevels(orderNo, shopId);
-            _context2.next = 103;
+            _context2.next = 90;
             return orderBack({
               companyKey: companyKey,
               order_no: orderNo,
@@ -704,15 +677,15 @@ var FormRender = function FormRender(props, ref) {
               callKey: 2,
               setLoading: setLoading
             });
-          case 103:
-            _context2.next = 107;
+          case 90:
+            _context2.next = 94;
             break;
-          case 105:
+          case 92:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
             // 售后单反填
             afterSaleOrderBack(form, templateDetail);
-          case 107:
+          case 94:
             antFormEl = document.getElementsByClassName('ant-form');
             (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
             resetMappingHideComponents();
@@ -721,11 +694,11 @@ var FormRender = function FormRender(props, ref) {
               type: 'setaAutoSubmitFlag',
               payload: true
             });
-          case 111:
+          case 98:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[48, 59, 62, 65]]);
+      }, _callee2, null, [[43, 54, 57, 60]]);
     }));
     return function queryDetail(_x4) {
       return _ref3.apply(this, arguments);
@@ -1007,7 +980,7 @@ var FormRender = function FormRender(props, ref) {
               },
               callKey: 3,
               setLoading: setLoading,
-              wdtMatchLogisticsNo: options === null || options === void 0 ? void 0 : options.wdtMatchLogisticsNo,
+              matchLogisticsNo: options === null || options === void 0 ? void 0 : options.matchLogisticsNo,
               skipOrderBackUniqueKeys: options === null || options === void 0 ? void 0 : options.skipOrderBackUniqueKeys
             });
           case 5:

package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts

@@ -11,7 +11,7 @@ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail,
     templateDetail: any;
     setKmLoading: (loading: boolean) => void;
     componentOnBlur: (value: any, type: string, uniqueKey?: string, options?: {
-        wdtMatchLogisticsNo?: string;
+        matchLogisticsNo?: string;
         skipOrderBackUniqueKeys?: string[];
     }) => Promise<void>;
     sourceUniqueKey?: string | undefined;

package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js

@@ -47,7 +47,7 @@ export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
 export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
     var _kmErpVideoComponent$2;
-    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;
+    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, wdtOrderBackTypes, kmOrderBackTypes, hasWdtOrderBackComponent, hasKmOrderBackComponent, shouldUseWdtOutSidQuery, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -72,7 +72,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           });
         case 6:
           if (!hasTradeIdComponent) {
-            _context2.next = 35;
+            _context2.next = 41;
             break;
           }
           hasKm = false;
@@ -106,59 +106,73 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           }
           return _context2.abrupt("return");
         case 12:
-          if (!hasWdt) {
-            _context2.next = 18;
+          wdtOrderBackTypes = ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_REISSUE_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'];
+          kmOrderBackTypes = ['KM_SYSTEM_ORDER', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'KM_EXCHANGE_GOODS', 'KM_LOGISTICS', 'KM_SEND_GOOD'];
+          hasWdtOrderBackComponent = templateDetail.componentDtoList.some(function (item) {
+            return wdtOrderBackTypes.includes(item.workOrderComponentType);
+          });
+          hasKmOrderBackComponent = templateDetail.componentDtoList.some(function (item) {
+            return kmOrderBackTypes.includes(item.workOrderComponentType);
+          });
+          shouldUseWdtOutSidQuery = hasWdt;
+          if (hasWdtOrderBackComponent && !hasKmOrderBackComponent) {
+            shouldUseWdtOutSidQuery = true;
+          } else if (hasKmOrderBackComponent && !hasWdtOrderBackComponent) {
+            shouldUseWdtOutSidQuery = false;
+          }
+          if (!shouldUseWdtOutSidQuery) {
+            _context2.next = 24;
             break;
           }
-          _context2.next = 15;
+          _context2.next = 21;
           return queryTidByWdtOutSid({
             outSid: value
           });
-        case 15:
+        case 21:
           _context2.t0 = _context2.sent;
-          _context2.next = 21;
+          _context2.next = 27;
           break;
-        case 18:
-          _context2.next = 20;
+        case 24:
+          _context2.next = 26;
           return queryTidByOutSid({
             outSid: value
           });
-        case 20:
+        case 26:
           _context2.t0 = _context2.sent;
-        case 21:
+        case 27:
           res = _context2.t0;
           tradeId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tid;
           if (!onlyGetTid) {
-            _context2.next = 25;
+            _context2.next = 31;
             break;
           }
           return _context2.abrupt("return", tradeId);
-        case 25:
+        case 31:
           if (tradeId) {
-            _context2.next = 27;
+            _context2.next = 33;
             break;
           }
           return _context2.abrupt("return");
-        case 27:
+        case 33:
           tradeIdComponent = templateDetail.componentDtoList.find(function (item) {
             return item.workOrderComponentType === 'TRADE_ID_INPUT';
           });
           newTradeId = tradeIdComponent !== null && tradeIdComponent !== void 0 && (_tradeIdComponent$com = tradeIdComponent.componentConfig) !== null && _tradeIdComponent$com !== void 0 && _tradeIdComponent$com.toUpperCase ? tradeId.toUpperCase() : tradeId;
           form.setFieldsValue(_defineProperty({}, (tradeIdComponent === null || tradeIdComponent === void 0 ? void 0 : tradeIdComponent.uniqueKey) || 'm3ap1EvEyd', newTradeId));
           if (!needTradeIdOrderBack) {
-            _context2.next = 34;
+            _context2.next = 40;
             break;
           }
           // 创建一个异步操作的Promise
           blurPromise = componentOnBlur(tradeId, 'tradeId', undefined, {
-            wdtMatchLogisticsNo: value,
+            matchLogisticsNo: value,
             skipOrderBackUniqueKeys: sourceUniqueKey ? [sourceUniqueKey] : []
           }); // 等待异步操作完成后再执行setTimeout
-          _context2.next = 34;
+          _context2.next = 40;
           return blurPromise;
-        case 34:
+        case 40:
           return _context2.abrupt("return", res.data);
-        case 35:
+        case 41:
         case "end":
           return _context2.stop();
       }

package/dist/esm/common/utils/tools.d.ts

@@ -40,7 +40,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
     workOrderComponentType: string;
     uniqueKey: string;
 }[], type?: string) => any[];
-export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, wdtMatchLogisticsNo, skipOrderBackUniqueKeys, }: any) => Promise<void>;
+export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, skipOrderBackUniqueKeys, }: any) => Promise<void>;
 export declare const imgResize: (url: string, w?: number, h?: number) => string;
 export declare const COMPONENT_MAP: {
     [key: string]: string;

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

@@ -146,11 +146,11 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _form$getFieldValue;
-    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;
+    var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, 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, _wdtInfo$wdtSystemOrd, _wdtInfo$wdtSystemOrd2, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _kmInfo$kmSystemOrder, _kmInfo$kmSystemOrder2, _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;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          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;
+          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, matchLogisticsNo = _ref.matchLogisticsNo, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
           console.log('orderBack-run--', callKey, templateDetail);
           shopId = propsShopid;
           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);
@@ -433,12 +433,13 @@ export var orderBack = /*#__PURE__*/function () {
             orderNo: order_no,
             allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || [],
             wdtReturnOrders: (wdtReturnOrders === null || wdtReturnOrders === void 0 ? void 0 : wdtReturnOrders.orderList) || [],
-            matchLogisticsNo: wdtMatchLogisticsNo
+            matchLogisticsNo: matchLogisticsNo
           }), form);
           kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
             allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
             order_no: order_no,
-            componentList: templateDetail.componentDtoList
+            componentList: templateDetail.componentDtoList,
+            matchLogisticsNo: matchLogisticsNo
           }), form);
           if (kmInfo) {
             kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
@@ -521,7 +522,7 @@ export var orderBack = /*#__PURE__*/function () {
               sendName: ''
             }];
           }
-          if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$trades = wdtOrders.trades) === null || _wdtOrders$trades === void 0 ? void 0 : _wdtOrders$trades.length) > 1) {
+          if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$trades = wdtOrders.trades) === null || _wdtOrders$trades === void 0 ? void 0 : _wdtOrders$trades.length) > 1 && !(wdtInfo !== null && wdtInfo !== void 0 && (_wdtInfo$wdtSystemOrd = wdtInfo.wdtSystemOrder) !== null && _wdtInfo$wdtSystemOrd !== void 0 && (_wdtInfo$wdtSystemOrd2 = _wdtInfo$wdtSystemOrd.selectIds) !== null && _wdtInfo$wdtSystemOrd2 !== void 0 && _wdtInfo$wdtSystemOrd2.length)) {
             wdtInfo.wdtGoods = _objectSpread(_objectSpread({}, wdtInfo.wdtGoods), {}, {
               wdtGoods: [],
               orders: []
@@ -580,7 +581,7 @@ export var orderBack = /*#__PURE__*/function () {
               sendName: ''
             }];
           }
-          if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
+          if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1 && !(kmInfo !== null && kmInfo !== void 0 && (_kmInfo$kmSystemOrder = kmInfo.kmSystemOrder) !== null && _kmInfo$kmSystemOrder !== void 0 && (_kmInfo$kmSystemOrder2 = _kmInfo$kmSystemOrder.selectIds) !== null && _kmInfo$kmSystemOrder2 !== void 0 && _kmInfo$kmSystemOrder2.length)) {
             kmInfo.kmSendGood = [{
               sendId: '',
               sendName: ''

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/paymentWorkOrder/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectCurrentPaymentRecord: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectFlagPayModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -76,7 +71,6 @@ export declare const selectLogModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -90,7 +84,6 @@ export declare const selectPaymentFormModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -104,7 +97,6 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -118,7 +110,6 @@ export declare const selectRepeatWorkOrderList: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/singleShopWorkOrder/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectorSingleTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

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