@kmkf-fe-packages/basic-components 2.0.19-beta.15 → 2.0.19-beta.16

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } 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, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterJstOrders, msgTypeCh, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -16428,6 +16428,214 @@ var BsReturnGoods = function BsReturnGoods(props) {
   })));
 };
 
+var singletonMap = new Map();
+var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
+  if (!singletonMap.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/wdtOrderDetail', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data, _data$data$trades;
+          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
+            data.data.trades = filterWdtOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                billNo: item.tradeNo,
+                billType: WDT_ORDER_TYPE_MAP[item.tradeType],
+                billTag: item.tagName
+              });
+            });
+          }
+          resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap.set(orderNo, p);
+  }
+  return singletonMap.get(orderNo);
+};
+var wdtUtils = {
+  getWdtOrderListSingleton: getWdtOrderListSingleton
+};
+
+var singletonMap$1 = new Map();
+var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
+  if (!singletonMap$1.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        // singletonMap.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/bse3OrderDetail', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data, _data$data$orderList;
+          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderList = _data$data.orderList) === null || _data$data$orderList === void 0 ? void 0 : _data$data$orderList.length) {
+            data.data.orderList = filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo);
+          }
+          resolve(data.data);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$1.set(orderNo, p);
+  }
+  return singletonMap$1.get(orderNo);
+};
+var bsE3Utils = {
+  getBsE3OrderListSingleton: getBsE3OrderListSingleton
+};
+
+var singletonMap$2 = new Map();
+var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
+  if (!singletonMap$2.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$2.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/oms/gyOrderDetail', {
+        method: 'post',
+        data: {
+          tid: orderNo
+        }
+      }).then(function (res) {
+        if (res === null || res === void 0 ? void 0 : res.success) {
+          var _res$data;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
+            res.data.trades = filterGyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo).map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                billNo: item.code,
+                billType: item.orderTypeName,
+                billTag: item.tagName,
+                tradeTagName: item.tradeTagName,
+                deliveryState: item.deliveryState,
+                vipCode: item.vipCode,
+                shopCode: item.shopCode,
+                deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
+              });
+            });
+          }
+          resolve(res.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$2.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(res);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$2.set(orderNo, p);
+  }
+  return singletonMap$2.get(orderNo);
+};
+var gyUtils = {
+  getGyOrderListSingleton: getGyOrderListSingleton
+};
+
+var singletonMap$3 = new Map();
+var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
+  if (!singletonMap$3.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        // singletonMap.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/jst/erp/orderOut/list', {
+        method: 'post',
+        data: {
+          soId: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          data.data = filterJstOrders({
+            orderList: (data === null || data === void 0 ? void 0 : data.data) || []
+          }, orderNo);
+          resolve(data.data);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$3.set(orderNo, p);
+  }
+  return singletonMap$3.get(orderNo);
+};
+var jstUtils = {
+  getJstOrderListSingleton: getJstOrderListSingleton
+};
+
+var singletonMap$4 = new Map();
+var getOrderListSingleton = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$4.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$4.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
+        method: 'post',
+        data: {
+          tid: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data, _data$data$orderDetai;
+          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderDetai = _data$data.orderDetailDtoList) === null || _data$data$orderDetai === void 0 ? void 0 : _data$data$orderDetai.length) {
+            var list = filterKmOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                billNo: item.sid,
+                sysStatus: item.sysStatus,
+                billType: item.type,
+                billTag: item.tags
+              });
+            });
+            resolve(list);
+          } else {
+            resolve([]);
+          }
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$4.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$4.set(orderNo, p);
+  }
+  return singletonMap$4.get(orderNo);
+};
+var kmUtils = {
+  getOrderListSingleton: getOrderListSingleton
+};
+
+var _excluded$g = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -16451,9 +16659,286 @@ var index$1 = (function (props) {
     _onChange = props.onChange,
     disabled = props.disabled,
     type = props.type;
+  var onceRef = useRef(false);
+  var valueRef = useRef(null);
+  useEffect(function () {
+    var _value$orders, _value$showOrderInfo;
+    valueRef.current = value;
+    if (!(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo) && (value === null || value === void 0 ? void 0 : (_value$showOrderInfo = value.showOrderInfo) === null || _value$showOrderInfo === void 0 ? void 0 : _value$showOrderInfo.length) && !onceRef.current) {
+      onceRef.current = true;
+      if (type === 'BS_SYSTEM_ORDER') {
+        getOrderList(value.orderNo);
+      } else if (type === 'KM_SYSTEM_ORDER') {
+        getKmOrderList(value.orderNo);
+      } else if (type === 'WLN_SYSTEM_ORDER') {
+        getWlnOrderList(value.orderNo);
+      } else if (type === 'WDT_SYSTEM_ORDER') {
+        getWdtOrderList(value.orderNo);
+      } else if (type === 'BS_E3_SYSTEM_ORDER') {
+        getBsE3OrderList(value.orderNo);
+      } else if (type === 'GY_SYSTEM_ORDER') {
+        console.log('触发gy--getGyOrderList--1');
+        getGyOrderList(value.orderNo);
+      } else if (type === 'JST_SYSTEM_ORDER') {
+        getJstOrderList(value.orderNo);
+      }
+    }
+  }, [value, type]);
   var columns = useMemo(function () {
     return columnsMap[type] || [];
   }, [type]);
+  var getOrderList = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
+      var _yield$request, success, data, _valueRef$current;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return extendRequest('/qy/gdfw/order/bsOrderDetail', {
+              method: 'post',
+              data: {
+                billNo: orderNo
+              }
+            });
+          case 2:
+            _yield$request = _context.sent;
+            success = _yield$request.success;
+            data = _yield$request.data;
+            if (success) {
+              _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, {
+                orders: (data === null || data === void 0 ? void 0 : data.orders) || [],
+                showOrderInfo: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
+                  return {
+                    billNo: item.billNo,
+                    billType: item.billType,
+                    billTag: item.billTag,
+                    authorName: item.authorName,
+                    authorId: item.authorId
+                    // liveActivites: item.liveActivites,
+                  };
+                })
+              }));
+            }
+
+            onceRef.current = false;
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getOrderList(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var getWlnOrderList = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
+      var _yield$request2, success, data, _valueRef$current2;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/gdfw/order/wlnOrderList', {
+              method: 'post',
+              data: {
+                billCode: orderNo
+              }
+            });
+          case 2:
+            _yield$request2 = _context2.sent;
+            success = _yield$request2.success;
+            data = _yield$request2.data;
+            if (success) {
+              _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}), {}, {
+                orders: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    billNo: item.tradeNo,
+                    billType: item.tradeType,
+                    billTag: item.mark
+                  });
+                }),
+                showOrderInfo: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
+                  return {
+                    billNo: item.tradeNo,
+                    billType: item.tradeType,
+                    billTag: item.mark
+                  };
+                })
+              }));
+            }
+            onceRef.current = false;
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getWlnOrderList(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var getWdtOrderList = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            wdtUtils.getWdtOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current3;
+              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+                return (item.srcTid || '').split(',').includes(orderNo);
+              });
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current3 = valueRef.current) !== null && _valueRef$current3 !== void 0 ? _valueRef$current3 : {}), {}, {
+                orders: trades,
+                showOrderInfo: trades.map(function (_ref4) {
+                  var billNo = _ref4.billNo,
+                    billType = _ref4.billType,
+                    billTag = _ref4.billTag;
+                  return {
+                    billNo: billNo,
+                    billType: billType,
+                    billTag: billTag
+                  };
+                })
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function getWdtOrderList(_x3) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var getBsE3OrderList = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            bsE3Utils.getBsE3OrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current4;
+              var trades = ((data === null || data === void 0 ? void 0 : data.orderList) || []).filter(function (item) {
+                return (item === null || item === void 0 ? void 0 : item.dealCode) === orderNo;
+              });
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current4 = valueRef.current) !== null && _valueRef$current4 !== void 0 ? _valueRef$current4 : {}), {}, {
+                orders: trades,
+                showOrderInfo: trades
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function getBsE3OrderList(_x4) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  var getJstOrderList = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            jstUtils.getJstOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current5;
+              var trades = data || [];
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current5 = valueRef.current) !== null && _valueRef$current5 !== void 0 ? _valueRef$current5 : {}), {}, {
+                orders: trades,
+                showOrderInfo: trades
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function getJstOrderList(_x5) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var getKmOrderList = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
+              var _valueRef$current6;
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current6 = valueRef.current) !== null && _valueRef$current6 !== void 0 ? _valueRef$current6 : {}), {}, {
+                orders: trades,
+                showOrderInfo: trades.map(function (_ref8) {
+                  var billNo = _ref8.billNo,
+                    billType = _ref8.billType,
+                    billTag = _ref8.billTag;
+                  return {
+                    billNo: billNo,
+                    billType: billType,
+                    billTag: billTag
+                  };
+                })
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function getKmOrderList(_x6) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+  var getGyOrderList = /*#__PURE__*/function () {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current7;
+              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+                return getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+              });
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current7 = valueRef.current) !== null && _valueRef$current7 !== void 0 ? _valueRef$current7 : {}), {}, {
+                orders: trades,
+                showOrderInfo: trades.map(function (_ref10) {
+                  var billNo = _ref10.billNo,
+                    billType = _ref10.billType,
+                    billTag = _ref10.billTag,
+                    tradeTagName = _ref10.tradeTagName,
+                    deliveryState = _ref10.deliveryState,
+                    vipCode = _ref10.vipCode,
+                    shopCode = _ref10.shopCode,
+                    rest = _objectWithoutProperties(_ref10, _excluded$g);
+                  return _objectSpread2(_objectSpread2({}, rest), {}, {
+                    billNo: billNo,
+                    billType: billType,
+                    billTag: billTag,
+                    tradeTagName: tradeTagName,
+                    deliveryState: deliveryState,
+                    deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState],
+                    vipCode: vipCode,
+                    shopCode: shopCode
+                  });
+                })
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7);
+    }));
+    return function getGyOrderList(_x7) {
+      return _ref9.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -16639,12 +17124,46 @@ var CommonGoods = function CommonGoods(props) {
     var _order$componentMap$c;
     return order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$1[compType].orderNo]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.includes(',');
   });
+  var getOrderFlag = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
   var withInfo = useRef(null);
   var valueRef = useRef(null);
+  useEffect(function () {
+    var _value$orders;
+    valueRef.current = value;
+    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo)) {
+      getOrderFlag.current = true;
+      compType.indexOf('WDT') > -1 && getWdtOrderList(value === null || value === void 0 ? void 0 : value.orderNo);
+    }
+  }, [value]);
+  var getWdtOrderList = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            wdtUtils.getWdtOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current2;
+              var orders = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (trade) {
+                var _valueRef$current;
+                return (((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.selectIds) || []).includes(trade.tradeNo);
+              });
+              onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}), {}, {
+                orders: orders
+              }));
+            });
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getWdtOrderList(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
     pubsub.subscribe(componentMap$1[compType].eventNameMap.type, function (type, data) {
       if (disabled) return;
@@ -16656,10 +17175,10 @@ var CommonGoods = function CommonGoods(props) {
       };
       setTableSelect(['2', '4'].includes(data.val));
       if (['1', '3'].includes(data.val)) {
-        var _valueRef$current, _valueRef$current2;
+        var _valueRef$current3, _valueRef$current4;
         pubsub.publish(componentMap$1[compType].eventNameMap.selectListReturn, {
-          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current[componentMap$1[compType].key]) || []),
-          shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.shopCode,
+          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current3 = valueRef.current) === null || _valueRef$current3 === void 0 ? void 0 : _valueRef$current3[componentMap$1[compType].key]) || []),
+          shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current4 = valueRef.current) === null || _valueRef$current4 === void 0 ? void 0 : _valueRef$current4.shopCode,
           goodValue: data === null || data === void 0 ? void 0 : data.goodValue
         });
       }
@@ -16674,10 +17193,10 @@ var CommonGoods = function CommonGoods(props) {
       };
       setTableSelect(['2', '4'].includes(data.val));
       if (['1', '3'].includes(data.val)) {
-        var _valueRef$current3, _valueRef$current4;
+        var _valueRef$current5, _valueRef$current6;
         pubsub.publish(componentMap$1[compType].eventNameMap.reissueSelectListReturn, {
-          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current3 = valueRef.current) === null || _valueRef$current3 === void 0 ? void 0 : _valueRef$current3[componentMap$1[compType].key]) || []),
-          shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current4 = valueRef.current) === null || _valueRef$current4 === void 0 ? void 0 : _valueRef$current4.shopCode,
+          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current5 = valueRef.current) === null || _valueRef$current5 === void 0 ? void 0 : _valueRef$current5[componentMap$1[compType].key]) || []),
+          shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current6 = valueRef.current) === null || _valueRef$current6 === void 0 ? void 0 : _valueRef$current6.shopCode,
           goodValue: data === null || data === void 0 ? void 0 : data.goodValue
         });
       }
@@ -16692,10 +17211,10 @@ var CommonGoods = function CommonGoods(props) {
       };
       setTableSelect(['2', '4'].includes(data.val));
       if (['1', '3'].includes(data.val)) {
-        var _valueRef$current5, _valueRef$current6;
+        var _valueRef$current7, _valueRef$current8;
         pubsub.publish(componentMap$1[compType].eventNameMap.returnSelectListReturn, {
-          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current5 = valueRef.current) === null || _valueRef$current5 === void 0 ? void 0 : _valueRef$current5[componentMap$1[compType].key]) || []),
-          shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current6 = valueRef.current) === null || _valueRef$current6 === void 0 ? void 0 : _valueRef$current6.shopCode,
+          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current7 = valueRef.current) === null || _valueRef$current7 === void 0 ? void 0 : _valueRef$current7[componentMap$1[compType].key]) || []),
+          shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current8 = valueRef.current) === null || _valueRef$current8 === void 0 ? void 0 : _valueRef$current8.shopCode,
           goodValue: data === null || data === void 0 ? void 0 : data.goodValue
         });
       }
@@ -16711,7 +17230,7 @@ var CommonGoods = function CommonGoods(props) {
     };
   }, [disabled]);
   var _onSelect = function onSelect(list) {
-    var _typeMap, _withInfo$current, _withInfo$current2, _valueRef$current7;
+    var _typeMap, _withInfo$current, _withInfo$current2, _valueRef$current9;
     if (disabled) return;
     var newList = cloneDeep(list);
     var typeMap = (_typeMap = {
@@ -16728,7 +17247,7 @@ var CommonGoods = function CommonGoods(props) {
         item.canDelete = true;
         return item;
       }),
-      shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current7 = valueRef.current) === null || _valueRef$current7 === void 0 ? void 0 : _valueRef$current7.shopCode,
+      shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9.shopCode,
       goodValue: withInfo.current.goodValue
     });
   };
@@ -16750,8 +17269,8 @@ var CommonGoods = function CommonGoods(props) {
       mode: isStrict
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref) {
-    var mode = _ref.mode;
+  var getGoodDetails = function getGoodDetails(_ref2) {
+    var mode = _ref2.mode;
     var updateHandle = componentMap$1[compType].eventNameMap['updateGoodsHandle'];
     var goodDetails = updateHandle(value.orders || []);
     var orderNo = value.orderNo;
@@ -17103,51 +17622,7 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   })));
 };
 
-var singletonMap = new Map();
-var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
-  if (!singletonMap.has(orderNo)) {
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        singletonMap.delete(orderNo);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/order/wdtOrderDetail', {
-        method: 'post',
-        data: {
-          billNo: orderNo
-        }
-      }).then(function (data) {
-        if (data === null || data === void 0 ? void 0 : data.success) {
-          var _data$data, _data$data$trades;
-          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
-            data.data.trades = filterWdtOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                billNo: item.tradeNo,
-                billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-                billTag: item.tagName
-              });
-            });
-          }
-          resolve(data.data);
-          // 延迟10秒清除,保证订单的时效性
-          setTimeout(function () {
-            singletonMap.delete(orderNo);
-          }, 1000 * 10);
-        } else {
-          doReject(data);
-        }
-      }).catch(doReject);
-    });
-    singletonMap.set(orderNo, p);
-  }
-  return singletonMap.get(orderNo);
-};
-var wdtUtils = {
-  getWdtOrderListSingleton: getWdtOrderListSingleton
-};
-
-var _excluded$g = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$h = ["value", "onChange", "reasonList", "disabled", "type"];
 var typeMap$1 = {
   WDT_REISSUE_GOODS: {
     key: 'wdtReissueGoods',
@@ -17168,56 +17643,132 @@ var typeMap$1 = {
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type20, _typeMap$type22, _typeMap$type23, _value$typeMap$type$s, _typeMap$type24, _typeMap$type25, _typeMap$type26;
+  var _value$wdtSystemOrder, _typeMap$type26, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$g);
+    other = _objectWithoutProperties(props, _excluded$h);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$wdtSystemOrder = value.wdtSystemOrder) === null || _value$wdtSystemOrder === void 0 ? void 0 : _value$wdtSystemOrder.orders) || []).some(function (order) {
     var _order$srcTid;
     return order === null || order === void 0 ? void 0 : (_order$srcTid = order.srcTid) === null || _order$srcTid === void 0 ? void 0 : _order$srcTid.includes(',');
   });
+  var getOrderFlag = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isStrict = _useState2[0],
     setIsStrict = _useState2[1];
+  var valueRef = useRef(null);
+  useEffect(function () {
+    var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
+    valueRef.current = value;
+    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$1[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$1[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
+      var _value$typeMap$type$s4, _typeMap$type3;
+      getOrderFlag.current = true;
+      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$1[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
+    }
+    return;
+  }, [value]);
+  // useEffect(() => {
+  //   const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
+  //   if (systemOrderNo) {
+  //     if (['1'].includes(value?.[typeMap[type]?.typeName]?.[0])) {
+  //       onChange?.({
+  //         ...value,
+  //         [typeMap[type]?.key]: getGoodDetails({
+  //           mode: isStrict
+  //         })
+  //       })
+  //     }
+  //   }
+  //   return;
+  // }, [value?.[typeMap[type]?.systemOrderNo]]);
+  // const getWdtOrderList = async (orderNo: string) => {
+  //   wdtUtils.getWdtOrderListSingleton(orderNo).then(data => {
+  //     const orders = data?.trades || [];
+  //     const showOrderInfo = orders.map(({ billNo, billType, billTag }: any) => {
+  //       return { billNo, billType, billTag }
+  //     });
+  //     onChange({
+  //       ...value,
+  //       [typeMap[type]?.systemOrder]: {
+  //         ...value[typeMap[type]?.systemOrder],
+  //         showOrderInfo,
+  //         orders,
+  //       },
+  //     });
+  //   })
+  // };
+  var getOrderList = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
+      var _typeMap$type4;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            (_typeMap$type4 = typeMap$1[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
+              var _valueRef$current, _typeMap$type5, _typeMap$type$systemO, _ref3, _valueRef$current2, _typeMap$type6;
+              var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
+              var showOrderInfo = orders.map(function (_ref2) {
+                var billNo = _ref2.billNo,
+                  billType = _ref2.billType,
+                  billTag = _ref2.billTag;
+                return {
+                  billNo: billNo,
+                  billType: billType,
+                  billTag: billTag
+                };
+              });
+              onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO = (_ref3 = (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) !== null && _typeMap$type$systemO !== void 0 ? _typeMap$type$systemO : {}), {}, {
+                showOrderInfo: showOrderInfo,
+                orders: orders
+              }))));
+            });
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getOrderList(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _value$typeMap$type$t, _typeMap$type, _typeMap$type2;
+    var _value$typeMap$type$t, _typeMap$type7, _typeMap$type8;
     var typeName = val === null || val === void 0 ? void 0 : val[0];
-    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type = typeMap$1[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
+    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
     // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
     var newValue = _objectSpread2({}, value);
-    newValue[(_typeMap$type2 = typeMap$1[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.typeName] = val;
+    newValue[(_typeMap$type8 = typeMap$1[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.typeName] = val;
     if (typeName === '1') {
-      var _typeMap$type3;
-      newValue[(_typeMap$type3 = typeMap$1[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.key] = getGoodDetails({
+      var _typeMap$type9;
+      newValue[(_typeMap$type9 = typeMap$1[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
-      var _typeMap$type4;
+      var _typeMap$type10;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type4 = typeMap$1[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.key] = [];
+      newValue[(_typeMap$type10 = typeMap$1[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key] = [];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
-    var _value$typeMap$type$t2, _typeMap$type5, _typeMap$type6;
-    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
+    var _value$typeMap$type$t2, _typeMap$type11, _typeMap$type12;
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type11 = typeMap$1[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
     setIsStrict(mode);
     if (!isOriginalOrder) return;
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type12 = typeMap$1[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key, getGoodDetails({
       mode: mode
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref) {
-    var _typeMap$type7, _typeMap$type8, _order$goodDetails;
-    var mode = _ref.mode,
-      sysOrderNo = _ref.sysOrderNo;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type8 = typeMap$1[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrderNo];
+  var getGoodDetails = function getGoodDetails(_ref4) {
+    var _typeMap$type13, _typeMap$type14, _order$goodDetails;
+    var mode = _ref4.mode,
+      sysOrderNo = _ref4.sysOrderNo;
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$1[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$1[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.tradeNo === systemOrderNo;
     });
@@ -17228,26 +17779,26 @@ var wdtReissue = function wdtReissue(props) {
     }) : goodDetails;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type9;
+    var _typeMap$type15;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type9 = typeMap$1[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key)] = (val || []).map(function (item) {
-      var _typeMap$type10, _typeMap$type11;
-      item["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type10 = typeMap$1[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.formatDefaultField.money)] = 0;
-      item["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type11 = typeMap$1[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.formatDefaultField.share)] = 0;
+    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key)] = (val || []).map(function (item) {
+      var _typeMap$type16, _typeMap$type17;
+      item["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type16 = typeMap$1[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.money)] = 0;
+      item["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type17 = typeMap$1[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.share)] = 0;
       return item;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type12, _value$typeMap$type$t3, _typeMap$type13, _value$typeMap$type$t4, _typeMap$type15;
+    var _typeMap$type18, _value$typeMap$type$t3, _typeMap$type19, _value$typeMap$type$t4, _typeMap$type21;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type12 = typeMap$1[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.systemOrderNo)] = val;
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type13 = typeMap$1[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type14;
-      newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type14 = typeMap$1[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
-      var _typeMap$type16;
-      newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type16 = typeMap$1[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key)] = getGoodDetails({
+    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type18 = typeMap$1[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo)] = val;
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type19 = typeMap$1[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type20;
+      newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type20 = typeMap$1[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type21 = typeMap$1[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
+      var _typeMap$type22;
+      newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type22 = typeMap$1[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -17255,25 +17806,25 @@ var wdtReissue = function wdtReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type17, _typeMap$type18, _uniqBy, _typeMap$type19;
+    var _typeMap$type23, _typeMap$type24, _uniqBy, _typeMap$type25;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
       mode: isStrict
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type17 = typeMap$1[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)]) || [];
-    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type18 = typeMap$1[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]) || [];
+    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type19 = typeMap$1[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key)]);
+    console.log('商品发生变化', newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type20 = typeMap$1[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)], isStrict]);
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
-    var _typeMap$type21;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type21 = typeMap$1[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type22 = typeMap$1[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderNo]]);
+    var _typeMap$type27;
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
@@ -17291,12 +17842,12 @@ var wdtReissue = function wdtReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : _value$typeMap$type$s.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -17317,7 +17868,7 @@ var wdtReissue = function wdtReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -17329,7 +17880,7 @@ var wdtReissue = function wdtReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type32 = typeMap$1[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -17345,40 +17896,7 @@ var wdtReissue = function wdtReissue(props) {
   })));
 };
 
-var singletonMap$1 = new Map();
-var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
-  if (!singletonMap$1.has(orderNo)) {
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        // singletonMap.delete(orderNo);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/jst/erp/orderOut/list', {
-        method: 'post',
-        data: {
-          soId: orderNo
-        }
-      }).then(function (data) {
-        if (data === null || data === void 0 ? void 0 : data.success) {
-          data.data = filterJstOrders({
-            orderList: (data === null || data === void 0 ? void 0 : data.data) || []
-          }, orderNo);
-          resolve(data.data);
-        } else {
-          doReject(data);
-        }
-      }).catch(doReject);
-    });
-    singletonMap$1.set(orderNo, p);
-  }
-  return singletonMap$1.get(orderNo);
-};
-var jstUtils = {
-  getJstOrderListSingleton: getJstOrderListSingleton
-};
-
-var _excluded$h = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$i = ["value", "onChange", "reasonList", "disabled", "type"];
 var typeMap$2 = {
   JST_REISSUE_GOODS: {
     compType: '补发',
@@ -17426,7 +17944,7 @@ var PublicReissue = function PublicReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$h);
+    other = _objectWithoutProperties(props, _excluded$i);
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -17473,13 +17991,13 @@ var PublicReissue = function PublicReissue(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             (_typeMap$type4 = typeMap$2[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
-              var _typeMap$type5, _typeMap$type6, _typeMap$type10, _typeMap$type11;
+              var _valueRef$current3, _typeMap$type5, _typeMap$type6, _valueRef$current4, _typeMap$type10, _typeMap$type$systemO, _ref3, _valueRef$current5, _typeMap$type11;
               var orders = data || [];
               var showOrderInfo = orders.map(function (orderItem) {
                 return _defineProperty({}, typeMap$2[type].oIdKey, orderItem[typeMap$2[type].oIdKey]);
               });
               var typeObj = {};
-              var systemOrderNo = value === null || value === void 0 ? void 0 : value[(_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrderNo];
+              var systemOrderNo = valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current3 = valueRef.current) === null || _valueRef$current3 === void 0 ? void 0 : _valueRef$current3[(_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrderNo];
               if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type6 = typeMap$2[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrderBillType) {
                 var _typeMap$type8, _typeMap$type9;
                 var targetOrder = orders.find(function (oItem) {
@@ -17488,7 +18006,7 @@ var PublicReissue = function PublicReissue(props) {
                 });
                 typeObj[(_typeMap$type8 = typeMap$2[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type9 = typeMap$2[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.orderTypeKey];
               }
-              onChange(_objectSpread2(_objectSpread2(_objectSpread2({}, value), typeObj), {}, _defineProperty({}, (_typeMap$type10 = typeMap$2[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type11 = typeMap$2[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.systemOrder]), {}, {
+              onChange(_objectSpread2(_objectSpread2(_objectSpread2({}, (_valueRef$current4 = valueRef.current) !== null && _valueRef$current4 !== void 0 ? _valueRef$current4 : {}), typeObj), {}, _defineProperty({}, (_typeMap$type10 = typeMap$2[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO = (_ref3 = (_valueRef$current5 = valueRef.current) !== null && _valueRef$current5 !== void 0 ? _valueRef$current5 : {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type11 = typeMap$2[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.systemOrder]) !== null && _typeMap$type$systemO !== void 0 ? _typeMap$type$systemO : {}), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               }))));
@@ -17531,10 +18049,10 @@ var PublicReissue = function PublicReissue(props) {
       mode: mode
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref3) {
+  var getGoodDetails = function getGoodDetails(_ref4) {
     var _typeMap$type17, _typeMap$type18, _order$typeMap$type$g, _typeMap$type19;
-    var mode = _ref3.mode,
-      sysOrderNo = _ref3.sysOrderNo;
+    var mode = _ref4.mode,
+      sysOrderNo = _ref4.sysOrderNo;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -18155,12 +18673,12 @@ var Goods$1 = function Goods(props, ref) {
 };
 var index$2 = /*#__PURE__*/forwardRef(Goods$1);
 
-var _excluded$i = ["onChange", "value", "failValue"];
+var _excluded$j = ["onChange", "value", "failValue"];
 function CommonStatus(props) {
   var onChange = props.onChange,
     value = props.value,
     failValue = props.failValue,
-    other = _objectWithoutProperties(props, _excluded$i);
+    other = _objectWithoutProperties(props, _excluded$j);
   var changeHandle = function changeHandle(val) {
     onChange === null || onChange === void 0 ? void 0 : onChange({
       status: val,
@@ -18297,7 +18815,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
   })) : null) : null);
 };
 
-var _excluded$j = ["value", "onChange", "disabled", "failValue", "type"];
+var _excluded$k = ["value", "onChange", "disabled", "failValue", "type"];
 var CommonSystemOrder$1 = function CommonSystemOrder(props) {
   var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
@@ -18307,7 +18825,7 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     failValue = props.failValue,
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
-    other = _objectWithoutProperties(props, _excluded$j);
+    other = _objectWithoutProperties(props, _excluded$k);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -18373,7 +18891,7 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
   }, "\u5931\u8D25\u539F\u56E0\uFF1A", (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reason) : null));
 };
 
-var _excluded$k = ["value", "onChange", "disabled", "failValue", "type"];
+var _excluded$l = ["value", "onChange", "disabled", "failValue", "type"];
 var MsgStatus = function MsgStatus(props) {
   var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
@@ -18383,7 +18901,7 @@ var MsgStatus = function MsgStatus(props) {
     failValue = props.failValue,
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
-    other = _objectWithoutProperties(props, _excluded$k);
+    other = _objectWithoutProperties(props, _excluded$l);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -18452,41 +18970,7 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-var singletonMap$2 = new Map();
-var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
-  if (!singletonMap$2.has(orderNo)) {
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        // singletonMap.delete(orderNo);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/order/bse3OrderDetail', {
-        method: 'post',
-        data: {
-          billNo: orderNo
-        }
-      }).then(function (data) {
-        if (data === null || data === void 0 ? void 0 : data.success) {
-          var _data$data, _data$data$orderList;
-          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderList = _data$data.orderList) === null || _data$data$orderList === void 0 ? void 0 : _data$data$orderList.length) {
-            data.data.orderList = filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo);
-          }
-          resolve(data.data);
-        } else {
-          doReject(data);
-        }
-      }).catch(doReject);
-    });
-    singletonMap$2.set(orderNo, p);
-  }
-  return singletonMap$2.get(orderNo);
-};
-var bsE3Utils = {
-  getBsE3OrderListSingleton: getBsE3OrderListSingleton
-};
-
-var _excluded$l = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$m = ["value", "onChange", "reasonList", "disabled", "type"];
 var typeMap$3 = {
   BS_E3_REISSUE_GOODS: {
     key: 'bsE3ReissueGoods',
@@ -18504,8 +18988,9 @@ var bsE3Reissue = function bsE3Reissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$l);
+    other = _objectWithoutProperties(props, _excluded$m);
   var getOrderFlag = useRef(false);
+  var valueRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isStrict = _useState2[0],
@@ -18513,6 +18998,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
   // TODO: 在修改场景下手动获取一次订单详情中数据
   useEffect(function () {
     var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
+    valueRef.current = value;
     if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$3[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$3[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
       var _value$typeMap$type$s4, _typeMap$type3;
       getOrderFlag.current = true;
@@ -18541,7 +19027,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             (_typeMap$type4 = typeMap$3[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
-              var _typeMap$type5, _typeMap$type6;
+              var _valueRef$current, _typeMap$type5, _typeMap$type$systemO, _ref3, _valueRef$current2, _typeMap$type6;
               var orders = (data === null || data === void 0 ? void 0 : data.orderList) || [];
               var showOrderInfo = orders.map(function (_ref2) {
                 var orderSn = _ref2.orderSn;
@@ -18549,7 +19035,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
                   billNo: orderSn
                 };
               });
-              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
+              onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO = (_ref3 = (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) !== null && _typeMap$type$systemO !== void 0 ? _typeMap$type$systemO : {}), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               }))));
@@ -18592,10 +19078,10 @@ var bsE3Reissue = function bsE3Reissue(props) {
       mode: mode
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref3) {
+  var getGoodDetails = function getGoodDetails(_ref4) {
     var _typeMap$type12, _typeMap$type13, _order$orderDetailGet;
-    var mode = _ref3.mode,
-      sysOrderNo = _ref3.sysOrderNo;
+    var mode = _ref4.mode,
+      sysOrderNo = _ref4.sysOrderNo;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type12 = typeMap$3[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -18720,56 +19206,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
   })));
 };
 
-var singletonMap$3 = new Map();
-var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
-  if (!singletonMap$3.has(orderNo)) {
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        singletonMap$3.delete(orderNo);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/oms/gyOrderDetail', {
-        method: 'post',
-        data: {
-          tid: orderNo
-        }
-      }).then(function (res) {
-        if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
-            res.data.trades = filterGyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo).map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                billNo: item.code,
-                billType: item.orderTypeName,
-                billTag: item.tagName,
-                tradeTagName: item.tradeTagName,
-                deliveryState: item.deliveryState,
-                vipCode: item.vipCode,
-                shopCode: item.shopCode,
-                deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
-              });
-            });
-          }
-          resolve(res.data);
-          // 延迟10秒清除,保证订单的时效性
-          setTimeout(function () {
-            singletonMap$3.delete(orderNo);
-          }, 1000 * 10);
-        } else {
-          doReject(res);
-        }
-      }).catch(doReject);
-    });
-    singletonMap$3.set(orderNo, p);
-  }
-  return singletonMap$3.get(orderNo);
-};
-var gyUtils = {
-  getGyOrderListSingleton: getGyOrderListSingleton
-};
-
-var _excluded$m = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$n = ["value", "onChange", "reasonList", "disabled", "type"],
+  _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$4 = {
   GY_REISSUE_GOODS: {
     key: 'gyReissueGoods',
@@ -18790,58 +19228,121 @@ var typeMap$4 = {
   }
 };
 var GyReissue = function GyReissue(props) {
-  var _value$gySystemOrder, _typeMap$type20, _typeMap$type22, _typeMap$type23, _value$typeMap$type$s, _typeMap$type24, _typeMap$type25, _typeMap$type26;
+  var _value$gySystemOrder, _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$m);
+    other = _objectWithoutProperties(props, _excluded$n);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$gySystemOrder = value.gySystemOrder) === null || _value$gySystemOrder === void 0 ? void 0 : _value$gySystemOrder.orders) || []).some(function (order) {
     var _order$platformCode;
     return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(';');
   });
+  var getOrderFlag = useRef(false);
+  var valueRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isStrict = _useState2[0],
     setIsStrict = _useState2[1];
+  useEffect(function () {
+    var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
+    valueRef.current = value;
+    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$4[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$4[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
+      var _value$typeMap$type$s4, _typeMap$type3;
+      getOrderFlag.current = true;
+      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$4[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
+    }
+    return;
+  }, [value]);
+  var getOrderList = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
+      var _typeMap$type4;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            (_typeMap$type4 = typeMap$4[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
+              var _valueRef$current, _typeMap$type5, _typeMap$type$systemO, _ref3, _valueRef$current2, _typeMap$type6, _valueRef$current3, _typeMap$type7, _typeMap$type$systemO2, _ref4, _valueRef$current4, _typeMap$type8;
+              var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
+              var showOrderInfo = orders.map(function (_ref2) {
+                var billNo = _ref2.billNo,
+                  billType = _ref2.billType,
+                  billTag = _ref2.billTag,
+                  tradeTagName = _ref2.tradeTagName,
+                  deliveryState = _ref2.deliveryState,
+                  vipCode = _ref2.vipCode,
+                  shopCode = _ref2.shopCode,
+                  rest = _objectWithoutProperties(_ref2, _excluded2);
+                return _objectSpread2(_objectSpread2({}, rest), {}, {
+                  billNo: billNo,
+                  billType: billType,
+                  billTag: billTag,
+                  tradeTagName: tradeTagName,
+                  deliveryState: deliveryState,
+                  deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState],
+                  vipCode: vipCode,
+                  shopCode: shopCode
+                });
+              });
+              pushGyLog('getOrderList', {
+                before: valueRef.current,
+                after: _objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO = (_ref3 = (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) !== null && _typeMap$type$systemO !== void 0 ? _typeMap$type$systemO : {}), {}, {
+                  showOrderInfo: showOrderInfo,
+                  orders: orders
+                })))
+              });
+              onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current3 = valueRef.current) !== null && _valueRef$current3 !== void 0 ? _valueRef$current3 : {}), {}, _defineProperty({}, (_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO2 = (_ref4 = (_valueRef$current4 = valueRef.current) !== null && _valueRef$current4 !== void 0 ? _valueRef$current4 : {}) === null || _ref4 === void 0 ? void 0 : _ref4[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrder]) !== null && _typeMap$type$systemO2 !== void 0 ? _typeMap$type$systemO2 : {}), {}, {
+                showOrderInfo: showOrderInfo,
+                orders: orders
+              }))));
+            });
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getOrderList(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _value$typeMap$type$t, _typeMap$type, _typeMap$type2;
+    var _value$typeMap$type$t, _typeMap$type9, _typeMap$type10;
     pushGyLog('beforeChangeType', value);
     var typeName = val === null || val === void 0 ? void 0 : val[0];
-    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type = typeMap$4[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
+    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
     // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
     var newValue = _objectSpread2({}, value);
-    newValue[(_typeMap$type2 = typeMap$4[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.typeName] = val;
+    newValue[(_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName] = val;
     if (typeName === '1') {
-      var _typeMap$type3;
-      newValue[(_typeMap$type3 = typeMap$4[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.key] = getGoodDetails({
+      var _typeMap$type11;
+      newValue[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
-      var _typeMap$type4;
+      var _typeMap$type12;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type4 = typeMap$4[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.key] = [];
+      newValue[(_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key] = [];
     }
     pushGyLog('afterChangeType', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
-    var _value$typeMap$type$t2, _typeMap$type5, _typeMap$type6;
-    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
+    var _value$typeMap$type$t2, _typeMap$type13, _typeMap$type14;
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
     setIsStrict(mode);
     if (!isOriginalOrder) return;
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key, getGoodDetails({
       mode: mode
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref) {
-    var _typeMap$type7, _typeMap$type8, _order$details;
-    var mode = _ref.mode,
-      sysOrderNo = _ref.sysOrderNo;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrderNo];
+  var getGoodDetails = function getGoodDetails(_ref5) {
+    var _typeMap$type15, _typeMap$type16, _order$details;
+    var mode = _ref5.mode,
+      sysOrderNo = _ref5.sysOrderNo;
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
@@ -18852,29 +19353,29 @@ var GyReissue = function GyReissue(props) {
     }) : goodDetails;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type9;
+    var _typeMap$type17;
     pushGyLog('beforeChangeGood', value);
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key)] = (val || []).map(function (item) {
-      var _typeMap$type10, _typeMap$type11;
-      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.formatDefaultField.money)] = 0;
-      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.formatDefaultField.share)] = 0;
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)] = (val || []).map(function (item) {
+      var _typeMap$type18, _typeMap$type19;
+      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.formatDefaultField.money)] = 0;
+      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.formatDefaultField.share)] = 0;
       return item;
     });
     pushGyLog('afterChangeGood', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type12, _value$typeMap$type$t3, _typeMap$type13, _value$typeMap$type$t4, _typeMap$type15;
+    var _typeMap$type20, _value$typeMap$type$t3, _typeMap$type21, _value$typeMap$type$t4, _typeMap$type23;
     pushGyLog('beforeChangeSystemOrder', value);
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.systemOrderNo)] = val;
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type14;
-      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
-      var _typeMap$type16;
-      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key)] = getGoodDetails({
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo)] = val;
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type22;
+      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
+      var _typeMap$type24;
+      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -18883,7 +19384,7 @@ var GyReissue = function GyReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type17, _typeMap$type18, _uniqBy, _typeMap$type19;
+    var _typeMap$type25, _typeMap$type26, _uniqBy, _typeMap$type27;
     pushGyLog('beforeSelectedGoodsChange', value);
     var newValue = _objectSpread2({}, value);
     // 原订单商品
@@ -18891,19 +19392,19 @@ var GyReissue = function GyReissue(props) {
       mode: isStrict
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)]) || [];
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]) || [];
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key)]);
+    console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pushGyLog('afterSelectedGoodsChange', newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)], isStrict]);
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
   var showChangeBtn = useMemo(function () {
-    var _typeMap$type21;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderNo]]);
+    var _typeMap$type29;
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
   return /*#__PURE__*/React.createElement("div", {
     id: "TEST_GY",
     onClick: function onClick() {
@@ -18926,12 +19427,12 @@ var GyReissue = function GyReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : _value$typeMap$type$s.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -18952,7 +19453,7 @@ var GyReissue = function GyReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -18964,7 +19465,7 @@ var GyReissue = function GyReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -18980,8 +19481,8 @@ var GyReissue = function GyReissue(props) {
   })));
 };
 
-var _excluded$n = ["value", "onChange", "reasonList", "disabled", "type"],
-  _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
+var _excluded$o = ["value", "onChange", "reasonList", "disabled", "type"],
+  _excluded2$1 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$5 = {
   GY_RETURN_GOODS: {
     key: 'gyReturnGoods',
@@ -19009,7 +19510,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$n);
+    other = _objectWithoutProperties(props, _excluded$o);
   var valueRef = useRef({});
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
@@ -19022,6 +19523,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
   });
   useEffect(function () {
     var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
+    valueRef.current = value;
     if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$5[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$5[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
       var _value$typeMap$type$s4, _typeMap$type3;
       getOrderFlag.current = true;
@@ -19072,7 +19574,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             (_typeMap$type4 = typeMap$5[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
-              var _typeMap$type5, _typeMap$type6;
+              var _valueRef$current, _typeMap$type5, _typeMap$type$systemO, _ref3, _valueRef$current2, _typeMap$type6;
               var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
               var showOrderInfo = orders.map(function (_ref2) {
                 var billNo = _ref2.billNo,
@@ -19082,7 +19584,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
                   deliveryState = _ref2.deliveryState,
                   vipCode = _ref2.vipCode,
                   shopCode = _ref2.shopCode,
-                  rest = _objectWithoutProperties(_ref2, _excluded2);
+                  rest = _objectWithoutProperties(_ref2, _excluded2$1);
                 return _objectSpread2(_objectSpread2({}, rest), {}, {
                   billNo: billNo,
                   billType: billType,
@@ -19094,7 +19596,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
                   shopCode: shopCode
                 });
               });
-              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$5[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$5[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
+              onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$5[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO = (_ref3 = (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$5[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) !== null && _typeMap$type$systemO !== void 0 ? _typeMap$type$systemO : {}), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               }))));
@@ -19170,10 +19672,10 @@ var GyReturnGoods = function GyReturnGoods(props) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
-  var getGoodDetails = function getGoodDetails(_ref3) {
+  var getGoodDetails = function getGoodDetails(_ref4) {
     var _typeMap$type23, _typeMap$type24, _order$details;
-    var mode = _ref3.mode,
-      sysOrderNo = _ref3.sysOrderNo;
+    var mode = _ref4.mode,
+      sysOrderNo = _ref4.sysOrderNo;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$5[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$5[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {