kts-component-invoice-operate 3.2.121-1 → 3.2.121-2

package/dist/Invoice/ui/default/GoodsList/hook/useColumns/autoFillFn/index.d.ts

@@ -35,3 +35,5 @@ export declare const endowCode: (controller: InvoiceController, goods: IGood) =>
 export declare const onChangeItemName: (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => Promise<void>;
 /** 修改了 商品编码 */
 export declare const onChangeItemCode: (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => Promise<void>;
+/** 修改了含税开关 重新计算 */
+export declare const onChangeSwitchTax: (controller: InvoiceController, isTaxIncluded: boolean) => Promise<void>;

package/dist/Invoice/ui/digtal/GoodsList/hook/useColumns/autoFillFn/index.d.ts

@@ -33,5 +33,5 @@ export declare const onSaveEditGood: (...par: any[]) => void;
 export declare const endowCode: (controller: InvoiceController, goods: IGood) => Promise<void>;
 /** 修改了 项目名称 */
 export declare const onChangeItemName: (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => Promise<void>;
-/** 修改了 切换了税率 */
+/** 修改了含税开关 重新计算 */
 export declare const onChangeSwitchTax: (controller: InvoiceController, isTaxIncluded: boolean) => Promise<void>;

package/dist/index.esm.js

@@ -9331,6 +9331,154 @@ var onChangeItemCode = /*#__PURE__*/function () {
     return _ref18.apply(this, arguments);
   };
 }();
+/** 修改了含税开关 重新计算 */
+
+var onChangeSwitchTax = /*#__PURE__*/function () {
+  var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(controller, isTaxIncluded) {
+    var calculatingDigits;
+    return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+      while (1) {
+        switch (_context21.prev = _context21.next) {
+          case 0:
+            calculatingDigits = controller.state.calculatingDigits;
+            _context21.next = 3;
+            return controller.saveEditGood();
+
+          case 3:
+            _context21.next = 5;
+            return controller.wait();
+
+          case 5:
+            _context21.next = 7;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(s) {
+                var _s$goodsListState, needRefresh, newGoodList;
+
+                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+                  while (1) {
+                    switch (_context20.prev = _context20.next) {
+                      case 0:
+                        if (!s.goodsListState.editGood) {
+                          _context20.next = 3;
+                          break;
+                        }
+
+                        message.error({
+                          content: '你正在编辑一个货物',
+                          key: '你正在编辑一个货物'
+                        });
+                        return _context20.abrupt("return");
+
+                      case 3:
+                        s.goodsListState.isTaxIncluded = isTaxIncluded;
+
+                        try {
+                          needRefresh = false;
+
+                          if (((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : _s$goodsListState.goodsList) && s.goodsListState.goodsList.length) {
+                            newGoodList = s.goodsListState.goodsList.map(function (good) {
+                              var sourceQuantity = good.quantity,
+                                  sourcePriceExcludeTax = good.priceExcludeTax,
+                                  sourcePriceIncludeTax = good.priceIncludeTax,
+                                  sourceLineAmountExcludeTax = good.lineAmountExcludeTax,
+                                  sourceLineAmountIncludeTax = good.lineAmountIncludeTax,
+                                  taxRate = good.taxRate;
+
+                              if (isTaxIncluded) {
+                                if (!sourceQuantity && sourceQuantity !== 0) return good;
+                                if (!sourcePriceIncludeTax && sourcePriceIncludeTax !== 0) return good;
+                                if (!taxRate && taxRate !== 0) return good;
+
+                                if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
+                                  console.log('equal');
+                                  return good;
+                                } else {
+                                  needRefresh = true;
+                                  console.log('not equal');
+                                }
+
+                                var quantity = format15(sourceQuantity, calculatingDigits);
+                                var priceIncludeTax = format15(sourcePriceIncludeTax, calculatingDigits);
+                                var lineAmountIncludeTax = format2(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)));
+                                var taxAmount = countTaxAmount(lineAmountIncludeTax, controller.state.goodsListState.deduction, taxRate);
+                                var lineAmountExcludeTax = countAmountExcludeTax(lineAmountIncludeTax, taxAmount);
+                                var priceExcludeTax = countPrice(lineAmountExcludeTax, quantity, controller.state.calculatingDigits);
+                                return _objectSpread2(_objectSpread2({}, good), {}, {
+                                  lineAmountExcludeTax: lineAmountExcludeTax,
+                                  lineAmountIncludeTax: lineAmountIncludeTax,
+                                  taxAmount: taxAmount,
+                                  priceExcludeTax: priceExcludeTax
+                                });
+                              } else {
+                                var _s$goodsListState$for;
+
+                                if (!sourceQuantity && sourceQuantity !== 0) return good;
+                                if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
+                                if (!taxRate && taxRate !== 0) return good;
+
+                                if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
+                                  console.log('equal');
+                                  return good;
+                                } else {
+                                  needRefresh = true;
+                                  console.log('not equal');
+                                }
+
+                                var _quantity5 = format15(sourceQuantity, calculatingDigits);
+
+                                var _priceExcludeTax3 = format15(sourcePriceExcludeTax, calculatingDigits);
+
+                                var _lineAmountExcludeTax3 = format2(evaluate("".concat(_priceExcludeTax3, " * ").concat(_quantity5)));
+
+                                var _lineAmountIncludeTax3 = format2(evaluate("".concat(_lineAmountExcludeTax3, " * (1+(").concat(taxRate, "/100))")));
+
+                                var _priceIncludeTax3 = format15(evaluate("".concat(_lineAmountIncludeTax3, " / ").concat(_quantity5)), calculatingDigits);
+
+                                var _taxAmount = evaluate("".concat(_lineAmountIncludeTax3, " - ").concat(_lineAmountExcludeTax3));
+
+                                console.log((_s$goodsListState$for = s.goodsListState.form) === null || _s$goodsListState$for === void 0 ? void 0 : _s$goodsListState$for.getFieldsValue(), 'goodsListState');
+                                return _objectSpread2(_objectSpread2({}, good), {}, {
+                                  lineAmountExcludeTax: _lineAmountExcludeTax3,
+                                  lineAmountIncludeTax: _lineAmountIncludeTax3,
+                                  taxAmount: _taxAmount,
+                                  priceIncludeTax: _priceIncludeTax3
+                                });
+                              }
+                            });
+
+                            if (needRefresh) {
+                              s.goodsListState.goodsList = newGoodList;
+                            }
+                          }
+                        } catch (e) {
+                          console.error('切换税率重新计算出错', e, s.goodsListState);
+                        }
+
+                      case 5:
+                      case "end":
+                        return _context20.stop();
+                    }
+                  }
+                }, _callee20);
+              }));
+
+              return function (_x40) {
+                return _ref21.apply(this, arguments);
+              };
+            }());
+
+          case 7:
+          case "end":
+            return _context21.stop();
+        }
+      }
+    }, _callee21);
+  }));
+
+  return function onChangeSwitchTax(_x38, _x39) {
+    return _ref20.apply(this, arguments);
+  };
+}();
 
 /**
  * 删除一个货物
@@ -10240,28 +10388,7 @@ var TaxIncludedSwitch = (function () {
     return e.goodsListState.isSwitchTax;
   }, []);
   var onChange = React.useCallback(function (e) {
-    controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                s.goodsListState = _objectSpread2(_objectSpread2({}, s.goodsListState), {}, {
-                  isTaxIncluded: e
-                });
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }())();
+    onChangeSwitchTax(controller, e);
   }, []);
   return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("label", {
     style: {
@@ -18696,9 +18823,9 @@ var onChangeItemName$1 = /*#__PURE__*/function () {
     return _ref16.apply(this, arguments);
   };
 }();
-/** 修改了 切换了税率 */
+/** 修改了含税开关 重新计算 */
 
-var onChangeSwitchTax = /*#__PURE__*/function () {
+var onChangeSwitchTax$1 = /*#__PURE__*/function () {
   var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(controller, isTaxIncluded) {
     var calculatingDigits;
     return _regeneratorRuntime().wrap(function _callee19$(_context19) {
@@ -18723,13 +18850,18 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                   while (1) {
                     switch (_context18.prev = _context18.next) {
                       case 0:
-                        if (s.goodsListState.editGood) {
-                          message.error({
-                            content: '你正在编辑一个货物',
-                            key: '你正在编辑一个货物'
-                          });
+                        if (!s.goodsListState.editGood) {
+                          _context18.next = 3;
+                          break;
                         }
 
+                        message.error({
+                          content: '你正在编辑一个货物',
+                          key: '你正在编辑一个货物'
+                        });
+                        return _context18.abrupt("return");
+
+                      case 3:
                         s.goodsListState.isTaxIncluded = isTaxIncluded;
 
                         try {
@@ -18814,7 +18946,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                           console.error('切换税率重新计算出错', e, s.goodsListState);
                         }
 
-                      case 3:
+                      case 5:
                       case "end":
                         return _context18.stop();
                     }
@@ -18858,7 +18990,7 @@ var TaxIncludedSwitch$1 = (function () {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              onChangeSwitchTax(controller, e);
+              onChangeSwitchTax$1(controller, e);
 
             case 1:
             case "end":

package/dist/index.js

@@ -9341,6 +9341,154 @@ var onChangeItemCode = /*#__PURE__*/function () {
     return _ref18.apply(this, arguments);
   };
 }();
+/** 修改了含税开关 重新计算 */
+
+var onChangeSwitchTax = /*#__PURE__*/function () {
+  var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(controller, isTaxIncluded) {
+    var calculatingDigits;
+    return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+      while (1) {
+        switch (_context21.prev = _context21.next) {
+          case 0:
+            calculatingDigits = controller.state.calculatingDigits;
+            _context21.next = 3;
+            return controller.saveEditGood();
+
+          case 3:
+            _context21.next = 5;
+            return controller.wait();
+
+          case 5:
+            _context21.next = 7;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(s) {
+                var _s$goodsListState, needRefresh, newGoodList;
+
+                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+                  while (1) {
+                    switch (_context20.prev = _context20.next) {
+                      case 0:
+                        if (!s.goodsListState.editGood) {
+                          _context20.next = 3;
+                          break;
+                        }
+
+                        ktsComponentsAntdX3.message.error({
+                          content: '你正在编辑一个货物',
+                          key: '你正在编辑一个货物'
+                        });
+                        return _context20.abrupt("return");
+
+                      case 3:
+                        s.goodsListState.isTaxIncluded = isTaxIncluded;
+
+                        try {
+                          needRefresh = false;
+
+                          if (((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : _s$goodsListState.goodsList) && s.goodsListState.goodsList.length) {
+                            newGoodList = s.goodsListState.goodsList.map(function (good) {
+                              var sourceQuantity = good.quantity,
+                                  sourcePriceExcludeTax = good.priceExcludeTax,
+                                  sourcePriceIncludeTax = good.priceIncludeTax,
+                                  sourceLineAmountExcludeTax = good.lineAmountExcludeTax,
+                                  sourceLineAmountIncludeTax = good.lineAmountIncludeTax,
+                                  taxRate = good.taxRate;
+
+                              if (isTaxIncluded) {
+                                if (!sourceQuantity && sourceQuantity !== 0) return good;
+                                if (!sourcePriceIncludeTax && sourcePriceIncludeTax !== 0) return good;
+                                if (!taxRate && taxRate !== 0) return good;
+
+                                if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && mathjs.equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
+                                  console.log('equal');
+                                  return good;
+                                } else {
+                                  needRefresh = true;
+                                  console.log('not equal');
+                                }
+
+                                var quantity = format15(sourceQuantity, calculatingDigits);
+                                var priceIncludeTax = format15(sourcePriceIncludeTax, calculatingDigits);
+                                var lineAmountIncludeTax = format2(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)));
+                                var taxAmount = countTaxAmount(lineAmountIncludeTax, controller.state.goodsListState.deduction, taxRate);
+                                var lineAmountExcludeTax = countAmountExcludeTax(lineAmountIncludeTax, taxAmount);
+                                var priceExcludeTax = countPrice(lineAmountExcludeTax, quantity, controller.state.calculatingDigits);
+                                return _objectSpread2(_objectSpread2({}, good), {}, {
+                                  lineAmountExcludeTax: lineAmountExcludeTax,
+                                  lineAmountIncludeTax: lineAmountIncludeTax,
+                                  taxAmount: taxAmount,
+                                  priceExcludeTax: priceExcludeTax
+                                });
+                              } else {
+                                var _s$goodsListState$for;
+
+                                if (!sourceQuantity && sourceQuantity !== 0) return good;
+                                if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
+                                if (!taxRate && taxRate !== 0) return good;
+
+                                if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && mathjs.equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
+                                  console.log('equal');
+                                  return good;
+                                } else {
+                                  needRefresh = true;
+                                  console.log('not equal');
+                                }
+
+                                var _quantity5 = format15(sourceQuantity, calculatingDigits);
+
+                                var _priceExcludeTax3 = format15(sourcePriceExcludeTax, calculatingDigits);
+
+                                var _lineAmountExcludeTax3 = format2(evaluate("".concat(_priceExcludeTax3, " * ").concat(_quantity5)));
+
+                                var _lineAmountIncludeTax3 = format2(evaluate("".concat(_lineAmountExcludeTax3, " * (1+(").concat(taxRate, "/100))")));
+
+                                var _priceIncludeTax3 = format15(evaluate("".concat(_lineAmountIncludeTax3, " / ").concat(_quantity5)), calculatingDigits);
+
+                                var _taxAmount = evaluate("".concat(_lineAmountIncludeTax3, " - ").concat(_lineAmountExcludeTax3));
+
+                                console.log((_s$goodsListState$for = s.goodsListState.form) === null || _s$goodsListState$for === void 0 ? void 0 : _s$goodsListState$for.getFieldsValue(), 'goodsListState');
+                                return _objectSpread2(_objectSpread2({}, good), {}, {
+                                  lineAmountExcludeTax: _lineAmountExcludeTax3,
+                                  lineAmountIncludeTax: _lineAmountIncludeTax3,
+                                  taxAmount: _taxAmount,
+                                  priceIncludeTax: _priceIncludeTax3
+                                });
+                              }
+                            });
+
+                            if (needRefresh) {
+                              s.goodsListState.goodsList = newGoodList;
+                            }
+                          }
+                        } catch (e) {
+                          console.error('切换税率重新计算出错', e, s.goodsListState);
+                        }
+
+                      case 5:
+                      case "end":
+                        return _context20.stop();
+                    }
+                  }
+                }, _callee20);
+              }));
+
+              return function (_x40) {
+                return _ref21.apply(this, arguments);
+              };
+            }());
+
+          case 7:
+          case "end":
+            return _context21.stop();
+        }
+      }
+    }, _callee21);
+  }));
+
+  return function onChangeSwitchTax(_x38, _x39) {
+    return _ref20.apply(this, arguments);
+  };
+}();
 
 /**
  * 删除一个货物
@@ -10250,28 +10398,7 @@ var TaxIncludedSwitch = (function () {
     return e.goodsListState.isSwitchTax;
   }, []);
   var onChange = React__default['default'].useCallback(function (e) {
-    controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                s.goodsListState = _objectSpread2(_objectSpread2({}, s.goodsListState), {}, {
-                  isTaxIncluded: e
-                });
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }())();
+    onChangeSwitchTax(controller, e);
   }, []);
   return /*#__PURE__*/React__default['default'].createElement("span", null, /*#__PURE__*/React__default['default'].createElement("label", {
     style: {
@@ -18706,9 +18833,9 @@ var onChangeItemName$1 = /*#__PURE__*/function () {
     return _ref16.apply(this, arguments);
   };
 }();
-/** 修改了 切换了税率 */
+/** 修改了含税开关 重新计算 */
 
-var onChangeSwitchTax = /*#__PURE__*/function () {
+var onChangeSwitchTax$1 = /*#__PURE__*/function () {
   var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(controller, isTaxIncluded) {
     var calculatingDigits;
     return _regeneratorRuntime().wrap(function _callee19$(_context19) {
@@ -18733,13 +18860,18 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                   while (1) {
                     switch (_context18.prev = _context18.next) {
                       case 0:
-                        if (s.goodsListState.editGood) {
-                          ktsComponentsAntdX3.message.error({
-                            content: '你正在编辑一个货物',
-                            key: '你正在编辑一个货物'
-                          });
+                        if (!s.goodsListState.editGood) {
+                          _context18.next = 3;
+                          break;
                         }
 
+                        ktsComponentsAntdX3.message.error({
+                          content: '你正在编辑一个货物',
+                          key: '你正在编辑一个货物'
+                        });
+                        return _context18.abrupt("return");
+
+                      case 3:
                         s.goodsListState.isTaxIncluded = isTaxIncluded;
 
                         try {
@@ -18824,7 +18956,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                           console.error('切换税率重新计算出错', e, s.goodsListState);
                         }
 
-                      case 3:
+                      case 5:
                       case "end":
                         return _context18.stop();
                     }
@@ -18868,7 +19000,7 @@ var TaxIncludedSwitch$1 = (function () {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              onChangeSwitchTax(controller, e);
+              onChangeSwitchTax$1(controller, e);
 
             case 1:
             case "end":

package/package.json

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

package/src/Invoice/ui/default/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -10,6 +10,7 @@ import evaluate from '../../../../../../tools/evaluate';
 import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../../tools/calculate';
 import moment from 'moment';
+import { equal } from 'mathjs';
 
 export { format2, format15 } from '../../../../../../tools/calculate';
 
@@ -531,3 +532,103 @@ export const onChangeItemCode = async (controller: InvoiceController, form: Wrap
     }
   })
 }
+
+/** 修改了含税开关 重新计算 */
+export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncluded: boolean) => {
+  const calculatingDigits = controller.state.calculatingDigits;
+
+  await controller.saveEditGood();
+  await controller.wait();
+
+  await controller.run(async s => {
+    if (s.goodsListState.editGood) {
+      message.error({
+        content: '你正在编辑一个货物',
+        key: '你正在编辑一个货物',
+      });
+
+      return ;
+    }
+
+    s.goodsListState.isTaxIncluded = isTaxIncluded;
+
+    try {
+      let needRefresh = false;
+
+      if (s.goodsListState?.goodsList && s.goodsListState.goodsList.length) {
+        const newGoodList = s.goodsListState.goodsList.map(good => {
+          const {
+            quantity: sourceQuantity,
+            priceExcludeTax: sourcePriceExcludeTax,
+            priceIncludeTax: sourcePriceIncludeTax,
+            lineAmountExcludeTax: sourceLineAmountExcludeTax,
+            lineAmountIncludeTax: sourceLineAmountIncludeTax,
+            taxRate } = good;
+          if (isTaxIncluded) {
+            if (!sourceQuantity && sourceQuantity !== 0) return good;
+            if (!sourcePriceIncludeTax && sourcePriceIncludeTax !== 0) return good;
+            if (!taxRate && taxRate !== 0) return good;
+            if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
+              console.log('equal')
+              return good
+            } else {
+              needRefresh = true;
+              console.log('not equal')
+            }
+            const quantity: any = format15(sourceQuantity, calculatingDigits);
+            const priceIncludeTax: any = format15(sourcePriceIncludeTax, calculatingDigits);
+
+            const lineAmountIncludeTax: any = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
+            const taxAmount: any = countTaxAmount(lineAmountIncludeTax, controller.state.goodsListState.deduction, taxRate as any);
+            const lineAmountExcludeTax: any = countAmountExcludeTax(lineAmountIncludeTax, taxAmount);
+            const priceExcludeTax: any = countPrice(lineAmountExcludeTax, quantity, controller.state.calculatingDigits);
+
+            return {
+              ...good,
+              lineAmountExcludeTax,
+              lineAmountIncludeTax,
+              taxAmount,
+              priceExcludeTax
+            }
+
+          } else {
+            if (!sourceQuantity && sourceQuantity !== 0) return good;
+            if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
+            if (!taxRate && taxRate !== 0) return good;
+            if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
+              console.log('equal')
+              return good
+            } else {
+              needRefresh = true;
+              console.log('not equal')
+            }
+            const quantity: any = format15(sourceQuantity, calculatingDigits);
+            const priceExcludeTax: any = format15(sourcePriceExcludeTax, calculatingDigits);
+
+            const lineAmountExcludeTax: any = format2(evaluate(`${priceExcludeTax} * ${quantity}`));
+            const lineAmountIncludeTax: any = format2(evaluate(`${lineAmountExcludeTax} * (1+(${taxRate}/100))`));
+            const priceIncludeTax: any = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), calculatingDigits);
+            const taxAmount: any = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+
+            console.log(s.goodsListState.form?.getFieldsValue(), 'goodsListState')
+
+            return {
+              ...good,
+              lineAmountExcludeTax,
+              lineAmountIncludeTax,
+              taxAmount,
+              priceIncludeTax
+            }
+          }
+
+        })
+
+        if (needRefresh) {
+          s.goodsListState.goodsList = newGoodList;
+        }
+      }
+    } catch(e) {
+      console.error('切换税率重新计算出错', e, s.goodsListState)
+    }
+  })
+}

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

@@ -2,6 +2,7 @@
 import React from 'react';
 import { Switch } from 'kts-xui';
 import Invoice from '../../../../..';
+import { onChangeSwitchTax } from '../../hook/useColumns/autoFillFn';
 
 export default () => {
 
@@ -14,7 +15,7 @@ export default () => {
     const isSwitchTax = controller.useMemo(e => e.goodsListState.isSwitchTax, []);
 
     const onChange = React.useCallback(e => {
-        controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded: e } })();
+        onChangeSwitchTax(controller, e)
     }, [])
 
     return (

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -525,7 +525,7 @@ export const onChangeItemName = async (controller: InvoiceController, form: Wrap
   })
 }
 
-/** 修改了 切换了税率 */
+/** 修改了含税开关 重新计算 */
 export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncluded: boolean) => {
   const calculatingDigits = controller.state.calculatingDigits;
 
@@ -538,6 +538,8 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
         content: '你正在编辑一个货物',
         key: '你正在编辑一个货物',
       });
+
+      return ;
     }
 
     s.goodsListState.isTaxIncluded = isTaxIncluded;