kts-component-invoice-operate 3.2.66 → 3.2.67

package/dist/Invoice/InvoiceController/fns/mergeDetails.d.ts

@@ -1,2 +1,2 @@
 import { InvoiceControllerState } from '..';
-export default function mergeDetails(state: InvoiceControllerState): Promise<void>;
+export default function mergeDetails(state: InvoiceControllerState, selectedGoodIndex?: string[]): Promise<void>;

package/dist/Invoice/InvoiceController/index.d.ts

@@ -23,7 +23,7 @@ export default class InvoiceController extends InvoiceControllerForm {
     /** 添加一个货物 */
     addGood: (option?: any) => Promise<any>;
     /** 全单合并明细 */
-    mergeDetails: (option?: any) => Promise<any>;
+    mergeDetails: (option?: string[] | undefined) => Promise<any>;
     /** 全单合并折扣 */
     mergeDiscount: (option?: any) => Promise<any>;
     /** 给一组货物添加折扣行 */

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, create, all } from 'mathjs';
 import { message, Form, Input, Icon as Icon$1, Tag as Tag$1, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete as AutoComplete$2, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover as Popover$1, Table as Table$1, Tree, Modal as Modal$1, Row as Row$1, Col as Col$1 } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
-import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Popover, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
+import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Popover, Dropdown as Dropdown$1, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
 import classNames from 'classnames';
 import { Table } from 'kts-components-antd-x4-v4';
 import { render } from 'react-dom';
@@ -1715,90 +1715,93 @@ function getGoodsSearch(goodsList, search, isTaxIncluded) {
   });
 }
 
-function mergeDetails(_x) {
+function mergeDetails(_x, _x2) {
   return _mergeDetails.apply(this, arguments);
 }
 /** 计算单价(含税) */
 
 function _mergeDetails() {
-  _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
+  _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, selectedGoodIndex) {
     var goodsList, sum, p;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (!state.goodsListState.editGood) {
-              _context.next = 2;
+            debugger;
+
+            if (!(state.goodsListState.editGood || !selectedGoodIndex || selectedGoodIndex.length < 2)) {
+              _context.next = 3;
               break;
             }
 
             return _context.abrupt("return");
 
-          case 2:
+          case 3:
             // const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
+            // const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
             goodsList = state.goodsListState.goodsList.filter(function (e) {
-              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0;
+              return selectedGoodIndex.indexOf(e.$index) >= 0;
             });
 
             if (!(goodsList.length < 2)) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
 
             return _context.abrupt("return");
 
-          case 5:
-            _context.prev = 5;
+          case 6:
+            _context.prev = 6;
             // 创建合并后的商品对象
             sum = {
               $index: idGenerator(),
               lineAttribute: LineAttributeType$1.正常
             }; // 存在税率不一样的明细，不能合并
 
-            _context.next = 9;
+            _context.next = 10;
             return checkTaxTate(goodsList);
 
-          case 9:
-            _context.next = 11;
+          case 10:
+            _context.next = 12;
             return fillingInformationGood(goodsList, sum);
 
-          case 11:
+          case 12:
             sum = _context.sent;
-            _context.next = 14;
+            _context.next = 15;
             return mergeQuantity(goodsList);
 
-          case 14:
+          case 15:
             sum.quantity = _context.sent;
-            _context.next = 17;
+            _context.next = 18;
             return mergeLineAmountExcludeTax(goodsList);
 
-          case 17:
+          case 18:
             sum.lineAmountExcludeTax = _context.sent;
-            _context.next = 20;
+            _context.next = 21;
             return mergeLineAmountIncludeTax(goodsList);
 
-          case 20:
+          case 21:
             sum.lineAmountIncludeTax = _context.sent;
-            _context.next = 23;
+            _context.next = 24;
             return calculatePriceExcludeTax(sum, state.calculatingDigits);
 
-          case 23:
+          case 24:
             sum.priceExcludeTax = _context.sent;
-            _context.next = 26;
+            _context.next = 27;
             return calculatePriceIncludeTax(sum, state.calculatingDigits);
 
-          case 26:
+          case 27:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
             sum.taxAmount = chain$1(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
 
-            _context.next = 30;
+            _context.next = 31;
             return checkSameNumber(sum);
 
-          case 30:
+          case 31:
             p = state.goodsListState.goodsList.indexOf(goodsList[0]);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
-              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0;
+              return selectedGoodIndex.indexOf(e.$index) < 0;
             });
             state.goodsListState.goodsList.splice(p, 0, sum);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
@@ -1809,25 +1812,25 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 42;
+            _context.next = 43;
             break;
 
-          case 39:
-            _context.prev = 39;
-            _context.t0 = _context["catch"](5);
+          case 40:
+            _context.prev = 40;
+            _context.t0 = _context["catch"](6);
             showError(_context.t0);
 
-          case 42:
+          case 43:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 39]]);
+    }, _callee, null, [[6, 40]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
 
-function calculatePriceIncludeTax(_x2, _x3) {
+function calculatePriceIncludeTax(_x3, _x4) {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 /** 计算单价(不含税) */
@@ -1861,7 +1864,7 @@ function _calculatePriceIncludeTax() {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 
-function calculatePriceExcludeTax(_x4, _x5) {
+function calculatePriceExcludeTax(_x5, _x6) {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 /** 合并金额(含税) */
@@ -1895,7 +1898,7 @@ function _calculatePriceExcludeTax() {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountIncludeTax(_x6) {
+function mergeLineAmountIncludeTax(_x7) {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 /** 合并金额(不含税) */
@@ -1924,7 +1927,7 @@ function _mergeLineAmountIncludeTax() {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountExcludeTax(_x7) {
+function mergeLineAmountExcludeTax(_x8) {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 /** 合并数量 */
@@ -1953,7 +1956,7 @@ function _mergeLineAmountExcludeTax() {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 
-function mergeQuantity(_x8) {
+function mergeQuantity(_x9) {
   return _mergeQuantity.apply(this, arguments);
 }
 /** 填充行明细信息 */
@@ -1982,7 +1985,7 @@ function _mergeQuantity() {
   return _mergeQuantity.apply(this, arguments);
 }
 
-function fillingInformationGood(_x9, _x10) {
+function fillingInformationGood(_x10, _x11) {
   return _fillingInformationGood.apply(this, arguments);
 }
 /** 存在税率不一样的明细，不能合并 */
@@ -2013,7 +2016,7 @@ function _fillingInformationGood() {
   return _fillingInformationGood.apply(this, arguments);
 }
 
-function checkTaxTate(_x11) {
+function checkTaxTate(_x12) {
   return _checkTaxTate.apply(this, arguments);
 }
 /** 校验数据 是否数量和金额是否同号 */
@@ -2057,7 +2060,7 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
-function checkSameNumber(_x12) {
+function checkSameNumber(_x13) {
   return _checkSameNumber.apply(this, arguments);
 }
 /** 显示错误信息 */
@@ -10788,38 +10791,37 @@ function ItemCodeInput(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              debugger;
-              _context.prev = 1;
+              _context.prev = 0;
 
               if (!autoComplete.onItemCodeSearch) {
-                _context.next = 8;
+                _context.next = 7;
                 break;
               }
 
               _context.t0 = setOptions;
-              _context.next = 6;
+              _context.next = 5;
               return autoComplete.onItemCodeSearch(searchText, editGood === null || editGood === void 0 ? void 0 : editGood.itemName);
 
-            case 6:
+            case 5:
               _context.t1 = _context.sent;
               (0, _context.t0)(_context.t1);
 
-            case 8:
-              _context.next = 14;
+            case 7:
+              _context.next = 13;
               break;
 
-            case 10:
-              _context.prev = 10;
-              _context.t2 = _context["catch"](1);
+            case 9:
+              _context.prev = 9;
+              _context.t2 = _context["catch"](0);
               setOptions([]);
               throw _context.t2;
 
-            case 14:
+            case 13:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[1, 10]]);
+      }, _callee, null, [[0, 9]]);
     }));
 
     return function (_x) {
@@ -10845,10 +10847,9 @@ function ItemCodeInput(props) {
               return _context2.abrupt("return");
 
             case 3:
-              debugger;
               controller.importGoodsDrawer(record);
 
-            case 5:
+            case 4:
             case "end":
               return _context2.stop();
           }
@@ -14540,7 +14541,7 @@ function useMergeDetails() {
   var isMergeDetails = controller.useMemo(function (s) {
     return s.goodsListState.isMergeDetails;
   }, []);
-  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onClickManual = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -14554,7 +14555,7 @@ function useMergeDetails() {
 
           case 4:
             _context.next = 6;
-            return controller.mergeDetails();
+            return controller.mergeDetails(controller.state.goodsListState.selectedGoodIndex);
 
           case 6:
           case "end":
@@ -14563,17 +14564,103 @@ function useMergeDetails() {
       }
     }, _callee);
   })), [controller]);
+  var onClickAuto = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var group, i, _selectedGoodIndex;
+
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context2.next = 4;
+            return controller.wait();
+
+          case 4:
+            group = groupBy(controller.state.goodsListState.goodsList);
+            i = 0;
+
+          case 6:
+            if (!(i < group.length)) {
+              _context2.next = 13;
+              break;
+            }
+
+            _selectedGoodIndex = group[i].map(function (e) {
+              return e.$index;
+            });
+            _context2.next = 10;
+            return controller.mergeDetails(_selectedGoodIndex);
+
+          case 10:
+            i++;
+            _context2.next = 6;
+            break;
+
+          case 13:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })), []);
+  var items = React.useMemo(function () {
+    return [{
+      key: '0',
+      label: '自动合并',
+      onClick: onClickAuto
+    }, {
+      key: '1',
+      label: '手动合并',
+      disabled: selectedGoodIndex.length <= 1,
+      onClick: onClickManual
+    }];
+  }, [selectedGoodIndex, onClickManual, onClickAuto]);
   var button = React.useMemo(function () {
     if (!isMergeDetails) return React.createElement(React.Fragment, null);
-    return React.createElement(Button, {
-      onClick: onClick,
-      disabled: selectedGoodIndex.length <= 1
-    }, "\u5408\u5E76\u660E\u7EC6");
+    return React.createElement(Dropdown$1, {
+      menu: {
+        items: items
+      },
+      trigger: ['click']
+    }, React.createElement(Button, null, "\u5408\u5E76\u660E\u7EC6"));
   }, [selectedGoodIndex.length, isMergeDetails]);
   return {
     /** 按钮 */
     button: button
   };
+} // 根据"商品编码"" 和 "单价" 分组
+
+function groupBy(arr) {
+  var grouped = {}; // for (const item of arr) {
+  //     if (!item.itemCode) continue;
+  //     const key = `${item.itemCode}${item.priceIncludeTax}${item.priceExcludeTax}`;
+  //     if (!grouped[key]) {
+  //         grouped[key] = [];
+  //     }
+  //     grouped[key].push(item);
+  // }
+
+  for (var i = 0; i < arr.length; i++) {
+    var item = arr[i];
+    if (!item.itemCode) continue;
+    var key = "".concat(item.itemCode).concat(item.priceIncludeTax).concat(item.priceExcludeTax);
+
+    if (!grouped[key]) {
+      grouped[key] = [];
+    }
+
+    grouped[key].push(item);
+
+    if (item.lineAttribute === LineAttributeType$1.被折扣行) {
+      grouped[key].push(arr[i + 1]);
+      i++;
+    }
+  }
+
+  return Object.values(grouped);
 }
 
 /** 全单合并折扣 */

package/dist/index.js

@@ -1725,90 +1725,93 @@ function getGoodsSearch(goodsList, search, isTaxIncluded) {
   });
 }
 
-function mergeDetails(_x) {
+function mergeDetails(_x, _x2) {
   return _mergeDetails.apply(this, arguments);
 }
 /** 计算单价(含税) */
 
 function _mergeDetails() {
-  _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
+  _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, selectedGoodIndex) {
     var goodsList, sum, p;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (!state.goodsListState.editGood) {
-              _context.next = 2;
+            debugger;
+
+            if (!(state.goodsListState.editGood || !selectedGoodIndex || selectedGoodIndex.length < 2)) {
+              _context.next = 3;
               break;
             }
 
             return _context.abrupt("return");
 
-          case 2:
+          case 3:
             // const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
+            // const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
             goodsList = state.goodsListState.goodsList.filter(function (e) {
-              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0;
+              return selectedGoodIndex.indexOf(e.$index) >= 0;
             });
 
             if (!(goodsList.length < 2)) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
 
             return _context.abrupt("return");
 
-          case 5:
-            _context.prev = 5;
+          case 6:
+            _context.prev = 6;
             // 创建合并后的商品对象
             sum = {
               $index: idGenerator(),
               lineAttribute: LineAttributeType$1.正常
             }; // 存在税率不一样的明细，不能合并
 
-            _context.next = 9;
+            _context.next = 10;
             return checkTaxTate(goodsList);
 
-          case 9:
-            _context.next = 11;
+          case 10:
+            _context.next = 12;
             return fillingInformationGood(goodsList, sum);
 
-          case 11:
+          case 12:
             sum = _context.sent;
-            _context.next = 14;
+            _context.next = 15;
             return mergeQuantity(goodsList);
 
-          case 14:
+          case 15:
             sum.quantity = _context.sent;
-            _context.next = 17;
+            _context.next = 18;
             return mergeLineAmountExcludeTax(goodsList);
 
-          case 17:
+          case 18:
             sum.lineAmountExcludeTax = _context.sent;
-            _context.next = 20;
+            _context.next = 21;
             return mergeLineAmountIncludeTax(goodsList);
 
-          case 20:
+          case 21:
             sum.lineAmountIncludeTax = _context.sent;
-            _context.next = 23;
+            _context.next = 24;
             return calculatePriceExcludeTax(sum, state.calculatingDigits);
 
-          case 23:
+          case 24:
             sum.priceExcludeTax = _context.sent;
-            _context.next = 26;
+            _context.next = 27;
             return calculatePriceIncludeTax(sum, state.calculatingDigits);
 
-          case 26:
+          case 27:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
             sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
 
-            _context.next = 30;
+            _context.next = 31;
             return checkSameNumber(sum);
 
-          case 30:
+          case 31:
             p = state.goodsListState.goodsList.indexOf(goodsList[0]);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
-              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0;
+              return selectedGoodIndex.indexOf(e.$index) < 0;
             });
             state.goodsListState.goodsList.splice(p, 0, sum);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
@@ -1819,25 +1822,25 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 42;
+            _context.next = 43;
             break;
 
-          case 39:
-            _context.prev = 39;
-            _context.t0 = _context["catch"](5);
+          case 40:
+            _context.prev = 40;
+            _context.t0 = _context["catch"](6);
             showError(_context.t0);
 
-          case 42:
+          case 43:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 39]]);
+    }, _callee, null, [[6, 40]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
 
-function calculatePriceIncludeTax(_x2, _x3) {
+function calculatePriceIncludeTax(_x3, _x4) {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 /** 计算单价(不含税) */
@@ -1871,7 +1874,7 @@ function _calculatePriceIncludeTax() {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 
-function calculatePriceExcludeTax(_x4, _x5) {
+function calculatePriceExcludeTax(_x5, _x6) {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 /** 合并金额(含税) */
@@ -1905,7 +1908,7 @@ function _calculatePriceExcludeTax() {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountIncludeTax(_x6) {
+function mergeLineAmountIncludeTax(_x7) {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 /** 合并金额(不含税) */
@@ -1934,7 +1937,7 @@ function _mergeLineAmountIncludeTax() {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountExcludeTax(_x7) {
+function mergeLineAmountExcludeTax(_x8) {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 /** 合并数量 */
@@ -1963,7 +1966,7 @@ function _mergeLineAmountExcludeTax() {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 
-function mergeQuantity(_x8) {
+function mergeQuantity(_x9) {
   return _mergeQuantity.apply(this, arguments);
 }
 /** 填充行明细信息 */
@@ -1992,7 +1995,7 @@ function _mergeQuantity() {
   return _mergeQuantity.apply(this, arguments);
 }
 
-function fillingInformationGood(_x9, _x10) {
+function fillingInformationGood(_x10, _x11) {
   return _fillingInformationGood.apply(this, arguments);
 }
 /** 存在税率不一样的明细，不能合并 */
@@ -2023,7 +2026,7 @@ function _fillingInformationGood() {
   return _fillingInformationGood.apply(this, arguments);
 }
 
-function checkTaxTate(_x11) {
+function checkTaxTate(_x12) {
   return _checkTaxTate.apply(this, arguments);
 }
 /** 校验数据 是否数量和金额是否同号 */
@@ -2067,7 +2070,7 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
-function checkSameNumber(_x12) {
+function checkSameNumber(_x13) {
   return _checkSameNumber.apply(this, arguments);
 }
 /** 显示错误信息 */
@@ -10798,38 +10801,37 @@ function ItemCodeInput(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              debugger;
-              _context.prev = 1;
+              _context.prev = 0;
 
               if (!autoComplete.onItemCodeSearch) {
-                _context.next = 8;
+                _context.next = 7;
                 break;
               }
 
               _context.t0 = setOptions;
-              _context.next = 6;
+              _context.next = 5;
               return autoComplete.onItemCodeSearch(searchText, editGood === null || editGood === void 0 ? void 0 : editGood.itemName);
 
-            case 6:
+            case 5:
               _context.t1 = _context.sent;
               (0, _context.t0)(_context.t1);
 
-            case 8:
-              _context.next = 14;
+            case 7:
+              _context.next = 13;
               break;
 
-            case 10:
-              _context.prev = 10;
-              _context.t2 = _context["catch"](1);
+            case 9:
+              _context.prev = 9;
+              _context.t2 = _context["catch"](0);
               setOptions([]);
               throw _context.t2;
 
-            case 14:
+            case 13:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[1, 10]]);
+      }, _callee, null, [[0, 9]]);
     }));
 
     return function (_x) {
@@ -10855,10 +10857,9 @@ function ItemCodeInput(props) {
               return _context2.abrupt("return");
 
             case 3:
-              debugger;
               controller.importGoodsDrawer(record);
 
-            case 5:
+            case 4:
             case "end":
               return _context2.stop();
           }
@@ -14550,7 +14551,7 @@ function useMergeDetails() {
   var isMergeDetails = controller.useMemo(function (s) {
     return s.goodsListState.isMergeDetails;
   }, []);
-  var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onClickManual = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -14564,7 +14565,7 @@ function useMergeDetails() {
 
           case 4:
             _context.next = 6;
-            return controller.mergeDetails();
+            return controller.mergeDetails(controller.state.goodsListState.selectedGoodIndex);
 
           case 6:
           case "end":
@@ -14573,17 +14574,103 @@ function useMergeDetails() {
       }
     }, _callee);
   })), [controller]);
+  var onClickAuto = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var group, i, _selectedGoodIndex;
+
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context2.next = 4;
+            return controller.wait();
+
+          case 4:
+            group = groupBy(controller.state.goodsListState.goodsList);
+            i = 0;
+
+          case 6:
+            if (!(i < group.length)) {
+              _context2.next = 13;
+              break;
+            }
+
+            _selectedGoodIndex = group[i].map(function (e) {
+              return e.$index;
+            });
+            _context2.next = 10;
+            return controller.mergeDetails(_selectedGoodIndex);
+
+          case 10:
+            i++;
+            _context2.next = 6;
+            break;
+
+          case 13:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })), []);
+  var items = React__default['default'].useMemo(function () {
+    return [{
+      key: '0',
+      label: '自动合并',
+      onClick: onClickAuto
+    }, {
+      key: '1',
+      label: '手动合并',
+      disabled: selectedGoodIndex.length <= 1,
+      onClick: onClickManual
+    }];
+  }, [selectedGoodIndex, onClickManual, onClickAuto]);
   var button = React__default['default'].useMemo(function () {
     if (!isMergeDetails) return React__default['default'].createElement(React__default['default'].Fragment, null);
-    return React__default['default'].createElement(ktsComponentsAntdX3.Button, {
-      onClick: onClick,
-      disabled: selectedGoodIndex.length <= 1
-    }, "\u5408\u5E76\u660E\u7EC6");
+    return React__default['default'].createElement(ktsXui.Dropdown, {
+      menu: {
+        items: items
+      },
+      trigger: ['click']
+    }, React__default['default'].createElement(ktsComponentsAntdX3.Button, null, "\u5408\u5E76\u660E\u7EC6"));
   }, [selectedGoodIndex.length, isMergeDetails]);
   return {
     /** 按钮 */
     button: button
   };
+} // 根据"商品编码"" 和 "单价" 分组
+
+function groupBy(arr) {
+  var grouped = {}; // for (const item of arr) {
+  //     if (!item.itemCode) continue;
+  //     const key = `${item.itemCode}${item.priceIncludeTax}${item.priceExcludeTax}`;
+  //     if (!grouped[key]) {
+  //         grouped[key] = [];
+  //     }
+  //     grouped[key].push(item);
+  // }
+
+  for (var i = 0; i < arr.length; i++) {
+    var item = arr[i];
+    if (!item.itemCode) continue;
+    var key = "".concat(item.itemCode).concat(item.priceIncludeTax).concat(item.priceExcludeTax);
+
+    if (!grouped[key]) {
+      grouped[key] = [];
+    }
+
+    grouped[key].push(item);
+
+    if (item.lineAttribute === LineAttributeType$1.被折扣行) {
+      grouped[key].push(arr[i + 1]);
+      i++;
+    }
+  }
+
+  return Object.values(grouped);
 }
 
 /** 全单合并折扣 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.66",
+  "version": "3.2.67",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/fns/mergeDetails.ts

@@ -5,11 +5,13 @@ import idGenerator from '../../tools/idGenerator';
 import { IGood, InvoiceControllerState, LineAttributeType } from '..';
 import { format15 } from '../../tools/calculate';
 
-export default async function mergeDetails(state: InvoiceControllerState) {
-    if (state.goodsListState.editGood) return;
+export default async function mergeDetails(state: InvoiceControllerState, selectedGoodIndex?: string[]) {
+    debugger;
+    if (state.goodsListState.editGood || !selectedGoodIndex || selectedGoodIndex.length < 2) return;
 
     // const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
-    const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
+    // const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
+    const goodsList = state.goodsListState.goodsList.filter(e => selectedGoodIndex.indexOf(e.$index) >= 0);
     if (goodsList.length < 2) return;
 
     try {
@@ -44,7 +46,7 @@ export default async function mergeDetails(state: InvoiceControllerState) {
         await checkSameNumber(sum);
 
         const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
-        state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
+        state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => selectedGoodIndex.indexOf(e.$index) < 0);
         state.goodsListState.goodsList.splice(p, 0, sum);
         state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => e.lineAmountExcludeTax !== 0);
         state.goodsListState.goodsMap = new Map();

package/src/Invoice/InvoiceController/index.ts

@@ -52,7 +52,7 @@ export default class InvoiceController extends InvoiceControllerForm {
   addGood = this.pipeline(addGood);
 
   /** 全单合并明细 */
-  mergeDetails = this.pipeline<any>(mergeDetails);
+  mergeDetails = this.pipeline(mergeDetails);
 
   /** 全单合并折扣 */
   mergeDiscount = this.pipeline<any>(mergeDiscount);

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/ItemCodeInput/index.tsx

@@ -21,7 +21,6 @@ export default function ItemCodeInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     }, [])
 
     const onSearch = React.useCallback(async (searchText: string) => {
-        debugger;
         try {
             if (autoComplete.onItemCodeSearch) {
                 setOptions(await autoComplete.onItemCodeSearch(searchText, editGood?.itemName))
@@ -35,7 +34,6 @@ export default function ItemCodeInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     const onChangeAutoComplete = React.useCallback(async itemName => {
         const record = options.filter(e => e.itemCode === itemName)[0] as any;
         if (!record) return;
-        debugger;
         controller.importGoodsDrawer(record);
     }, [options, controller])
 

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDetails/index.tsx

@@ -2,6 +2,8 @@
 import React from "react"
 import { Button } from "kts-components-antd-x3"
 import Invoice from '../../../../../../..'
+import { Dropdown, MenuProps } from "kts-xui";
+import { IGood, LineAttributeType } from "../../../../../../../InvoiceController";
 
 /** 全单合并明细 */
 export default function useMergeDetails() {
@@ -12,21 +14,45 @@ export default function useMergeDetails() {
 
     const isMergeDetails = controller.useMemo(s => s.goodsListState.isMergeDetails, []);
 
-    const onClick = React.useCallback(async () => {
+    const onClickManual = React.useCallback(async () => {
         await controller.saveEditGood();
         await controller.wait();
-        await controller.mergeDetails();
+        await controller.mergeDetails(controller.state.goodsListState.selectedGoodIndex);
     }, [controller])
 
+    const onClickAuto = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        const group = groupBy(controller.state.goodsListState.goodsList);
+        for (let i = 0; i < group.length; i++) {
+            const selectedGoodIndex = group[i].map(e => e.$index);
+            await controller.mergeDetails(selectedGoodIndex);
+        }
+    }, [])
+
+    const items: MenuProps['items'] = React.useMemo(() => {
+        return [
+            {
+                key: '0',
+                label: '自动合并',
+                onClick: onClickAuto,
+            }, {
+                key: '1',
+                label: '手动合并',
+                disabled: selectedGoodIndex.length <= 1,
+                onClick: onClickManual,
+            },
+        ];
+    }, [selectedGoodIndex, onClickManual, onClickAuto])
+
     const button = React.useMemo(() => {
         if (!isMergeDetails) return <></>;
         return (
-            <Button
-                onClick={onClick}
-                disabled={selectedGoodIndex.length <= 1}
-            >
-                合并明细
-            </Button>
+            <Dropdown menu={{ items }} trigger={['click']} >
+                <Button>
+                    合并明细
+                </Button>
+            </Dropdown>
         )
     }, [selectedGoodIndex.length, isMergeDetails])
 
@@ -35,3 +61,29 @@ export default function useMergeDetails() {
         button,
     }
 }
+
+// 根据"商品编码"" 和 "单价" 分组
+function groupBy(arr: IGood[]): IGood[][] {
+    const grouped: any = {};
+    // for (const item of arr) {
+    //     if (!item.itemCode) continue;
+    //     const key = `${item.itemCode}${item.priceIncludeTax}${item.priceExcludeTax}`;
+    //     if (!grouped[key]) {
+    //         grouped[key] = [];
+    //     }
+    //     grouped[key].push(item);
+    // }
+    for (let i = 0; i < arr.length; i++) {
+        const item = arr[i];
+        if (!item.itemCode) continue;
+        const key = `${item.itemCode}${item.priceIncludeTax}${item.priceExcludeTax}`;
+        if (!grouped[key]) {
+            grouped[key] = [];
+        }
+        grouped[key].push(item);
+        if (item.lineAttribute === LineAttributeType.被折扣行) {
+            grouped[key].push(arr[i + 1]); i++;
+        }
+    }
+    return Object.values(grouped);
+}