kts-component-invoice-operate 3.2.76 → 3.2.78

package/dist/index.esm.js

@@ -1514,6 +1514,7 @@ var addGoodDiscount = /*#__PURE__*/(function () {
                 taxClassificationCode: good.taxClassificationCode,
                 taxRate: good.taxRate,
                 itemName: good.itemName,
+                shorthand: good.shorthand,
                 itemNameSelf: good.itemNameSelf,
                 favouredPolicyMark: good.favouredPolicyMark,
                 favouredPolicyName: good.favouredPolicyName,
@@ -14577,7 +14578,7 @@ function useMergeDetails() {
     }, _callee);
   })), [controller]);
   var onClickAuto = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var group, i, _selectedGoodIndex;
+    var goodsList, isTaxIncluded, group, i, _selectedGoodIndex;
 
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
@@ -14591,27 +14592,29 @@ function useMergeDetails() {
             return controller.wait();
 
           case 4:
-            group = groupBy(controller.state.goodsListState.goodsList);
+            goodsList = controller.state.goodsListState.goodsList;
+            isTaxIncluded = controller.state.goodsListState.isTaxIncluded;
+            group = groupBy(goodsList, isTaxIncluded);
             i = 0;
 
-          case 6:
+          case 8:
             if (!(i < group.length)) {
-              _context2.next = 13;
+              _context2.next = 15;
               break;
             }
 
             _selectedGoodIndex = group[i].map(function (e) {
               return e.$index;
             });
-            _context2.next = 10;
+            _context2.next = 12;
             return controller.mergeDetails(_selectedGoodIndex);
 
-          case 10:
+          case 12:
             i++;
-            _context2.next = 6;
+            _context2.next = 8;
             break;
 
-          case 13:
+          case 15:
           case "end":
             return _context2.stop();
         }
@@ -14645,20 +14648,26 @@ function useMergeDetails() {
   };
 } // 根据"商品编码"" 和 "单价" 分组
 
-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);
-  // }
+function groupBy(arr, isTaxIncluded) {
+  var grouped = {};
 
-  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);
+  var _loop = function _loop(_i) {
+    var item = arr[_i];
+
+    if (!item.itemCode) {
+      i = _i;
+      return "continue";
+    }
+
+    var key = function () {
+      if (isTaxIncluded) {
+        i = _i;
+        return "".concat(item.itemCode).concat(Math.floor((item.priceIncludeTax || 0) * 100) / 100);
+      } else {
+        i = _i;
+        return "".concat(item.itemCode).concat(Math.floor((item.priceExcludeTax || 0) * 100) / 100);
+      }
+    }();
 
     if (!grouped[key]) {
       grouped[key] = [];
@@ -14667,9 +14676,17 @@ function groupBy(arr) {
     grouped[key].push(item);
 
     if (item.lineAttribute === LineAttributeType$1.被折扣行) {
-      grouped[key].push(arr[i + 1]);
-      i++;
+      grouped[key].push(arr[_i + 1]);
+      _i++;
     }
+
+    i = _i;
+  };
+
+  for (var i = 0; i < arr.length; i++) {
+    var _ret = _loop(i);
+
+    if (_ret === "continue") continue;
   }
 
   return Object.values(grouped);

package/dist/index.js

@@ -1524,6 +1524,7 @@ var addGoodDiscount = /*#__PURE__*/(function () {
                 taxClassificationCode: good.taxClassificationCode,
                 taxRate: good.taxRate,
                 itemName: good.itemName,
+                shorthand: good.shorthand,
                 itemNameSelf: good.itemNameSelf,
                 favouredPolicyMark: good.favouredPolicyMark,
                 favouredPolicyName: good.favouredPolicyName,
@@ -14587,7 +14588,7 @@ function useMergeDetails() {
     }, _callee);
   })), [controller]);
   var onClickAuto = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var group, i, _selectedGoodIndex;
+    var goodsList, isTaxIncluded, group, i, _selectedGoodIndex;
 
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
@@ -14601,27 +14602,29 @@ function useMergeDetails() {
             return controller.wait();
 
           case 4:
-            group = groupBy(controller.state.goodsListState.goodsList);
+            goodsList = controller.state.goodsListState.goodsList;
+            isTaxIncluded = controller.state.goodsListState.isTaxIncluded;
+            group = groupBy(goodsList, isTaxIncluded);
             i = 0;
 
-          case 6:
+          case 8:
             if (!(i < group.length)) {
-              _context2.next = 13;
+              _context2.next = 15;
               break;
             }
 
             _selectedGoodIndex = group[i].map(function (e) {
               return e.$index;
             });
-            _context2.next = 10;
+            _context2.next = 12;
             return controller.mergeDetails(_selectedGoodIndex);
 
-          case 10:
+          case 12:
             i++;
-            _context2.next = 6;
+            _context2.next = 8;
             break;
 
-          case 13:
+          case 15:
           case "end":
             return _context2.stop();
         }
@@ -14655,20 +14658,26 @@ function useMergeDetails() {
   };
 } // 根据"商品编码"" 和 "单价" 分组
 
-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);
-  // }
+function groupBy(arr, isTaxIncluded) {
+  var grouped = {};
 
-  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);
+  var _loop = function _loop(_i) {
+    var item = arr[_i];
+
+    if (!item.itemCode) {
+      i = _i;
+      return "continue";
+    }
+
+    var key = function () {
+      if (isTaxIncluded) {
+        i = _i;
+        return "".concat(item.itemCode).concat(Math.floor((item.priceIncludeTax || 0) * 100) / 100);
+      } else {
+        i = _i;
+        return "".concat(item.itemCode).concat(Math.floor((item.priceExcludeTax || 0) * 100) / 100);
+      }
+    }();
 
     if (!grouped[key]) {
       grouped[key] = [];
@@ -14677,9 +14686,17 @@ function groupBy(arr) {
     grouped[key].push(item);
 
     if (item.lineAttribute === LineAttributeType$1.被折扣行) {
-      grouped[key].push(arr[i + 1]);
-      i++;
+      grouped[key].push(arr[_i + 1]);
+      _i++;
     }
+
+    i = _i;
+  };
+
+  for (var i = 0; i < arr.length; i++) {
+    var _ret = _loop(i);
+
+    if (_ret === "continue") continue;
   }
 
   return Object.values(grouped);

package/package.json

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

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

@@ -101,7 +101,7 @@ export default async (state: InvoiceControllerState, options?: IOptions) => {
       .done()
       .toNumber();
 
-      
+
     good.discountGroup = discountGroup;
     good.lineAttribute = LineAttributeType.被折扣行;
     goodsList.splice(i + 1, 0, {
@@ -110,6 +110,7 @@ export default async (state: InvoiceControllerState, options?: IOptions) => {
       taxClassificationCode: good.taxClassificationCode,
       taxRate: good.taxRate,
       itemName: good.itemName,
+      shorthand: good.shorthand,
       itemNameSelf: good.itemNameSelf,
       favouredPolicyMark: good.favouredPolicyMark,
       favouredPolicyName: good.favouredPolicyName,

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

@@ -23,7 +23,9 @@ export default function useMergeDetails() {
     const onClickAuto = React.useCallback(async () => {
         await controller.saveEditGood();
         await controller.wait();
-        const group = groupBy(controller.state.goodsListState.goodsList);
+        const goodsList = controller.state.goodsListState.goodsList;
+        const isTaxIncluded = controller.state.goodsListState.isTaxIncluded;
+        const group = groupBy(goodsList, isTaxIncluded);
         for (let i = 0; i < group.length; i++) {
             const selectedGoodIndex = group[i].map(e => e.$index);
             await controller.mergeDetails(selectedGoodIndex);
@@ -63,23 +65,24 @@ export default function useMergeDetails() {
 }
 
 // 根据"商品编码"" 和 "单价" 分组
-function groupBy(arr: IGood[]): IGood[][] {
+function groupBy(arr: IGood[], isTaxIncluded: boolean): 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}`;
+        
+        const key = (() => {
+            if (isTaxIncluded) {
+                return `${item.itemCode}${Math.floor((item.priceIncludeTax || 0) * 100) / 100}`;
+            } else {
+                return `${item.itemCode}${Math.floor((item.priceExcludeTax || 0) * 100) / 100}`;
+            }
+        })()
+
         if (!grouped[key]) {
             grouped[key] = [];
         }
+
         grouped[key].push(item);
         if (item.lineAttribute === LineAttributeType.被折扣行) {
             grouped[key].push(arr[i + 1]); i++;