@kmkf-fe-packages/basic-components 2.10.9-beta.2 → 2.10.9-beta.21

package/dist/index.esm.js

@@ -3,12 +3,13 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, isJdLogisticsCompany, getJdCustomerCodeOptions, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
+import Monitor from 'kmkf-monitor';
 import pubsub from 'pubsub-js';
 import { internals, useTablePipeline, features, BaseTable } from 'ali-react-table';
 import zh_CN from 'antd/lib/locale-provider/zh_CN';
@@ -735,6 +736,12 @@ var ApaasUpload = function ApaasUpload(_ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$4);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
+  // 当前批次正在处理的文件数，用于判断批次何时结束
+  var pendingCountRef = useRef(0);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -750,6 +757,32 @@ var ApaasUpload = function ApaasUpload(_ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  // 获取当前批次的文件选择序号；没有正在处理的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
+  // 将单个文件结果存入当前批次，本批次全部完成时按选择顺序合并到 value
+  var appendResult = function appendResult(batchSeq, result) {
+    if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+      batchResultsRef.current.set(batchSeq, result);
+    }
+    pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+    if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+      var sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+        return a[0] - b[0];
+      }).map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          v = _ref3[1];
+        return v;
+      });
+      handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+      batchResultsRef.current.clear();
+    }
+  };
   var imgReader = function imgReader(item) {
     var blob = item.getAsFile(),
       reader = new FileReader();
@@ -757,14 +790,16 @@ var ApaasUpload = function ApaasUpload(_ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return;
     }
-    if (valueRef.current.length >= maxCount) {
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u53EA\u80FD\u4E0A\u4F20".concat(maxCount, "\u5F20\u56FE\u7247"));
       return;
     }
+    var batchSeq = acquireBatchSeq();
+    pendingCountRef.current += 1;
     reader.onload = function (e) {
       var _e$target;
       var result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-      handleChange([].concat(_toConsumableArray(valueRef.current), [result]));
+      appendResult(batchSeq, result);
     };
     reader.readAsDataURL(blob);
   };
@@ -797,7 +832,8 @@ var ApaasUpload = function ApaasUpload(_ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -805,8 +841,10 @@ var ApaasUpload = function ApaasUpload(_ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
+    var batchSeq = acquireBatchSeq();
+    pendingCountRef.current += 1;
     getBase64(file).then(function (res) {
-      return handleChange([].concat(_toConsumableArray(valueRef.current), [res]));
+      appendResult(batchSeq, res);
     });
     return Upload.LIST_IGNORE;
   };
@@ -908,6 +946,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -1048,6 +1087,16 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$6);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 并发上传时用于正确控制 loading 状态（多个文件同时上传）
+  var uploadingCountRef = useRef(0);
+  // 已选中待上传的文件数，用于数量预占，避免并发上传超过 maxCount
+  var pendingCountRef = useRef(0);
+  // 文件序号，保证并发上传时文件名唯一
+  var seqRef = useRef(0);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     uploading = _useState2[0],
@@ -1062,48 +1111,80 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  var genFileName = function genFileName() {
+    seqRef.current += 1;
+    return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
+  };
+  // 获取当前批次的文件选择序号；没有正在上传的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var _valueRef$current;
-      var formData, fileName, _yield$request, success, data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
+      var formData, fileName, _yield$request, success, data, sorted;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            pendingCountRef.current += 1;
+            uploadingCountRef.current += 1;
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
-            fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+            fileName = genFileName();
             formData.append('fileName', fileName);
-            _context.prev = 5;
-            _context.next = 8;
+            _context.prev = 7;
+            _context.next = 10;
             return request(actionUrl, {
               method: 'post',
               body: formData
             });
-          case 8:
+          case 10:
             _yield$request = _context.sent;
             success = _yield$request.success;
             data = _yield$request.data;
             if (success) {
-              handleChange([].concat(_toConsumableArray(valueRef.current), [data]));
+              if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+                // 先暂存到当前批次，等本批次全部完成后再按选择顺序合并
+                batchResultsRef.current.set(batchSeq, data);
+              }
             }
-            _context.next = 17;
+            _context.next = 19;
             break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](5);
+          case 16:
+            _context.prev = 16;
+            _context.t0 = _context["catch"](7);
             message.error('图片上传失败');
-          case 17:
-            _context.prev = 17;
-            setUploading(false);
-            return _context.finish(17);
-          case 20:
+          case 19:
+            _context.prev = 19;
+            pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+            uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
+            // 本批次全部上传完成，按选择序号排序后一次性合并到 value
+            if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+              sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+                return a[0] - b[0];
+              }).map(function (_ref3) {
+                var _ref4 = _slicedToArray(_ref3, 2),
+                  v = _ref4[1];
+                return v;
+              });
+              handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+              batchResultsRef.current.clear();
+            }
+            if (uploadingCountRef.current === 0) {
+              setUploading(false);
+            }
+            return _context.finish(19);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 14, 17, 20]]);
+      }, _callee, null, [[7, 16, 19, 25]]);
     }));
-    return function asyncUpload(_x) {
+    return function asyncUpload(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -1119,24 +1200,24 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-        var _e$target, _valueRef$current2;
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        var _e$target;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-              fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+              fileName = genFileName();
               file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              asyncUpload(file, acquireBatchSeq());
             case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1170,7 +1251,8 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -1178,7 +1260,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    asyncUpload(file, acquireBatchSeq());
     return Upload.LIST_IGNORE;
   };
   var handleDelete = function handleDelete(key) {
@@ -1275,6 +1357,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles$1.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -1318,6 +1401,16 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$7);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 并发上传时用于正确控制 loading 状态（多个文件同时上传）
+  var uploadingCountRef = useRef(0);
+  // 已选中待上传的文件数，用于数量预占，避免并发上传超过 maxCount
+  var pendingCountRef = useRef(0);
+  // 文件序号，保证并发上传时文件名唯一
+  var seqRef = useRef(0);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     uploading = _useState2[0],
@@ -1332,61 +1425,84 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  var genFileName = function genFileName() {
+    seqRef.current += 1;
+    return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
+  };
+  // 获取当前批次的文件选择序号；没有正在上传的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var _valueRef$current;
-      var formData, fileName, showName, _yield$request, success, data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
+      var formData, fileName, showName, _yield$request, success, data, sorted;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            pendingCountRef.current += 1;
+            uploadingCountRef.current += 1;
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
-            fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+            fileName = genFileName();
             formData.append('fileName', fileName);
             showName = file.name.substring(0, file.name.lastIndexOf('.'));
-            _context.prev = 6;
-            _context.next = 9;
+            _context.prev = 8;
+            _context.next = 11;
             return request(actionUrl, {
               method: 'post',
               body: formData
             });
-          case 9:
+          case 11:
             _yield$request = _context.sent;
             success = _yield$request.success;
             data = _yield$request.data;
-            if (!success) {
-              _context.next = 16;
-              break;
-            }
-            if (!(valueRef.current.length >= maxCount)) {
-              _context.next = 15;
-              break;
+            if (success) {
+              if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+                // 先暂存到当前批次，等本批次全部完成后再按选择顺序合并
+                batchResultsRef.current.set(batchSeq, {
+                  url: data,
+                  name: showName
+                });
+              }
             }
-            return _context.abrupt("return");
-          case 15:
-            handleChange([].concat(_toConsumableArray(valueRef.current), [{
-              url: data,
-              name: showName
-            }]));
-          case 16:
-            _context.next = 21;
+            _context.next = 20;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](6);
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](8);
             message.error('图片上传失败');
-          case 21:
-            _context.prev = 21;
-            setUploading(false);
-            return _context.finish(21);
-          case 24:
+          case 20:
+            _context.prev = 20;
+            pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+            uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
+            // 本批次全部上传完成，按选择序号排序后一次性合并到 value
+            if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+              sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+                return a[0] - b[0];
+              }).map(function (_ref3) {
+                var _ref4 = _slicedToArray(_ref3, 2),
+                  v = _ref4[1];
+                return v;
+              });
+              handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+              batchResultsRef.current.clear();
+            }
+            if (uploadingCountRef.current === 0) {
+              setUploading(false);
+            }
+            return _context.finish(20);
+          case 26:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 18, 21, 24]]);
+      }, _callee, null, [[8, 17, 20, 26]]);
     }));
-    return function asyncUpload(_x) {
+    return function asyncUpload(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -1402,24 +1518,24 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-        var _e$target, _valueRef$current2;
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        var _e$target;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-              fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+              fileName = genFileName();
               file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              asyncUpload(file, acquireBatchSeq());
             case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1453,7 +1569,8 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -1461,7 +1578,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    asyncUpload(file, acquireBatchSeq());
     return Upload.LIST_IGNORE;
   };
   var handleDelete = function handleDelete(key) {
@@ -1595,6 +1712,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles$2.uploadPro,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -7816,6 +7934,22 @@ var Province = function Province(props) {
 };
 
 var TextArea$1 = Input.TextArea;
+/**
+ * 直辖市省份名称映射（带"市" → 不带"市"）
+ * 接口返回的 province 可能带"市"（如"重庆市"），但省市区下拉数据一级节点不带"市"（如"重庆"），
+ * 此处做单向转换确保匹配。
+ */
+var MUNICIPALITY_PROVINCE_MAP = {
+  '北京市': '北京',
+  '天津市': '天津',
+  '上海市': '上海',
+  '重庆市': '重庆'
+};
+/** 直辖市省份名称去"市"处理，普通省份保持原值 */
+var normalizeMunicipalityProvince = function normalizeMunicipalityProvince(province) {
+  if (!province) return province;
+  return MUNICIPALITY_PROVINCE_MAP[province] || province;
+};
 var ParseLogistics = function ParseLogistics(props) {
   var onChange = props.onChange,
     _props$selfCalibratio = props.selfCalibration;
@@ -7855,11 +7989,10 @@ var ParseLogistics = function ParseLogistics(props) {
       }
     }).then(function (res) {
       var data = res.data;
-      // 如果是通过内部校准添加的姓名和手机号，则去除
-      // if (needCalibration) {
-      //   data.name = '';
-      //   data.phone = '';
-      // }
+      // 规范化直辖市省份名称，兼容接口带"市"、数据不带"市"的情况
+      if (data === null || data === void 0 ? void 0 : data.province) {
+        data.province = normalizeMunicipalityProvince(data.province);
+      }
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       handleAIIdentify(fullAddress);
@@ -7885,6 +8018,10 @@ var ParseLogistics = function ParseLogistics(props) {
       }
     }).then(function (res) {
       var data = res.data;
+      // 规范化直辖市省份名称，兼容接口带"市"、数据不带"市"的情况
+      if (data === null || data === void 0 ? void 0 : data.province) {
+        data.province = normalizeMunicipalityProvince(data.province);
+      }
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       console.log(e);
@@ -8495,7 +8632,7 @@ var processLogisticsInterception = function processLogisticsInterception(getValu
     address = every(address, function (item) {
       return !item;
     }) ? [] : address;
-    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey'];
+    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey', 'interceptLogisticsCustomerCode'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
@@ -8676,6 +8813,7 @@ var processSceneStatus = function processSceneStatus(getValue) {
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
       WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
+      DXD_WAREHOUSING_STATUS: 'dxdInStockStatusItemList',
       JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
       JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
       WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList',
@@ -8707,6 +8845,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
       },
       SKX_LOGISTICS: {
         listKey: 'skxLogisticsList'
+      },
+      DXD_LOGISTICS: {
+        listKey: 'dxdLogisticsList'
       }
     };
     var initValue = [{
@@ -9585,6 +9726,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      DXD_WAREHOUSING_STATUS: processSceneStatus,
       WLN_WAREHOUSING_STATUS: processSceneStatus,
       JKY_WAREHOUSING_STATUS: processSceneStatus,
       JST_WAREHOUSING_STATUS: processSceneStatus,
@@ -9595,6 +9737,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       GY_LOGISTICS: processErpLogistics,
       BS_E3_LOGISTICS: processErpLogistics,
       KM_LOGISTICS: processErpLogistics,
+      DXD_LOGISTICS: processErpLogistics,
       BS_SEND_GOOD: processErpSendGood,
       WLN_SEND_GOOD: processErpSendGood,
       WDT_SEND_GOOD: processErpSendGood,
@@ -13328,6 +13471,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
     setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  useEffect(function () {
+    if (!isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany) && (value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode) !== undefined) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        interceptLogisticsCustomerCode: undefined
+      }));
+    }
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode]);
   //拦截类型切换 需要清空派送地址
   useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) return;
@@ -13390,6 +13540,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
     return isShow;
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var showCustomerCode = useMemo(function () {
+    return isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //判断是否能修改物流信息
   var isEdit = useMemo(function () {
     var company = expressInterceptData.find(function (item) {
@@ -13416,6 +13569,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
       });
     });
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var customerCodeOptions = useMemo(function () {
+    return getJdCustomerCodeOptions(LogisticsAddressOptions, value === null || value === void 0 ? void 0 : value.interceptCompany);
+  }, [LogisticsAddressOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   var returnValue = useMemo(function () {
     var _value$interceptAddre, _value$interceptAddre2, _value$interceptAddre3;
     var uk = LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getUkByInfo({
@@ -13471,9 +13627,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
       //     userSecretKey: '12345678',
       //   },
       // ];
-      var matchKCodeList = LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
-        return item.cpCode === val && item.userKCode;
-      });
       newValue = _objectSpread2(_objectSpread2({}, newValue), {}, {
         interceptCompany: val,
         interceptType: (_defaultInterceptType = defaultInterceptType) === null || _defaultInterceptType === void 0 ? void 0 : _defaultInterceptType.value,
@@ -13492,7 +13645,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         },
         interceptLogisticsApiStatusReason: undefined,
         interceptLogisticsUserKCode: undefined,
-        interceptLogisticsUserSecretKey: undefined
+        interceptLogisticsUserSecretKey: undefined,
+        interceptLogisticsCustomerCode: undefined
       });
     }
     if (type === 'interceptLogisticsApiStatus') {
@@ -13573,7 +13727,37 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptCode');
     },
     value: value === null || value === void 0 ? void 0 : value.interceptCode
-  }))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
+  }))), /*#__PURE__*/React.createElement(Item, {
+    label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801", platform === 'pc' ? /*#__PURE__*/React.createElement(React.Fragment, null, "\uFF1A", /*#__PURE__*/React.createElement(Typography.Link, {
+      style: {
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return onJumpPage && (onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
+          type: 'interceptConfig'
+        }));
+      }
+    }, 'K码/EBU码配置>>')) : null),
+    required: showCustomerCode,
+    key: 'interceptLogisticsCustomerCode',
+    hidden: !showCustomerCode
+  }, /*#__PURE__*/React.createElement(Select, {
+    disabled: disabled,
+    placeholder: "\u9009\u62E9\u5BA2\u6237\u7F16\u7801",
+    notFoundContent: "\u6682\u65E0\u5BA2\u6237\u7F16\u7801\u914D\u7F6E\uFF0C\u8BF7\u5148\u524D\u5F80K\u7801/EBU\u7801\u914D\u7F6E>>",
+    showSearch: true,
+    style: {
+      width: '200px'
+    },
+    onChange: function onChange(val) {
+      return changeHandle(val, 'interceptLogisticsCustomerCode');
+    },
+    options: customerCodeOptions,
+    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    }
+  })), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
     label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801\uFF08K\u7801\uFF09\uFF1A", platform === 'pc' ? /*#__PURE__*/React.createElement(Typography.Link, {
       style: {
         cursor: 'pointer'
@@ -13618,7 +13802,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value: value === null || value === void 0 ? void 0 : value.interceptLogisticsUserSecretKey
   }))), /*#__PURE__*/React.createElement(Item, {
     label: '拦截类型',
-    required: required,
+    required: required && !showCustomerCode,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
     disabled: baseFieldDisabled,
@@ -14259,7 +14443,8 @@ var jstGoods = function jstGoods(props) {
     _props$platformType = props.platformType,
     platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
     onlyShowFieldSelect = props.onlyShowFieldSelect,
-    logisticsCompanyFormType = props.logisticsCompanyFormType;
+    logisticsCompanyFormType = props.logisticsCompanyFormType,
+    form = props.form;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -14274,6 +14459,28 @@ var jstGoods = function jstGoods(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
+  useEffect(function () {
+    //丢失sendSnapshotName，未找到具体原因，兜底处理
+    if (type === 3 && isSendGoodSavedId && value && value.length && value.some(function (item) {
+      return !item.sendSnapshotName;
+    }) && value.every(function (item) {
+      return item.sendId;
+    })) {
+      var orderNo = form === null || form === void 0 ? void 0 : form.getFieldValue('m3ap1EvEyd');
+      console.log('发货仓走兜底处理-oldValue--', orderNo, cloneDeep(value));
+      var newValue = cloneDeep(value).map(function (item) {
+        if (item.sendSnapshotName || !item.sendId) return item;
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          sendSnapshotName: SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendId)
+        });
+      });
+      Monitor.automaticReport({
+        message: "\u53D1\u8D27\u4ED3\u8D70\u515C\u5E95\u5904\u7406-".concat(orderNo || '', "-oldValue-").concat(JSON.stringify(cloneDeep(value)), ",newValue-").concat(JSON.stringify(cloneDeep(newValue)))
+      });
+      console.log('发货仓走兜底处理-newValue--', orderNo, cloneDeep(newValue));
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    }
+  }, [JSON.stringify(value || []), type]);
   useEffect(function () {
     if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
       setChangeIndex(0);
@@ -21087,17 +21294,18 @@ var getColumns$2 = function getColumns(_ref) {
 };
 
 var getYesOrNo$4 = function getYesOrNo(val) {
+  var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['是', '否'];
   switch (val) {
     case true:
     case '1':
     case 1:
-      return '是';
+      return content[0];
     case false:
     case '0':
     case 0:
       return '否';
     default:
-      return null;
+      return content[1];
   }
 };
 
@@ -21296,7 +21504,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -21528,7 +21736,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -22678,7 +22886,10 @@ var getColumns$5 = function getColumns() {
       width: 150,
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      render: renderTextEllipsis,
+      conditionOptionsSetting: {
+        dataType: 'number'
+      }
     }, {
       dataIndex: 'rQty',
       title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
@@ -24548,7 +24759,7 @@ var getColumns$a = function getColumns() {
       },
       render: function render(_val, record, index) {
         var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
-        return /*#__PURE__*/React.createElement(Select, {
+        return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: '100%'
           },
@@ -24568,7 +24779,7 @@ var getColumns$a = function getColumns() {
               supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
             }, index);
           }
-        });
+        }) : DxdSuppliersData.getInstance().getSupplierNameByCode(record === null || record === void 0 ? void 0 : record.supplierCode);
       },
       conditionOptionsSetting: {
         dataType: 'weakenArray',
@@ -25381,7 +25592,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _ref$isReloadSelectTa = _ref.isReloadSelectTable,
     isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
     validSystemOrderFn = _ref.validSystemOrderFn;
-  console.log('systemOrders---', systemOrders);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -25653,6 +25863,8 @@ var GoodItem$1 = function GoodItem(props) {
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
+    _props$notAllowedOper = props.notAllowedOperation,
+    notAllowedOperation = _props$notAllowedOper === void 0 ? false : _props$notAllowedOper,
     shopCode = props.shopCode,
     _props$companyKey = props.companyKey,
     companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
@@ -25861,14 +26073,14 @@ var GoodItem$1 = function GoodItem(props) {
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
           index: index,
-          hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
+          hoveredRowIndex: !disabled && !notAllowedOperation && (record.canDelete || canDelete) ? hoveredRowIndex : null,
           handleClick: function handleClick() {
             return handleDelete(record, index);
           }
         });
       }
     }].concat(_toConsumableArray(baseInfoColumns));
-    if (!disabled) {
+    if (!disabled && !notAllowedOperation) {
       columnList.push({
         dataIndex: '',
         title: "\u64CD\u4F5C",
@@ -25910,22 +26122,6 @@ var GoodItem$1 = function GoodItem(props) {
       }
     }].concat(_toConsumableArray(list));
   }, [showHeader, value, disabled, hoveredRowIndex]);
-  var orderColumns = useMemo(function () {
-    var columns = COLUMNS_MAP('', {
-      operate: false,
-      disabled: true
-    })(type);
-    return [{
-      dataIndex: '',
-      title: '序号',
-      align: 'center',
-      ellipsis: true,
-      width: 50,
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React.createElement("span", null, index + 1);
-      }
-    }].concat(_toConsumableArray(columns));
-  }, []);
   var onSubmit = function onSubmit(list) {
     var newList = processGoods$1({
       list: list,
@@ -25965,7 +26161,7 @@ var GoodItem$1 = function GoodItem(props) {
   var validSystemOrder = useMemo(function () {
     return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
   }, [type, hasSelectedSystemOrder]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && !notAllowedOperation && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
     style: {
       float: 'right'
     }
@@ -27060,6 +27256,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         }
       }).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data, _data$data$doOrders;
+          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$doOrders = _data$data.doOrders) === null || _data$data$doOrders === void 0 ? void 0 : _data$data$doOrders.length) {
+            var _data$data2;
+            (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.doOrders.forEach(function (item) {
+              item.platformOrderNo = data.platformOrderNo;
+              item.shopCode = data.shopCode;
+              item.shopName = data.shopName;
+              item.split = data.split;
+            });
+          }
           resolve((data === null || data === void 0 ? void 0 : data.data) || {});
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
@@ -27159,8 +27365,7 @@ var kmUtils = {
 };
 
 var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
-  _excluded2 = ["shopCode"],
-  _excluded3 = ["doOrders", "isSplit", "billNo", "billType", "billTag", "sysStatus"];
+  _excluded2 = ["shopCode"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -27675,44 +27880,17 @@ var index$2 = (function (props) {
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            dxdUtils.getOrderListSingleton(orderNo).then(function (trades) {
-              var formatDxdOrders = (trades || []).reduce(function (prv, trade) {
-                var _ref15 = trade || {},
-                  _ref15$doOrders = _ref15.doOrders,
-                  doOrders = _ref15$doOrders === void 0 ? [] : _ref15$doOrders,
-                  isSplit = _ref15.isSplit,
-                  billNo = _ref15.billNo,
-                  billType = _ref15.billType,
-                  billTag = _ref15.billTag,
-                  sysStatus = _ref15.sysStatus,
-                  restTrade = _objectWithoutProperties(_ref15, _excluded3);
-                if (!doOrders.length) {
-                  prv.push(_objectSpread2(_objectSpread2({}, restTrade), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: billNo
-                  }));
-                  return prv;
-                }
-                doOrders.forEach(function (doOrder, index) {
-                  var currentOrderNo = doOrder === null || doOrder === void 0 ? void 0 : doOrder.orderNo;
-                  prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, restTrade), doOrder), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: currentOrderNo ? "".concat(billNo, "_").concat(currentOrderNo) : "".concat(billNo, "_").concat(index)
-                  }));
+            dxdUtils.getOrderListSingleton(orderNo).then(function (trade) {
+              var _trade$doOrders;
+              var data = (_trade$doOrders = trade.doOrders) === null || _trade$doOrders === void 0 ? void 0 : _trade$doOrders.map(function (order) {
+                return _objectSpread2(_objectSpread2({}, order), {}, {
+                  billNo: order.orderNo,
+                  billType: (trade === null || trade === void 0 ? void 0 : trade.split) ? '拆分订单' : '普通订单'
                 });
-                return prv;
-              }, []);
+              });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
-                orders: formatDxdOrders,
-                showOrderInfo: formatDxdOrders
+                orders: data || [],
+                showOrderInfo: data || []
               }));
             });
             onceRef.current = false;
@@ -28707,7 +28885,9 @@ var processAllOrders = function processAllOrders(_ref) {
     });
   } else if (isErpType$1.isDxd(type)) {
     // DXD 选品用出库订单 doOrders（每项含 skus[]）
-    newList = (data === null || data === void 0 ? void 0 : data.doOrders) || [];
+    newList = processDxdOrders({
+      data: data
+    });
   } else {
     newList = processDefaultOrders({
       data: data
@@ -28754,8 +28934,28 @@ var processWlnOrders = function processWlnOrders(_ref6) {
   var data = _ref6.data;
   return (data === null || data === void 0 ? void 0 : data.orders) || [];
 };
-var processDefaultOrders = function processDefaultOrders(_ref7) {
+var processDxdOrders = function processDxdOrders(_ref7) {
+  var _data$doOrders;
   var data = _ref7.data;
+  var _ref8 = data || {},
+    isSplit = _ref8.isSplit,
+    billNo = _ref8.billNo,
+    billType = _ref8.billType,
+    billTag = _ref8.billTag,
+    sysStatus = _ref8.sysStatus;
+  var trades = (_data$doOrders = data.doOrders) === null || _data$doOrders === void 0 ? void 0 : _data$doOrders.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      billNo: billNo,
+      billType: billType,
+      billTag: billTag,
+      isSplit: isSplit,
+      sysStatus: sysStatus
+    });
+  });
+  return trades;
+};
+var processDefaultOrders = function processDefaultOrders(_ref9) {
+  var data = _ref9.data;
   return data || [];
 };
 
@@ -29110,13 +29310,13 @@ var componentMap$2 = {
 var CommonGoods = function CommonGoods(props) {
   var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7, _componentMap$compTyp8;
   var value = props.value,
-    rawDisabled = props.disabled,
+    disabled = props.disabled,
     onChange = props.onChange,
     compType = props.type;
   // DXD_SUPPLIERS 纯镜像 DXD_GOODS（由 FormRender useWatch 联动同步增删），禁用独立增删
-  var disabled = rawDisabled || compType === 'DXD_SUPPLIERS';
   // console.log('value?.orders', value?.orders);
   // 合并单订单会包含","
+  var notAllowedOperation = ['DXD_SUPPLIERS'].includes(compType);
   var showModeBtn = ((_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.checkShowModeBtn) ? componentMap$2[compType].checkShowModeBtn(value) : !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
     var _order$componentMap$c;
     return order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$2[compType].orderNo]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.includes(',');
@@ -29474,7 +29674,6 @@ var CommonGoods = function CommonGoods(props) {
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
         type: compType
       });
-      console.log('list---', list);
       onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         allOrders: list || []
       }));
@@ -29504,6 +29703,7 @@ var CommonGoods = function CommonGoods(props) {
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
     showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
     showErpGoodsBtn: !((_componentMap$compTyp8 = componentMap$2[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.hiddenErpGoodsBtn),
+    notAllowedOperation: notAllowedOperation,
     tradeGoods: {
       originDataSource: originDataSource,
       getDataSourceAsync: getDataSourceAsync,

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -45,6 +45,7 @@ interface BsGoodsProps {
     systemOrders?: any[];
     selectedSystemOrders?: any[];
     isReloadSelectTable?: boolean;
+    notAllowedOperation?: boolean;
     validSystemOrderFn?: () => boolean | undefined;
 }
 type MakeRequired<T, K extends keyof T> = {

package/dist/src/business/LogisticsInterception/index.d.ts

@@ -19,6 +19,7 @@ interface LogisticsInterceptionValueType {
     interceptLogisticsApiStatusReason: string;
     interceptLogisticsUserKCode: string;
     interceptLogisticsUserSecretKey: string;
+    interceptLogisticsCustomerCode: string;
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;

package/dist/src/constants/constants.d.ts

@@ -1 +1 @@
-export declare const getYesOrNo: (val: boolean | string | number) => "是" | "否" | null;
+export declare const getYesOrNo: (val: boolean | string | number, content?: string[]) => string;

package/dist/src/jst/Goods/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FormInstance } from 'antd';
 import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 interface JstGoodsProps {
     value: any[];
@@ -12,6 +13,7 @@ interface JstGoodsProps {
     onlyShowFieldSelect: boolean;
     expressDateInstance: InstanceType<typeof ExpressData>;
     logisticsCompanyFormType?: string;
+    form?: FormInstance;
 }
 declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
 export default jstGoods;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.9-beta.2",
+  "version": "2.10.9-beta.21",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.2",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.20",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dac375113d0fa85fd02bf62d03604d4ffb1b486e"
+  "gitHead": "4dedd2a3b38f76b1511c4cc6e50830a0db126ae9"
 }