@kmkf-fe-packages/kmkf-work-order-service-component 2.7.0-rc.0 → 2.8.0-rc.0

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

@@ -43,7 +43,7 @@ import { jsonParseSecurity, findComponentUniqueKeyByType } from "../../../common
 import { NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE } from "../../constant";
 import { Context } from "../../context";
 import { orderBackKmAddress } from "./constants";
-import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo } from "./onBlur";
+import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo } from "./onBlur";
 import { findAllDependencies } from "./component-dependency-finder";
 import { findValueDependencies } from "./value-mapping-finder";
 // 记录显隐触发隐藏的组件。显示后，重新出发一遍映射规则
@@ -881,7 +881,7 @@ var FormRender = function FormRender(props, ref) {
               setKmLoading: setKmLoading
             });
           case 3:
-            _context5.next = 28;
+            _context5.next = 33;
             break;
           case 5:
             if (!(type === 'expressLogisticsCode')) {
@@ -897,7 +897,7 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur
             });
           case 8:
-            _context5.next = 28;
+            _context5.next = 33;
             break;
           case 10:
             if (!(type === 'skxOutboundNoticeNo')) {
@@ -914,9 +914,24 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur
             });
           case 14:
-            _context5.next = 28;
+            _context5.next = 33;
             break;
           case 16:
+            if (!(type === 'skxReturnBillNo')) {
+              _context5.next = 21;
+              break;
+            }
+            _context5.next = 19;
+            return onBlurSkxReturnBillNo({
+              form: form,
+              value: value,
+              templateDetail: templateDetail,
+              componentOnBlur: componentOnBlur
+            });
+          case 19:
+            _context5.next = 33;
+            break;
+          case 21:
             // 收集所有需要执行的异步操作
             promises = [];
             if (type === 'tradeId') {
@@ -928,7 +943,7 @@ var FormRender = function FormRender(props, ref) {
               promises.push(handleChangeTradeId(value));
             }
             if (value) {
-              _context5.next = 23;
+              _context5.next = 28;
               break;
             }
             setReplaceValue(function (prev) {
@@ -939,18 +954,18 @@ var FormRender = function FormRender(props, ref) {
             });
             replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
             return _context5.abrupt("return");
-          case 23:
+          case 28:
             promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
             // TODO: ERP不走订单反弹逻辑
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
               promises.push(changeHandle(value));
             }
             // 等待所有异步操作完成
-            _context5.next = 27;
+            _context5.next = 32;
             return Promise.all(promises);
-          case 27:
+          case 32:
             return _context5.abrupt("return", Promise.resolve());
-          case 28:
+          case 33:
           case "end":
             return _context5.stop();
         }
@@ -1005,7 +1020,7 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'SKX_LOGISTICS'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -1022,6 +1037,12 @@ var FormRender = function FormRender(props, ref) {
               logisticsCode: null
             }];
             break;
+          case 'SKX_RETURN_LOGISTICS':
+            prv[next.uniqueKey] = [{
+              skxReturnLogisticsCompany: null,
+              skxReturnLogisticsCode: null
+            }];
+            break;
           case 'BS_SEND_GOOD':
           case 'BS_E3_SEND_GOOD':
           case 'WLN_SEND_GOOD':

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

@@ -18,3 +18,9 @@ export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail,
     templateDetail: any;
     componentOnBlur: (value: any, type: string) => Promise<void>;
 }) => Promise<void>;
+export declare const onBlurSkxReturnBillNo: ({ form, value, templateDetail, componentOnBlur, }: {
+    form: FormInstance;
+    value: string;
+    templateDetail: any;
+    componentOnBlur: (value: any, type: string) => Promise<void>;
+}) => Promise<void>;

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

@@ -8,9 +8,9 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 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); } }
 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); }); }; }
 import { orderBackKmVideoByLogisticsCode } from "../../../common/utils/orderBackKm";
-import { isNull, skxSystemOrderBackValues } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, skxSystemOrderBackValues, skxReturnSystemOrderBackValues } from '@kmkf-fe-packages/kmkf-utils';
 import { queryTidByOutSid } from "../../../model/servers/api";
-import { skxUtils } from '@kmkf-fe-packages/basic-components';
+import { servers } from '@kmkf-fe-packages/kmkf-utils';
 export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _kmErpVideoComponent$;
@@ -72,7 +72,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           });
         case 6:
           if (!hasTradeIdComponent) {
-            _context2.next = 24;
+            _context2.next = 23;
             break;
           }
           hasKm = false;
@@ -127,11 +127,10 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           return blurPromise;
         case 22:
           // 所有异步操作完成后执行
-          console.log('[组件失焦事件]---set', oldValue);
           form.setFieldsValue({
             '0eVTfMGEyd': oldValue
           });
-        case 24:
+        case 23:
         case "end":
           return _context2.stop();
       }
@@ -142,55 +141,124 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
   };
 }();
 export var onBlurSkxOutboundNoticeNo = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref5) {
-    var form, value, templateDetail, componentOnBlur, data, tradeId, blurPromise, values;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+    var form, value, templateDetail, componentOnBlur;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           form = _ref5.form, value = _ref5.value, templateDetail = _ref5.templateDetail, componentOnBlur = _ref5.componentOnBlur;
-          console.log('onBlurSkxOutboundNoticeNo', {
-            form: form,
-            value: value,
-            templateDetail: templateDetail
-          });
           if (value) {
-            _context3.next = 4;
+            _context4.next = 3;
             break;
           }
-          return _context3.abrupt("return");
-        case 4:
-          _context3.next = 6;
-          return skxUtils.getAllGoods({
+          return _context4.abrupt("return");
+        case 3:
+          _context4.next = 5;
+          return servers.SKX.querySkxOrderDetailSingleton({
             onBillNo: value
-          });
-        case 6:
-          data = _context3.sent;
-          console.log('skxUtils.getAllGoods', data);
-          tradeId = data === null || data === void 0 ? void 0 : data.tid; // 创建一个异步操作的Promise
-          blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
-          _context3.next = 12;
-          return blurPromise;
-        case 12:
-          // 所有异步操作完成后执行
-          values = skxSystemOrderBackValues({
-            templateList: templateDetail,
-            value: {
-              allOrders: (data === null || data === void 0 ? void 0 : data.orderDetailInfoList) || []
-            },
-            form: form,
-            isReverseFilling: false
-          });
-          form.setFieldsValue(_objectSpread(_objectSpread({}, values || {}), {}, {
-            m3ap1EvEyd: tradeId,
-            '78CADF2951': value
-          }));
-        case 14:
+          }).then( /*#__PURE__*/function () {
+            var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(res) {
+              var data, tradeId, blurPromise, values;
+              return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    data = res.data;
+                    tradeId = data === null || data === void 0 ? void 0 : data.tid; // 创建一个异步操作的Promise
+                    blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
+                    _context3.next = 5;
+                    return blurPromise;
+                  case 5:
+                    // 所有异步操作完成后执行
+                    values = skxSystemOrderBackValues({
+                      templateList: templateDetail,
+                      value: {
+                        allOrders: (data === null || data === void 0 ? void 0 : data.orderDetailInfoList) || []
+                      },
+                      form: form,
+                      isReverseFilling: false
+                    });
+                    form.setFieldsValue(_objectSpread(_objectSpread({}, values || {}), {}, {
+                      m3ap1EvEyd: tradeId,
+                      '78CADF2951': value
+                    }));
+                  case 7:
+                  case "end":
+                    return _context3.stop();
+                }
+              }, _callee3);
+            }));
+            return function (_x4) {
+              return _ref7.apply(this, arguments);
+            };
+          }()).catch(console.debug);
+        case 5:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return function onBlurSkxOutboundNoticeNo(_x3) {
     return _ref6.apply(this, arguments);
   };
+}();
+export var onBlurSkxReturnBillNo = /*#__PURE__*/function () {
+  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref8) {
+    var form, value, templateDetail, componentOnBlur;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          form = _ref8.form, value = _ref8.value, templateDetail = _ref8.templateDetail, componentOnBlur = _ref8.componentOnBlur;
+          if (value) {
+            _context6.next = 3;
+            break;
+          }
+          return _context6.abrupt("return");
+        case 3:
+          _context6.next = 5;
+          return servers.SKX.queryReturnOrderDetailSingleton({
+            returnBillNo: value
+          }).then( /*#__PURE__*/function () {
+            var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(res) {
+              var data, tradeId, blurPromise, values;
+              return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                while (1) switch (_context5.prev = _context5.next) {
+                  case 0:
+                    data = res.data;
+                    tradeId = data === null || data === void 0 ? void 0 : data.tid; // 创建一个异步操作的Promise
+                    blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
+                    _context5.next = 5;
+                    return blurPromise;
+                  case 5:
+                    // 所有异步操作完成后执行
+                    values = skxReturnSystemOrderBackValues({
+                      templateList: templateDetail,
+                      value: {
+                        allOrders: (data === null || data === void 0 ? void 0 : data.skqReturnOrderDetailInfoDtos) || []
+                      },
+                      form: form,
+                      isReverseFilling: false
+                    });
+                    form.setFieldsValue(_objectSpread(_objectSpread({}, values || {}), {}, {
+                      m3ap1EvEyd: tradeId,
+                      fe10d6f36b: value
+                    }));
+                  case 7:
+                  case "end":
+                    return _context5.stop();
+                }
+              }, _callee5);
+            }));
+            return function (_x6) {
+              return _ref10.apply(this, arguments);
+            };
+          }()).catch(console.debug);
+        case 5:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return function onBlurSkxReturnBillNo(_x5) {
+    return _ref9.apply(this, arguments);
+  };
 }();

package/dist/esm/FlowTemplateDetailV2/constant.js

@@ -1,2 +1,10 @@
+/*
+ * @Author: flyingMonkey 760958607@qq.com
+ * @Date: 2025-09-02 09:45:49
+ * @LastEditors: flyingMonkey 760958607@qq.com
+ * @LastEditTime: 2025-09-03 10:53:53
+ * @FilePath: /kmkf-fe-packages/packages/kmkf-work-order-service-component/src/FlowTemplateDetailV2/constant.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 // 切换当前店铺时，以下组件字段需要清空
-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_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_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', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_GOODS', 'SKX_ORDER_TYPE', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
+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_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_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', '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'];

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

@@ -1,9 +1,12 @@
 export declare const updateWorkTypeKeys: any;
 export declare const processSingleFieldTypeMapping: {
     SKX_OUTBOUND_NOTICE_NO: string;
+    SKX_RETURN_BILL_NO: string;
+    SKX_REFUND_BILL_NO: string;
     SKX_SHOP_NAME: string;
     SKX_WAREHOUSE: string;
     SKX_ORDER_TYPE: string;
+    SKX_RETURN_ORDER_STATUS: string;
     SKX_ORDER_STATUS: string;
     SKX_CREATE_TIME: string;
 };

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

@@ -34,9 +34,12 @@ export var updateWorkTypeKeys = {
 //直接将key component 添加到 transformWorkOrderData中的componentProcessors
 export var processSingleFieldTypeMapping = {
   SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo',
+  SKX_RETURN_BILL_NO: 'skxReturnBillNo',
+  SKX_REFUND_BILL_NO: 'skxRefundBillNo',
   SKX_SHOP_NAME: 'skxShopName',
   SKX_WAREHOUSE: 'skxWarehouse',
   SKX_ORDER_TYPE: 'skxOrderType',
+  SKX_RETURN_ORDER_STATUS: 'skxReturnOrderStatus',
   SKX_ORDER_STATUS: 'skxOrderStatus',
   SKX_CREATE_TIME: 'dateTime'
 };
@@ -108,7 +111,8 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
   EXECUTE_ACTION_TYPE: 'executeActionType',
   SKX_CREATE_TIME: 'dateTime',
   SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo',
-  ERP_ORDER_STATUS: 'erpOrderStatus'
+  ERP_ORDER_STATUS: 'erpOrderStatus',
+  SKX_RETURN_BILL_NO: 'skxReturnBillNo'
 };
 export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
   RATE: 'rate',
@@ -227,6 +231,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
     list: 'skxLogisticsList',
     company: 'skxLogisticsCompany',
     code: 'skxLogisticsCode'
+  },
+  SKX_RETURN_LOGISTICS: {
+    list: 'skxReturnLogistics',
+    company: 'skxReturnLogisticsCompany',
+    code: 'skxReturnLogisticsCode'
   }
 };
 export var SUBMIT_COMPONENT_SEND_GOOD_MAP = {

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

@@ -489,9 +489,17 @@ var handleOrderSubForm = function handleOrderSubForm(_ref37) {
     addContent('subOrderList', subOrderList);
   };
 };
-var handleBsExchangeGoods = function handleBsExchangeGoods(_ref38) {
+var handleSkxReturnGoods = function handleSkxReturnGoods(_ref38) {
   var addContent = _ref38.addContent,
     getNowData = _ref38.getNowData;
+  return function (item) {
+    var goods = getNowData(item.uniqueKey, {});
+    addContent('skxReturnGoods', goods === null || goods === void 0 ? void 0 : goods.skxReturnGoods);
+  };
+};
+var handleBsExchangeGoods = function handleBsExchangeGoods(_ref39) {
+  var addContent = _ref39.addContent,
+    getNowData = _ref39.getNowData;
   return function (item) {
     var _bsExchange$bsExchang;
     var bsExchange = getNowData(item.uniqueKey, {});
@@ -516,27 +524,27 @@ var handleBsExchangeGoods = function handleBsExchangeGoods(_ref38) {
     }
   };
 };
-var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref39) {
-  var addContent = _ref39.addContent,
-    getNowData = _ref39.getNowData;
+var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref40) {
+  var addContent = _ref40.addContent,
+    getNowData = _ref40.getNowData;
   return function (item) {
     var wdtExchange = getNowData(item.uniqueKey, {});
     addContent('wdtExchangeGoods', wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods);
     addContent('shopCode', (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '');
   };
 };
-var handleJstExchangeGoods = function handleJstExchangeGoods(_ref40) {
-  var addContent = _ref40.addContent,
-    getNowData = _ref40.getNowData;
+var handleJstExchangeGoods = function handleJstExchangeGoods(_ref41) {
+  var addContent = _ref41.addContent,
+    getNowData = _ref41.getNowData;
   return function (item) {
     var jstExchange = getNowData(item.uniqueKey, {});
     addContent('jstExchangeGoods', jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.jstExchangeGoods);
     addContent('shopCode', (jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.shopCode) || '');
   };
 };
-var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref41) {
-  var addContent = _ref41.addContent,
-    getNowData = _ref41.getNowData;
+var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref42) {
+  var addContent = _ref42.addContent,
+    getNowData = _ref42.getNowData;
   return function (item) {
     var reissue = getNowData(item.uniqueKey, {});
     addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type, reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type]);
@@ -590,9 +598,9 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref41) {
     }
   };
 };
-var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref42) {
-  var addContent = _ref42.addContent,
-    getNowData = _ref42.getNowData;
+var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref43) {
+  var addContent = _ref43.addContent,
+    getNowData = _ref43.getNowData;
   return function (item) {
     var currentReturn = getNowData(item.uniqueKey, {});
     var compType = item.workOrderComponentType;
@@ -601,9 +609,9 @@ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref42) {
     addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
   };
 };
-var handleGYReturnGoods = function handleGYReturnGoods(_ref43) {
-  var addContent = _ref43.addContent,
-    getNowData = _ref43.getNowData;
+var handleGYReturnGoods = function handleGYReturnGoods(_ref44) {
+  var addContent = _ref44.addContent,
+    getNowData = _ref44.getNowData;
   return function (item) {
     var currentReturn = getNowData(item.uniqueKey, {});
     var compType = item.workOrderComponentType;
@@ -613,9 +621,9 @@ var handleGYReturnGoods = function handleGYReturnGoods(_ref43) {
     addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
   };
 };
-var handleBsPosting = function handleBsPosting(_ref44) {
-  var addContent = _ref44.addContent,
-    getNowData = _ref44.getNowData;
+var handleBsPosting = function handleBsPosting(_ref45) {
+  var addContent = _ref45.addContent,
+    getNowData = _ref45.getNowData;
   return function (item) {
     ['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
       addContent(key, getNowData("".concat(item.uniqueKey, ".postingAddress[").concat(index, "]"), ''));
@@ -625,9 +633,9 @@ var handleBsPosting = function handleBsPosting(_ref44) {
     addContent('bsPostingReceiverMobile', getNowData("".concat(item.uniqueKey, ".postingReceiverMobile"), ''));
   };
 };
-var handleSystemOrder = function handleSystemOrder(_ref45) {
-  var addContent = _ref45.addContent,
-    getNowData = _ref45.getNowData;
+var handleSystemOrder = function handleSystemOrder(_ref46) {
+  var addContent = _ref46.addContent,
+    getNowData = _ref46.getNowData;
   return function (item) {
     var selectIds = getNowData("".concat(item.uniqueKey, ".selectIds"), '');
     var showOrderInfo = getNowData("".concat(item.uniqueKey, ".showOrderInfo"), []);
@@ -641,16 +649,16 @@ var handleSystemOrder = function handleSystemOrder(_ref45) {
     }));
   };
 };
-var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref46) {
-  var addContent = _ref46.addContent,
-    getNowData = _ref46.getNowData;
+var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref47) {
+  var addContent = _ref47.addContent,
+    getNowData = _ref47.getNowData;
   return function (item) {
     addContent('buyerMessageNotice', getNowData(item.uniqueKey, '未通知'));
   };
 };
-var handleBsDeliveryNo = function handleBsDeliveryNo(_ref47) {
-  var addContent = _ref47.addContent,
-    getNowData = _ref47.getNowData;
+var handleBsDeliveryNo = function handleBsDeliveryNo(_ref48) {
+  var addContent = _ref48.addContent,
+    getNowData = _ref48.getNowData;
   return function (item) {
     var deliveryNoList = getNowData(item.uniqueKey, []);
     addContent('deliveryNoList', deliveryNoList);
@@ -659,9 +667,9 @@ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref47) {
     }));
   };
 };
-var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref48) {
-  var addContent = _ref48.addContent,
-    getNowData = _ref48.getNowData;
+var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref49) {
+  var addContent = _ref49.addContent,
+    getNowData = _ref49.getNowData;
   return function (item) {
     var returnGoodsTradeItemList = getNowData(item.uniqueKey, []);
     addContent('returnGoodsTradeItemList', returnGoodsTradeItemList);
@@ -670,9 +678,9 @@ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref48) {
     }));
   };
 };
-var handleErpTradeId = function handleErpTradeId(_ref49) {
-  var addContent = _ref49.addContent,
-    getNowData = _ref49.getNowData;
+var handleErpTradeId = function handleErpTradeId(_ref50) {
+  var addContent = _ref50.addContent,
+    getNowData = _ref50.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('tradeItemList', tradeItemList);
@@ -681,9 +689,9 @@ var handleErpTradeId = function handleErpTradeId(_ref49) {
     }));
   };
 };
-var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref50) {
-  var addContent = _ref50.addContent,
-    getNowData = _ref50.getNowData;
+var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref51) {
+  var addContent = _ref51.addContent,
+    getNowData = _ref51.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('erpAfterSaleTradeItemList', tradeItemList);
@@ -692,18 +700,18 @@ var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref50) {
     }));
   };
 };
-var handleWlnGoods = function handleWlnGoods(_ref51) {
-  var addContent = _ref51.addContent,
-    getNowData = _ref51.getNowData;
+var handleWlnGoods = function handleWlnGoods(_ref52) {
+  var addContent = _ref52.addContent,
+    getNowData = _ref52.getNowData;
   return function (item) {
     var wlnGoods = getNowData(item.uniqueKey, {});
     addContent('wlnGoods', wlnGoods.wlnGoods);
     addContent('shopCode', (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '');
   };
 };
-var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref52) {
-  var addContent = _ref52.addContent,
-    getNowData = _ref52.getNowData;
+var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref53) {
+  var addContent = _ref53.addContent,
+    getNowData = _ref53.getNowData;
   return function (item) {
     ['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
       if (key === 'bsE3ReissueGoods') {
@@ -714,33 +722,33 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref52) {
     });
   };
 };
-var handleWdtShopSelect = function handleWdtShopSelect(_ref53) {
-  var addContent = _ref53.addContent,
-    getNowData = _ref53.getNowData;
+var handleWdtShopSelect = function handleWdtShopSelect(_ref54) {
+  var addContent = _ref54.addContent,
+    getNowData = _ref54.getNowData;
   return function (item) {
     ['shopCode'].map(function (key) {
       addContent(key, getNowData("".concat(item.uniqueKey), ''));
     });
   };
 };
-var handleDefault = function handleDefault(_ref54) {
-  var addContent = _ref54.addContent,
-    getNowData = _ref54.getNowData;
+var handleDefault = function handleDefault(_ref55) {
+  var addContent = _ref55.addContent,
+    getNowData = _ref55.getNowData;
   return function (item) {
     addContent(V.camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
   };
 };
-var handleStatusField = function handleStatusField(_ref55) {
-  var addContent = _ref55.addContent,
-    getNowData = _ref55.getNowData;
+var handleStatusField = function handleStatusField(_ref56) {
+  var addContent = _ref56.addContent,
+    getNowData = _ref56.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey, ".status"), ''));
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData("".concat(item.uniqueKey, ".reason"), ''));
   };
 };
-var handleGoodStatus = function handleGoodStatus(_ref56) {
-  var addContent = _ref56.addContent,
-    getNowData = _ref56.getNowData;
+var handleGoodStatus = function handleGoodStatus(_ref57) {
+  var addContent = _ref57.addContent,
+    getNowData = _ref57.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData("".concat(item.uniqueKey), []));
     addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey), []).map(function (item) {
@@ -748,13 +756,13 @@ var handleGoodStatus = function handleGoodStatus(_ref56) {
     }));
   };
 };
-var processComponent = function processComponent(_ref57) {
-  var params = _ref57.params,
-    nowData = _ref57.nowData,
-    updateFlag = _ref57.updateFlag,
-    detail = _ref57.detail,
-    accountName = _ref57.accountName,
-    getValueByField = _ref57.getValueByField;
+var processComponent = function processComponent(_ref58) {
+  var params = _ref58.params,
+    nowData = _ref58.nowData,
+    updateFlag = _ref58.updateFlag,
+    detail = _ref58.detail,
+    accountName = _ref58.accountName,
+    getValueByField = _ref58.getValueByField;
   return function (item) {
     var contentVoList = [];
     var uniqueKeyPrefix = "".concat(item.uniqueKey, "_");
@@ -808,6 +816,7 @@ var processComponent = function processComponent(_ref57) {
       case 'SKX_CREATE_TIME':
       case 'SKX_OUTBOUND_NOTICE_NO':
       case 'ERP_ORDER_STATUS':
+      case 'SKX_RETURN_BILL_NO':
         wrapFn(handleOnlyAddContent);
         break;
       case 'RATE':
@@ -916,6 +925,7 @@ var processComponent = function processComponent(_ref57) {
       case 'KM_LOGISTICS':
       case 'GY_LOGISTICS':
       case 'SKX_LOGISTICS':
+      case 'SKX_RETURN_LOGISTICS':
         wrapFn(handleErpLogistics);
         break;
       case 'BS_SEND_GOOD':
@@ -949,6 +959,9 @@ var processComponent = function processComponent(_ref57) {
       case 'ORDER_SUBFORM':
         wrapFn(handleOrderSubForm);
         break;
+      case 'SKX_RETURN_GOODS':
+        wrapFn(handleSkxReturnGoods);
+        break;
       case 'BS_EXCHANGE_GOODS':
         wrapFn(handleBsExchangeGoods);
         break;

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

@@ -21,7 +21,7 @@ import { message } from 'antd';
 import { get, last, cloneDeep, isEqual, set } from 'lodash';
 import { orderDetail, queryShopByTid } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, setSessionStorage, skxOrderTransform, orderSubFormOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, setSessionStorage, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import transformWorkOrderData from "./transformWorkOrderData";
@@ -140,7 +140,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _skxOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, skxOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, skxOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jstInfo, skxInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
+    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _skxOrder$value, _skxReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, skxOrder, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, 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:
@@ -278,7 +278,7 @@ export var orderBack = /*#__PURE__*/function () {
           return Promise.allSettled(promise);
         case 36:
           _yield$Promise$allSet = _context.sent;
-          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 12);
+          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 13);
           data = _yield$Promise$allSet2[0];
           xiaozhiOrder = _yield$Promise$allSet2[1];
           jstOrder = _yield$Promise$allSet2[2];
@@ -289,8 +289,9 @@ export var orderBack = /*#__PURE__*/function () {
           kmOrder = _yield$Promise$allSet2[7];
           gyOrder = _yield$Promise$allSet2[8];
           skxOrder = _yield$Promise$allSet2[9];
-          kmVideoOrder = _yield$Promise$allSet2[10];
-          orderSubFormOrder = _yield$Promise$allSet2[11];
+          skxReturnOrder = _yield$Promise$allSet2[10];
+          kmVideoOrder = _yield$Promise$allSet2[11];
+          orderSubFormOrder = _yield$Promise$allSet2[12];
           // TODO: 针对订单支付方式是微信还是支付宝，后端接口返回一个message用来提示使用
           console.log('--订单反填数据--', {
             data: data,
@@ -303,6 +304,7 @@ export var orderBack = /*#__PURE__*/function () {
             kmOrder: kmOrder,
             gyOrder: gyOrder,
             skxOrder: skxOrder,
+            skxReturnOrder: skxReturnOrder,
             kmVideoOrder: kmVideoOrder,
             orderSubFormOrder: orderSubFormOrder
           });
@@ -324,6 +326,7 @@ export var orderBack = /*#__PURE__*/function () {
           kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
           gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
           skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
+          skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
           console.log('skxOrders', {
             skxOrders: skxOrders,
             skxOrder: skxOrder
@@ -334,9 +337,10 @@ export var orderBack = /*#__PURE__*/function () {
           if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
           if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
           if (skxOrders) skxOrders.trades = (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.orderDetailInfoList) || []; //需要看实际接口返回字段
+          if (skxReturnOrders) skxReturnOrders.trades = (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.skqReturnOrderDetailInfoDtos) || [];
           pushGyLog('gyOrders', gyOrders);
           Monitor.automaticReport({
-            message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n        \u5E97\u94FAid:").concat(shopId, ",\n        \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n        jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n        bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n        wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n        wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n        bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n        km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n        \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n      ")
+            message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n        \u5E97\u94FAid:").concat(shopId, ",\n        \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n        jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n        bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n        wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n        wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n        bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n        km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n        skxReturn\u4FE1\u606F:").concat(JSON.stringify(skxReturnOrders || {}), ",\n        \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n      ")
           });
           if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
             bsOrders.orders = bsOrders.orders.filter(function (item) {
@@ -389,6 +393,11 @@ export var orderBack = /*#__PURE__*/function () {
             orderNo: order_no,
             allOrders: (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.trades) || []
           }), form);
+          skxReturnInfo = skxReturnOrders && skxReturnOrderTransform(_objectSpread(_objectSpread({}, skxReturnOrders), {}, {
+            componentList: templateDetail.componentDtoList,
+            orderNo: order_no,
+            allOrders: (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.trades) || []
+          }), form);
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
               bsGoods: []
@@ -496,6 +505,13 @@ export var orderBack = /*#__PURE__*/function () {
               logisticsCode: ''
             }];
           }
+          // if (skxReturnOrders?.trades && skxReturnOrders.trades.length > 1) {
+          //   skxReturnInfo.skxReturnGoods = {
+          //     ...skxReturnInfo.skxReturnGoods,
+          //     skxReturnGoods: [],
+          //   };
+          //   skxReturnInfo.skxLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
+          // }
 
           //获取当前表单字段
           formValue = form.getFieldsValue();
@@ -508,12 +524,13 @@ export var orderBack = /*#__PURE__*/function () {
             kmOrder: kmInfo,
             gyOrder: gyInfo,
             skxOrder: skxInfo,
-            orderSubFormOrder: orderSubFormInfo
+            orderSubFormOrder: orderSubFormInfo,
+            skxReturnOrder: skxReturnInfo
           });
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 128;
+            _context.next = 132;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -525,7 +542,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 112;
+            _context.next = 116;
             break;
           }
           list = detail['itemList'];
@@ -543,10 +560,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 102;
-          _context.next = 105;
+          _context.prev = 106;
+          _context.next = 109;
           return Promise.all(promises);
-        case 105:
+        case 109:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -556,25 +573,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 112;
+          _context.next = 116;
           break;
-        case 109:
-          _context.prev = 109;
-          _context.t1 = _context["catch"](102);
+        case 113:
+          _context.prev = 113;
+          _context.t1 = _context["catch"](106);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 112:
+        case 116:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 128;
+            _context.next = 132;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 127;
+            _context.next = 131;
             break;
           }
-          _context.prev = 115;
-          _context.next = 118;
+          _context.prev = 119;
+          _context.next = 122;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -584,21 +601,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 118:
+        case 122:
           signDatetime = _context.sent;
           detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
-          _context.next = 125;
+          _context.next = 129;
           break;
-        case 122:
-          _context.prev = 122;
-          _context.t2 = _context["catch"](115);
+        case 126:
+          _context.prev = 126;
+          _context.t2 = _context["catch"](119);
           console.error('调用签收时间错误', _context.t2);
-        case 125:
-          _context.next = 128;
+        case 129:
+          _context.next = 132;
           break;
-        case 127:
+        case 131:
           detail['tradeSigningDateTime'] = '';
-        case 128:
+        case 132:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -643,21 +660,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 139;
+          _context.next = 143;
           break;
-        case 136:
-          _context.prev = 136;
+        case 140:
+          _context.prev = 140;
           _context.t3 = _context["catch"](25);
           console.error(_context.t3);
-        case 139:
-          _context.prev = 139;
+        case 143:
+          _context.prev = 143;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(139);
-        case 142:
+          return _context.finish(143);
+        case 146:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 12, 15, 18], [25, 136, 139, 142], [102, 109], [115, 122]]);
+    }, _callee, null, [[5, 12, 15, 18], [25, 140, 143, 146], [106, 113], [119, 126]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -1024,6 +1041,9 @@ export var reversalFormValues = function reversalFormValues() {
       case 'SKX_GOODS':
         prv["".concat(next.uniqueKey, "_skxGoods")] = JSON.stringify(values[next.uniqueKey]['_skxGoods']);
         break;
+      case 'SKX_RETURN_GOODS':
+        prv["".concat(next.uniqueKey, "_skxReturnGoods")] = JSON.stringify(values[next.uniqueKey]['_skxReturnGoods']);
+        break;
     }
     return prv;
   }, {});

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

@@ -1,5 +1,5 @@
 import { HasFilterHandle } from "./tools";
-import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail } from "../../model/servers/api";
+import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, skxReturnOrderDetail } from "../../model/servers/api";
 import { servers } from '@kmkf-fe-packages/kmkf-utils';
 var orderBackKeyListMap = {
   hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
@@ -9,7 +9,8 @@ var orderBackKeyListMap = {
   hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
   hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
   hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'],
-  hasSkx: ['SKX_OUTBOUND_NOTICE_NO']
+  hasSkx: ['SKX_OUTBOUND_NOTICE_NO'],
+  hasSkxReturn: ['SKX_RETURN_BILL_NO']
 };
 export var orderBackMap = function orderBackMap(_ref) {
   var templateDetail = _ref.templateDetail,
@@ -84,6 +85,15 @@ export var orderBackMap = function orderBackMap(_ref) {
           tid: order_no
         });
       }
+    },
+    // 根据系统订单号反填，所以只要判断是否有系统订单号就行
+    hasSkxReturn: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasSkxReturn),
+      promiseRequest: function promiseRequest() {
+        return skxReturnOrderDetail({
+          tid: order_no
+        });
+      }
     }
   };
 };

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

@@ -484,6 +484,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
       },
       SKX_LOGISTICS: {
         listKey: 'skxLogisticsList'
+      },
+      SKX_RETURN_LOGISTICS: {
+        listKey: 'skxReturnLogistics'
       }
     };
     var initValue = [{
@@ -693,6 +696,14 @@ var processSkxGoods = function processSkxGoods(getValue) {
     return _defineProperty({}, nex.uniqueKey, _values);
   };
 };
+var processSkxReturnGoods = function processSkxReturnGoods(getValue) {
+  return function (nex, config) {
+    var _values = {
+      skxReturnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_skxReturnGoods")), [])
+    };
+    return _defineProperty({}, nex.uniqueKey, _values);
+  };
+};
 var processBsReissueGoods = function processBsReissueGoods(getValue) {
   return function (nex, config) {
     return _defineProperty({}, nex.uniqueKey, {
@@ -1049,14 +1060,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref74;
-    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
+    var _ref75;
+    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref75;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref75;
-    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
+    var _ref76;
+    return _ref76 = {}, _defineProperty(_ref76, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref76, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref76;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1239,7 +1250,9 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       WDT_TAGS: wdtTags,
       EXECUTE_ACTION_TYPE: processExecuteActionType,
       SKX_GOODS: processSkxGoods,
-      SKX_LOGISTICS: processErpLogistics
+      SKX_RETURN_GOODS: processSkxReturnGoods,
+      SKX_LOGISTICS: processErpLogistics,
+      SKX_RETURN_LOGISTICS: processErpLogistics
     }, Object.keys(processSingleFieldTypeMapping).reduce(function (acc, key) {
       acc[key] = processSingleFieldByKey(processSingleFieldTypeMapping[key]);
       return acc;

package/dist/esm/model/servers/api.d.ts

@@ -80,6 +80,7 @@ export declare const bsE3OrderDetail: (data: any) => Promise<any>;
 export declare const kmOrderDetail: (data: any) => Promise<serverProps<any>>;
 export declare const gyOrderDetail: (data: any) => Promise<any>;
 export declare const skxOrderDetail: (data: any) => Promise<any>;
+export declare const skxReturnOrderDetail: (data: any) => Promise<any>;
 export declare const getRepeatWorkOrderList: (data: any) => Promise<any>;
 export declare const logisticsInterceptCancel: (data: any) => Promise<any>;
 export declare const queryLogisticsTrack: (data: any) => Promise<any>;

package/dist/esm/model/servers/api.js

@@ -8,8 +8,8 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 10:28:04
- * @LastEditors: litian
- * @LastEditTime: 2022-11-08 13:58:05
+ * @LastEditors: flyingMonkey 760958607@qq.com
+ * @LastEditTime: 2025-09-03 16:43:05
  */
 import request from "./request";
 import { tradeStatusMap } from '@kmkf-fe-packages/kmkf-utils';
@@ -461,7 +461,15 @@ export var skxOrderDetail = function skxOrderDetail(data) {
     infoLevel: 'warning'
   });
 };
-
+//  斯凯奇退货订单详情
+export var skxReturnOrderDetail = function skxReturnOrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/order/skxReturnOrderDetail',
+    method: 'post',
+    data: data,
+    infoLevel: 'warning'
+  });
+};
 // 获取重复详情
 export var getRepeatWorkOrderList = function getRepeatWorkOrderList(data) {
   return request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.7.0-rc.0",
+  "version": "2.8.0-rc.0",
   "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.0-rc.0",
-    "@kmkf-fe-packages/kmkf-utils": "2.5.0-rc.0",
-    "@kmkf-fe-packages/services-components": "2.7.0-rc.0",
+    "@kmkf-fe-packages/basic-components": "2.8.0-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.8.0-rc.0",
+    "@kmkf-fe-packages/services-components": "2.8.0-rc.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "37a143fed0f8a760f5821f1609a2c86ab7d98286",
+  "gitHead": "d934929b6c784f46f6b225ec37528c9d18b155ad",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }