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

package/dist/esm/utils/dxdOrderBackFormValues.d.ts

@@ -14,8 +14,8 @@ export declare const DXD_SYSTEM_ORDER_CONFIG: {
         dataIndex: string;
         title: string;
         width: number;
-        render: (val: boolean) => "否" | "是";
-        renderExport: (val: boolean) => "否" | "是";
+        render: (val: boolean) => "是" | "否";
+        renderExport: (val: boolean) => "是" | "否";
         conditionOptionsSetting: {
             dataType: string;
             getOptions: () => {
@@ -27,8 +27,8 @@ export declare const DXD_SYSTEM_ORDER_CONFIG: {
         dataIndex: string;
         title: string;
         width: number;
-        render: (val: boolean) => "否" | "是";
-        renderExport: (val: boolean) => "否" | "是";
+        render: (val: boolean) => "是" | "否";
+        renderExport: (val: boolean) => "是" | "否";
         conditionOptionsSetting?: undefined;
     })[];
 };

package/dist/esm/utils/dxdOrderBackFormValues.js

@@ -135,7 +135,7 @@ var updateDxdItemListHandle = function updateDxdItemListHandle(list, type, comLi
     var params = {};
     if (type === "logistics") {
       params.logisticsCompany = next === null || next === void 0 ? void 0 : next.monthCardNo;
-      params.logisticsCode = next === null || next === void 0 ? void 0 : next.logsticsNo;
+      params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticsNo;
     } else if (type === "send") {
       params.sendId = next.warehouseCode;
       // sendName 是下拉框，最终存的是编码，所以用 warehouseCode 反填
@@ -198,7 +198,8 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
     componentList = _ref.componentList,
     inputSelectedRows = _ref.selectedRows,
     matchLogisticsNo = _ref.matchLogisticsNo;
-  var data = (detail === null || detail === void 0 ? void 0 : detail.data) || {};
+  var data = doOrders[0] || {};
+
   // 参考 KM：判断是否只有一个出库订单（用于系统订单组件的默认选中逻辑）
   var onlyOneSystemOrder = doOrders.length === 1;
 
@@ -220,17 +221,12 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
   if (matchedSystemOrders.length > 0) {
     // 场景1：根据物流单号匹配到订单
     selectedRows = matchedSystemOrders.map(function (order) {
-      return {
-        orderNo: order.orderNo,
-        warehouseCode: order.warehouseCode,
-        warehouseName: order.warehouseName,
-        logisticsCode: order.logisticsCode,
-        logisticsName: order.logisticsName,
+      return _objectSpread(_objectSpread({}, order), {}, {
         coldChain: order.coldChain,
         skus: order.skus || [],
         billNo: order.orderNo,
         billType: data !== null && data !== void 0 && data.split ? "拆分订单" : "普通订单"
-      };
+      });
     });
   } else if (inputSelectedRows) {
     // 场景2：用户手动勾选
@@ -291,10 +287,10 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
   };
 
   // 转换物流信息（检查 notOrderBack；用通用字段名 logisticsCompany/logisticsCode，与 KM/showField 一致）
-  var dxdLogistics = updateDxdItemListHandle(doOrders, "logistics", componentList, form);
+  var dxdLogistics = updateDxdItemListHandle(matchedSystemOrders.length > 0 ? matchedSystemOrders : doOrders, "logistics", componentList, form);
 
   // 转换发货信息（sendName 存编码，sendSnapshotName 存名称快照；检查 notOrderBack）
-  var dxdSendGood = updateDxdItemListHandle(doOrders, "send", componentList, form);
+  var dxdSendGood = updateDxdItemListHandle(matchedSystemOrders.length > 0 ? matchedSystemOrders : doOrders, "send", componentList, form);
   return {
     dxdSystemOrderNo: doOrders.length > 0 ? (_doOrders$6 = doOrders[0]) === null || _doOrders$6 === void 0 ? void 0 : _doOrders$6.orderNo : null,
     dxdSystemOrder: dxdSystemOrder,

package/dist/esm/utils/jkyOrderBackFormValues.d.ts

@@ -12,8 +12,8 @@ export declare const JKY_SYSTEM_ORDER_CONFIG: {
         dataIndex: string;
         title: string;
         width: number;
-        render: (val: number) => "否" | "是";
-        renderExport: (val: number) => "否" | "是";
+        render: (val: number) => "是" | "否";
+        renderExport: (val: number) => "是" | "否";
     })[];
 };
 export declare const JKY_ORDER_FROM_MAP: {

package/package.json

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