kts-component-invoice-operate 3.2.21 → 3.2.23

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

@@ -65,6 +65,8 @@ export default class GoodsListState {
     isVisibleDrawer: boolean;
     /** 是否可以合并明细 */
     isMergeDetails: boolean;
+    /** 是否可以合并折扣 */
+    isMergeDiscount: boolean;
     /** 正在 添加商品对照 的货物 */
     addComparisonIndex?: string;
 }

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

@@ -0,0 +1,2 @@
+import { InvoiceControllerState } from '..';
+export default function mergeDiscount(state: InvoiceControllerState): Promise<void>;

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

@@ -24,6 +24,8 @@ export default class InvoiceController extends InvoiceControllerForm {
     addGood: (option?: any) => Promise<any>;
     /** 全单合并明细 */
     mergeDetails: (option?: any) => Promise<any>;
+    /** 全单合并折扣 */
+    mergeDiscount: (option?: any) => Promise<any>;
     /** 给一组货物添加折扣行 */
     addGoodDiscount: (option?: import("./fns/addGoodDiscount").IOptions | undefined) => Promise<any>;
     /** 给一组货物添加折扣行 */

package/dist/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDiscount/index.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+/** 全单合并折扣 */
+export default function useMergeDiscount(): {
+    /** 按钮 */
+    button: JSX.Element;
+};

package/dist/index.esm.js

@@ -1016,6 +1016,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.productComparison = new ProductComparison();
   this.isVisibleDrawer = false;
   this.isMergeDetails = false;
+  this.isMergeDiscount = false;
   this.addComparisonIndex = void 0;
 });
 
@@ -2028,6 +2029,62 @@ function findMaxIndex(arr) {
   return maxIndex;
 }
 
+function mergeDiscount(_x) {
+  return _mergeDiscount.apply(this, arguments);
+}
+
+function _mergeDiscount() {
+  _mergeDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
+    var goodsList, i, good, sum, zk;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!(state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood)) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 2:
+            goodsList = state.goodsListState.goodsList.slice();
+
+            for (i = 0; i < goodsList.length; i++) {
+              good = goodsList[i];
+
+              if (good.lineAttribute * 1 === LineAttributeType$1.被折扣行) {
+                sum = _objectSpread2(_objectSpread2({}, good), {}, {
+                  $index: idGenerator(),
+                  lineAttribute: LineAttributeType$1.正常,
+                  discountGroup: undefined
+                });
+                zk = goodsList[i + 1];
+                sum.lineAmountExcludeTax = chain$1(bignumber(good.lineAmountExcludeTax)).subtract(bignumber(Math.abs(zk.lineAmountExcludeTax || 0))).done().toNumber();
+                sum.lineAmountIncludeTax = chain$1(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(Math.abs(zk.lineAmountIncludeTax || 0))).done().toNumber();
+                sum.quantity = good.quantity;
+
+                if (sum.quantity) {
+                  sum.priceExcludeTax = chain$1(bignumber(good.lineAmountExcludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+                  sum.priceIncludeTax = chain$1(bignumber(good.lineAmountIncludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+                }
+
+                goodsList.splice(i, 2, sum);
+              }
+            }
+
+            state.goodsListState.goodsList = goodsList;
+
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _mergeDiscount.apply(this, arguments);
+}
+
 var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
   _inherits(InvoiceController, _InvoiceControllerFor);
 
@@ -2049,6 +2106,7 @@ var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
     _this.delGood = _this.pipeline(delGood);
     _this.addGood = _this.pipeline(addGood);
     _this.mergeDetails = _this.pipeline(mergeDetails);
+    _this.mergeDiscount = _this.pipeline(mergeDiscount);
     _this.addGoodDiscount = _this.pipeline(addGoodDiscount);
     _this.addGoodDiscountV2 = _this.pipeline(addGoodDiscountV2);
     _this.getGoodsList = void 0;
@@ -12498,7 +12556,7 @@ function useMergeDetails() {
         }
       }
     }, _callee);
-  })), []);
+  })), [controller]);
   var button = React.useMemo(function () {
     if (!isMergeDetails) return React.createElement(React.Fragment, null);
     return React.createElement(Button, {
@@ -12512,6 +12570,52 @@ function useMergeDetails() {
   };
 }
 
+/** 全单合并折扣 */
+
+function useMergeDiscount() {
+  var controller = Invoice.useInvoiceController();
+  var goodsList = controller.useMemo(function (s) {
+    return s.goodsListState.goodsList;
+  }, []);
+  var isMergeDiscount = controller.useMemo(function (s) {
+    return s.goodsListState.isMergeDiscount;
+  }, []);
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context.next = 4;
+            return controller.wait();
+
+          case 4:
+            _context.next = 6;
+            return controller.mergeDiscount();
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })), [controller]);
+  var button = React.useMemo(function () {
+    if (!isMergeDiscount) return React.createElement(React.Fragment, null);
+    return React.createElement(Button, {
+      onClick: onClick,
+      disabled: goodsList.length <= 1
+    }, "\u5408\u5E76\u6298\u6263");
+  }, [goodsList.length]);
+  return {
+    /** 按钮 */
+    button: button
+  };
+}
+
 var GoodsList = /*#__PURE__*/function (_React$Component) {
   _inherits(GoodsList, _React$Component);
 
@@ -12571,6 +12675,9 @@ var Main = decorator(Form.create())(function (props) {
   /** 全单合并明细 */
 
   var mergeDetails = useMergeDetails();
+  /** 全单合并折扣 */
+
+  var mergeDiscount = useMergeDiscount();
   /** 清空自动赋码缓存 */
 
   React.useEffect(function () {
@@ -12728,7 +12835,7 @@ var Main = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-goods-list-able"
   }, React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, React.createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, addDiscountRowButton.drawer, React.createElement(Search, null)), React.createElement("div", {
+  }, React.createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, React.createElement(Search, null)), React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, React.createElement(DescribeSwitch, null), React.createElement(TaxIncludedSwitch, null))), React.createElement("div", {
     className: classnames('kts-invoice-operate-goods-list-table', {

package/dist/index.js

@@ -1026,6 +1026,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.productComparison = new ProductComparison();
   this.isVisibleDrawer = false;
   this.isMergeDetails = false;
+  this.isMergeDiscount = false;
   this.addComparisonIndex = void 0;
 });
 
@@ -2038,6 +2039,62 @@ function findMaxIndex(arr) {
   return maxIndex;
 }
 
+function mergeDiscount(_x) {
+  return _mergeDiscount.apply(this, arguments);
+}
+
+function _mergeDiscount() {
+  _mergeDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
+    var goodsList, i, good, sum, zk;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!(state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood)) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 2:
+            goodsList = state.goodsListState.goodsList.slice();
+
+            for (i = 0; i < goodsList.length; i++) {
+              good = goodsList[i];
+
+              if (good.lineAttribute * 1 === LineAttributeType$1.被折扣行) {
+                sum = _objectSpread2(_objectSpread2({}, good), {}, {
+                  $index: idGenerator(),
+                  lineAttribute: LineAttributeType$1.正常,
+                  discountGroup: undefined
+                });
+                zk = goodsList[i + 1];
+                sum.lineAmountExcludeTax = mathjs.chain(mathjs.bignumber(good.lineAmountExcludeTax)).subtract(mathjs.bignumber(Math.abs(zk.lineAmountExcludeTax || 0))).done().toNumber();
+                sum.lineAmountIncludeTax = mathjs.chain(mathjs.bignumber(good.lineAmountIncludeTax)).subtract(mathjs.bignumber(Math.abs(zk.lineAmountIncludeTax || 0))).done().toNumber();
+                sum.quantity = good.quantity;
+
+                if (sum.quantity) {
+                  sum.priceExcludeTax = mathjs.chain(mathjs.bignumber(good.lineAmountExcludeTax)).divide(mathjs.bignumber(good.quantity)).done().toNumber();
+                  sum.priceIncludeTax = mathjs.chain(mathjs.bignumber(good.lineAmountIncludeTax)).divide(mathjs.bignumber(good.quantity)).done().toNumber();
+                }
+
+                goodsList.splice(i, 2, sum);
+              }
+            }
+
+            state.goodsListState.goodsList = goodsList;
+
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _mergeDiscount.apply(this, arguments);
+}
+
 var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
   _inherits(InvoiceController, _InvoiceControllerFor);
 
@@ -2059,6 +2116,7 @@ var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
     _this.delGood = _this.pipeline(delGood);
     _this.addGood = _this.pipeline(addGood);
     _this.mergeDetails = _this.pipeline(mergeDetails);
+    _this.mergeDiscount = _this.pipeline(mergeDiscount);
     _this.addGoodDiscount = _this.pipeline(addGoodDiscount);
     _this.addGoodDiscountV2 = _this.pipeline(addGoodDiscountV2);
     _this.getGoodsList = void 0;
@@ -12508,7 +12566,7 @@ function useMergeDetails() {
         }
       }
     }, _callee);
-  })), []);
+  })), [controller]);
   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, {
@@ -12522,6 +12580,52 @@ function useMergeDetails() {
   };
 }
 
+/** 全单合并折扣 */
+
+function useMergeDiscount() {
+  var controller = Invoice.useInvoiceController();
+  var goodsList = controller.useMemo(function (s) {
+    return s.goodsListState.goodsList;
+  }, []);
+  var isMergeDiscount = controller.useMemo(function (s) {
+    return s.goodsListState.isMergeDiscount;
+  }, []);
+  var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context.next = 4;
+            return controller.wait();
+
+          case 4:
+            _context.next = 6;
+            return controller.mergeDiscount();
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })), [controller]);
+  var button = React__default['default'].useMemo(function () {
+    if (!isMergeDiscount) return React__default['default'].createElement(React__default['default'].Fragment, null);
+    return React__default['default'].createElement(ktsComponentsAntdX3.Button, {
+      onClick: onClick,
+      disabled: goodsList.length <= 1
+    }, "\u5408\u5E76\u6298\u6263");
+  }, [goodsList.length]);
+  return {
+    /** 按钮 */
+    button: button
+  };
+}
+
 var GoodsList = /*#__PURE__*/function (_React$Component) {
   _inherits(GoodsList, _React$Component);
 
@@ -12581,6 +12685,9 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
   /** 全单合并明细 */
 
   var mergeDetails = useMergeDetails();
+  /** 全单合并折扣 */
+
+  var mergeDiscount = useMergeDiscount();
   /** 清空自动赋码缓存 */
 
   React__default['default'].useEffect(function () {
@@ -12738,7 +12845,7 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
     className: "kts-invoice-operate-goods-list-able"
   }, React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, addDiscountRowButton.drawer, React__default['default'].createElement(Search, null)), React__default['default'].createElement("div", {
+  }, React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, React__default['default'].createElement(Search, null)), React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, React__default['default'].createElement(DescribeSwitch, null), React__default['default'].createElement(TaxIncludedSwitch, null))), React__default['default'].createElement("div", {
     className: classnames__default['default']('kts-invoice-operate-goods-list-table', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.21",
+  "version": "3.2.23",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.ts

@@ -92,6 +92,9 @@ export default class GoodsListState {
   /** 是否可以合并明细 */
   isMergeDetails = false;
 
+  /** 是否可以合并折扣 */
+  isMergeDiscount = false;
+
   /** 正在 添加商品对照 的货物 */
   addComparisonIndex?: string;
 }

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

@@ -0,0 +1,29 @@
+
+
+import { IGood, InvoiceControllerState, LineAttributeType } from '..';
+import { chain, bignumber } from 'mathjs';
+import idGenerator from '../../tools/idGenerator';
+
+export default async function mergeDiscount(state: InvoiceControllerState) {
+    if (state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood) return;
+
+    const goodsList = state.goodsListState.goodsList.slice();
+    for (let i = 0; i < goodsList.length; i++) {
+        const good = goodsList[i];
+        if (good.lineAttribute * 1 === LineAttributeType.被折扣行) {
+            const sum: IGood = { ...good, $index: idGenerator(), lineAttribute: LineAttributeType.正常, discountGroup: undefined };
+            const zk = goodsList[i + 1];
+
+            sum.lineAmountExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).subtract(bignumber(Math.abs(zk.lineAmountExcludeTax || 0))).done().toNumber();
+            sum.lineAmountIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(Math.abs(zk.lineAmountIncludeTax || 0))).done().toNumber();
+            sum.quantity = good.quantity;
+            if (sum.quantity) {
+                sum.priceExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+                sum.priceIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+            }
+
+            goodsList.splice(i, 2, sum);
+        }
+    }
+    state.goodsListState.goodsList = goodsList;
+}

package/src/Invoice/InvoiceController/index.ts

@@ -12,6 +12,7 @@ import addGood from './fns/addGood';
 import saveEditGood from './fns/saveEditGood';
 import getGoodsSearch from './fns/getGoodsSearch';
 import mergeDetails from './fns/mergeDetails';
+import mergeDiscount from './fns/mergeDiscount';
 
 export { default as InvoiceControllerState } from './InvoiceControllerState';
 export { default as IGood } from './InvoiceControllerState/GoodsListState/IGood';
@@ -52,6 +53,9 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 全单合并明细 */
   mergeDetails = this.pipeline<any>(mergeDetails);
 
+  /** 全单合并折扣 */
+  mergeDiscount = this.pipeline<any>(mergeDiscount);
+
   /** 给一组货物添加折扣行 */
   addGoodDiscount = this.pipeline(addGoodDiscount);
 

package/src/Invoice/ui/default/GoodsList/index.tsx

@@ -28,6 +28,7 @@ import useEndowCodeButton from './ui/BulkMenu/hooks/useEndowCodeButton';
 import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
 import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
 import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
+import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';
 
 export interface IGoodsListProps {
   /** 扩展部分 */
@@ -87,6 +88,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   /** 全单合并明细 */
   const mergeDetails = useMergeDetails()
 
+  /** 全单合并折扣 */
+  const mergeDiscount = useMergeDiscount()
+
   /** 清空自动赋码缓存 */
   React.useEffect(() => {
     controller.run(async s => { s.goodsListState.endowCode.cache = {} });
@@ -139,6 +143,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
           {/* 全单合并明细 */}
           {mergeDetails.button}
 
+          {/* 全单合并折扣 */}
+          {mergeDiscount.button}
+
           {/* 添加折扣行 */}
           {addDiscountRowButton.drawer}
 

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

@@ -16,7 +16,7 @@ export default function useMergeDetails() {
         await controller.saveEditGood();
         await controller.wait();
         await controller.mergeDetails();
-    }, [])
+    }, [controller])
 
     const button = React.useMemo(() => {
         if (!isMergeDetails) return <></>;

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

@@ -0,0 +1,37 @@
+
+import React from "react"
+import { Button } from "kts-components-antd-x3"
+import Invoice from '../../../../../../..'
+
+/** 全单合并折扣 */
+export default function useMergeDiscount() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+
+    const isMergeDiscount = controller.useMemo(s => s.goodsListState.isMergeDiscount, []);
+
+    const onClick = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        await controller.mergeDiscount();
+    }, [controller])
+
+    const button = React.useMemo(() => {
+        if (!isMergeDiscount) return <></>;
+        return (
+            <Button
+                onClick={onClick}
+                disabled={goodsList.length <= 1}
+            >
+                合并折扣
+            </Button>
+        )
+    }, [goodsList.length])
+
+    return {
+        /** 按钮 */
+        button,
+    }
+}