@kmkf-fe-packages/kmkf-utils 2.10.9-beta.7 → 2.10.9-beta.9

package/dist/esm/constants/constant.js

@@ -125,7 +125,7 @@ export var SYMBOL = {
   EQ: "eq"
 };
 export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "ERP_AFTER_SALES_ORDER_REVIEW_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
-export var SelectInputComponent = ["INPUT", "TEXTAREA", "SHOP_NAME_INPUT", "BUYER_NICK_INPUT", "RECEIVER_NAME_INPUT", "REMARK_INPUT", "RETURN_GOODS_STATUS", "EXCHANGE_STATUS", "BS_LOGISTICS", "WLN_LOGISTICS", "WDT_LOGISTICS", "KM_LOGISTICS", "GY_LOGISTICS", "JST_LOGISTICS", "AFTER_SALES_ORDER_ID"];
+export var SelectInputComponent = ["INPUT", "TEXTAREA", "SHOP_NAME_INPUT", "BUYER_NICK_INPUT", "RECEIVER_NAME_INPUT", "REMARK_INPUT", "RETURN_GOODS_STATUS", "EXCHANGE_STATUS", "BS_LOGISTICS", "WLN_LOGISTICS", "WDT_LOGISTICS", "KM_LOGISTICS", "GY_LOGISTICS", "JST_LOGISTICS", "DXD_LOGISTICS", "AFTER_SALES_ORDER_ID"];
 
 // 表单默认值
 export var INIT_FORM_VALUE = {

package/dist/esm/utils/dxdOrderBackFormValues.js

@@ -87,6 +87,7 @@ export var updateDxdGoodsHandle = function updateDxdGoodsHandle() {
     ((order === null || order === void 0 ? void 0 : order.skus) || []).forEach(function (sku) {
       var _sku$uuid;
       prv.push(_objectSpread(_objectSpread({}, sku), {}, {
+        systemOrderNo: order.orderNo,
         uuid: (_sku$uuid = sku === null || sku === void 0 ? void 0 : sku.uuid) !== null && _sku$uuid !== void 0 ? _sku$uuid : uuid(),
         canDelete: true,
         canEdit: !!config.canEdit
@@ -190,18 +191,29 @@ var updateDxdItemListByConfigHandle = function updateDxdItemListByConfigHandle(l
 
 // DXD 订单数据转换
 export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
-  var _data$doOrders$3, _data$doOrders$4, _data$doOrders$5, _data$doOrders$6;
+  var _doOrders$3, _doOrders$4, _doOrders$5, _doOrders$6;
   var _ref = detail || {},
     orderNo = _ref.orderNo,
     componentList = _ref.componentList,
     inputSelectedRows = _ref.selectedRows,
     matchLogisticsNo = _ref.matchLogisticsNo;
   var data = (detail === null || detail === void 0 ? void 0 : detail.data) || {};
+  var doOrders = ((data === null || data === void 0 ? void 0 : data.doOrders) || []).map(function (order) {
+    return _objectSpread(_objectSpread({}, order), {}, {
+      skus: ((order === null || order === void 0 ? void 0 : order.skus) || []).map(function (sku) {
+        var _sku$uuid2;
+        return _objectSpread(_objectSpread({}, sku), {}, {
+          systemOrderNo: order.orderNo,
+          uuid: (_sku$uuid2 = sku === null || sku === void 0 ? void 0 : sku.uuid) !== null && _sku$uuid2 !== void 0 ? _sku$uuid2 : uuid()
+        });
+      })
+    });
+  });
   // 参考 KM：判断是否只有一个出库订单（用于系统订单组件的默认选中逻辑）
-  var onlyOneSystemOrder = ((data === null || data === void 0 ? void 0 : data.doOrders) || []).length === 1;
+  var onlyOneSystemOrder = doOrders.length === 1;
 
   // 参考 KM/WDT：根据物流单号匹配系统订单
-  var matchedSystemOrders = matchLogisticsNo ? ((data === null || data === void 0 ? void 0 : data.doOrders) || []).filter(function (item) {
+  var matchedSystemOrders = matchLogisticsNo ? doOrders.filter(function (item) {
     return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
   }) : [];
   var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
@@ -234,60 +246,52 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
     // 场景2：用户手动勾选
     selectedRows = inputSelectedRows;
   } else if (onlyOneSystemOrder) {
-    var _data$doOrders$, _data$doOrders$2;
+    var _doOrders$, _doOrders$2;
     // 场景3：只有一个订单，默认选中
-    selectedRows = [_objectSpread(_objectSpread({}, (data === null || data === void 0 ? void 0 : data.doOrders[0]) || {}), {}, {
-      skus: (data === null || data === void 0 ? void 0 : (_data$doOrders$ = data.doOrders[0]) === null || _data$doOrders$ === void 0 ? void 0 : _data$doOrders$.skus) || [],
-      billNo: data === null || data === void 0 ? void 0 : (_data$doOrders$2 = data.doOrders[0]) === null || _data$doOrders$2 === void 0 ? void 0 : _data$doOrders$2.orderNo,
+    selectedRows = [_objectSpread(_objectSpread({}, doOrders[0] || {}), {}, {
+      skus: ((_doOrders$ = doOrders[0]) === null || _doOrders$ === void 0 ? void 0 : _doOrders$.skus) || [],
+      billNo: (_doOrders$2 = doOrders[0]) === null || _doOrders$2 === void 0 ? void 0 : _doOrders$2.orderNo,
       billType: data !== null && data !== void 0 && data.split ? "拆分订单" : "普通订单"
     })];
   }
   // 场景4：多个订单且未匹配且未手动勾选，selectedRows 为空数组
 
   // 参考 KM：决定用哪些订单反填商品
-  var orderBackDoOrders = selectedRows.length > 0 ? ((data === null || data === void 0 ? void 0 : data.doOrders) || []).filter(function (o) {
-    return selectedRows.some(function (r) {
-      return r.orderNo === o.orderNo;
+  var orderBackDoOrders = selectedRows.length > 0 ? doOrders.filter(function (order) {
+    return selectedRows.some(function (row) {
+      return row.orderNo === order.orderNo;
     });
   }) : [];
 
   // 转换 orderBackDoOrders.skus 为 dxdGoods 格式：展平订单的 skus
-  var dxdGoods = [];
-  (orderBackDoOrders || []).forEach(function (order) {
-    (order.skus || []).forEach(function (sku) {
-      var _sku$uuid2;
-      dxdGoods.push(_objectSpread(_objectSpread({}, sku), {}, {
-        uuid: (_sku$uuid2 = sku === null || sku === void 0 ? void 0 : sku.uuid) !== null && _sku$uuid2 !== void 0 ? _sku$uuid2 : uuid(),
-        canDelete: true,
-        canEdit: true
-      }));
-    });
+  var dxdGoods = updateDxdGoodsHandle(orderBackDoOrders, {
+    canEdit: true
   });
 
   // 转换 doOrders（出库订单）为系统订单格式
   var dxdSystemOrder = {
     isRequest: true,
     orderNo: (data === null || data === void 0 ? void 0 : data.platformOrderNo) || orderNo,
-    orders: ((data === null || data === void 0 ? void 0 : data.doOrders) || []).map(function (order) {
+    orders: doOrders.map(function (order) {
       return _objectSpread(_objectSpread({}, order), {}, {
         skus: order.skus || [],
         billNo: order.orderNo,
         billType: data !== null && data !== void 0 && data.split ? "拆分订单" : "普通订单"
       });
     }),
-    selectIds: matchedSystemOrderIds.length > 0 ? matchedSystemOrderIds : ((data === null || data === void 0 ? void 0 : data.doOrders) || []).length === 1 ? [data === null || data === void 0 ? void 0 : (_data$doOrders$3 = data.doOrders[0]) === null || _data$doOrders$3 === void 0 ? void 0 : _data$doOrders$3.orderNo] : [],
+    selectIds: matchedSystemOrderIds.length > 0 ? matchedSystemOrderIds : doOrders.length === 1 ? [(_doOrders$3 = doOrders[0]) === null || _doOrders$3 === void 0 ? void 0 : _doOrders$3.orderNo] : [],
     selectedRows: matchedSystemOrders.length > 0 ? matchedSystemOrders.map(function (order) {
       return _objectSpread(_objectSpread({}, order), {}, {
         skus: order.skus || [],
         billNo: order.orderNo,
         billType: data !== null && data !== void 0 && data.split ? "拆分订单" : "普通订单"
       });
-    }) : ((data === null || data === void 0 ? void 0 : data.doOrders) || []).length === 1 ? [_objectSpread(_objectSpread({}, (data === null || data === void 0 ? void 0 : data.doOrders[0]) || {}), {}, {
-      skus: (data === null || data === void 0 ? void 0 : (_data$doOrders$4 = data.doOrders[0]) === null || _data$doOrders$4 === void 0 ? void 0 : _data$doOrders$4.skus) || [],
-      billNo: data === null || data === void 0 ? void 0 : (_data$doOrders$5 = data.doOrders[0]) === null || _data$doOrders$5 === void 0 ? void 0 : _data$doOrders$5.orderNo,
+    }) : doOrders.length === 1 ? [_objectSpread(_objectSpread({}, doOrders[0] || {}), {}, {
+      skus: ((_doOrders$4 = doOrders[0]) === null || _doOrders$4 === void 0 ? void 0 : _doOrders$4.skus) || [],
+      billNo: (_doOrders$5 = doOrders[0]) === null || _doOrders$5 === void 0 ? void 0 : _doOrders$5.orderNo,
       billType: data !== null && data !== void 0 && data.split ? "拆分订单" : "普通订单"
     })] : [],
-    showOrderInfo: ((data === null || data === void 0 ? void 0 : data.doOrders) || []).map(function (order) {
+    showOrderInfo: doOrders.map(function (order) {
       return _objectSpread(_objectSpread({}, order), {}, {
         skus: order.skus || [],
         billNo: order.orderNo,
@@ -297,12 +301,12 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
   };
 
   // 转换物流信息（检查 notOrderBack；用通用字段名 logisticsCompany/logisticsCode，与 KM/showField 一致）
-  var dxdLogistics = updateDxdItemListHandle((data === null || data === void 0 ? void 0 : data.doOrders) || [], "logistics", componentList, form);
+  var dxdLogistics = updateDxdItemListHandle(doOrders, "logistics", componentList, form);
 
   // 转换发货信息（sendName 存编码，sendSnapshotName 存名称快照；检查 notOrderBack）
-  var dxdSendGood = updateDxdItemListHandle((data === null || data === void 0 ? void 0 : data.doOrders) || [], "send", componentList, form);
+  var dxdSendGood = updateDxdItemListHandle(doOrders, "send", componentList, form);
   return {
-    dxdSystemOrderNo: ((data === null || data === void 0 ? void 0 : data.doOrders) || []).length > 0 ? data === null || data === void 0 ? void 0 : (_data$doOrders$6 = data.doOrders[0]) === null || _data$doOrders$6 === void 0 ? void 0 : _data$doOrders$6.orderNo : null,
+    dxdSystemOrderNo: doOrders.length > 0 ? (_doOrders$6 = doOrders[0]) === null || _doOrders$6 === void 0 ? void 0 : _doOrders$6.orderNo : null,
     dxdSystemOrder: dxdSystemOrder,
     dxdGoods: {
       isRequest: true,
@@ -310,7 +314,7 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
       // DXD 无独立系统订单勾选逻辑，orders 取 allOrders（与 KM_GOODS 结构一致，供选品使用）
       orders: (detail === null || detail === void 0 ? void 0 : detail.allOrders) || [],
       // systemOrders 用 doOrders（出库订单），供 GoodItem 筛选系统订单商品下拉（allOrders 是 items 平台商品，不含 orderNo）
-      systemOrders: (data === null || data === void 0 ? void 0 : data.doOrders) || [],
+      systemOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders,
       orderNo: orderNo,
       dxdGoods: dxdGoods,
       shopCode: data === null || data === void 0 ? void 0 : data.shopCode,

package/dist/esm/utils/transformList.js

@@ -169,7 +169,7 @@ export var transformList = function transformList(fields, uniqueKeys) {
                   return acc;
                 }, {});
               }
-            } else if (["bsLogisticsList", "wlnLogisticsList", "wdtLogisticsList", "jstItemList", "kmLogisticsList", "gyLogisticsList"].includes(field)) {
+            } else if (["bsLogisticsList", "wlnLogisticsList", "wdtLogisticsList", "jstItemList", "kmLogisticsList", "gyLogisticsList", "dxdLogisticsList"].includes(field)) {
               var logisticsMap = {
                 bsLogisticsList: {
                   company: "bsLogisticsCompany",
@@ -200,6 +200,11 @@ export var transformList = function transformList(fields, uniqueKeys) {
                   company: "gyLogisticsCompany",
                   code: "gyLogisticsCode",
                   item: "gyLogisticsItem"
+                },
+                dxdLogisticsList: {
+                  company: "dxdLogisticsCompany",
+                  code: "dxdLogisticsCode",
+                  item: "dxdLogisticsItem"
                 }
               };
               if (goodsParams[index]) {

package/package.json

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