kts-component-invoice-operate 3.2.45 → 3.2.47

package/dist/index.esm.js

@@ -2073,7 +2073,7 @@ function _checkSameNumber() {
             return _context9.abrupt("return");
 
           case 2:
-            if (good.lineAmountExcludeTax) {
+            if (!(!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0)) {
               _context9.next = 5;
               break;
             }
@@ -2082,7 +2082,7 @@ function _checkSameNumber() {
             throw new Error('金额不能为空');
 
           case 5:
-            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
+            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.lineAmountExcludeTax === 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
               _context9.next = 9;
               break;
             }
@@ -2090,8 +2090,8 @@ function _checkSameNumber() {
             return _context9.abrupt("return");
 
           case 9:
-            message$1.error('金额和数量需要同号');
-            throw new Error('金额和数量需要同号');
+            message$1.error('合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。');
+            throw new Error('合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。');
 
           case 11:
           case "end":

package/dist/index.js

@@ -2083,7 +2083,7 @@ function _checkSameNumber() {
             return _context9.abrupt("return");
 
           case 2:
-            if (good.lineAmountExcludeTax) {
+            if (!(!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0)) {
               _context9.next = 5;
               break;
             }
@@ -2092,7 +2092,7 @@ function _checkSameNumber() {
             throw new Error('金额不能为空');
 
           case 5:
-            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
+            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.lineAmountExcludeTax === 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
               _context9.next = 9;
               break;
             }
@@ -2100,8 +2100,8 @@ function _checkSameNumber() {
             return _context9.abrupt("return");
 
           case 9:
-            ktsXui.message.error('金额和数量需要同号');
-            throw new Error('金额和数量需要同号');
+            ktsXui.message.error('合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。');
+            throw new Error('合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。');
 
           case 11:
           case "end":

package/package.json

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

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

@@ -119,16 +119,20 @@ async function checkTaxTate(goodsList: IGood[]) {
 async function checkSameNumber(good: IGood) {
     if (!good.quantity) return;
 
-    if (!good.lineAmountExcludeTax) {
+    if (!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0) {
         message.error('金额不能为空');
         throw new Error('金额不能为空');
     }
 
-    if (good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0) {
+    if (
+        good.quantity >= 0 && good.lineAmountExcludeTax >= 0 ||
+        good.lineAmountExcludeTax === 0 ||
+        good.quantity < 0 && good.lineAmountExcludeTax < 0
+    ) {
         return;
-    }else{
-        message.error('金额和数量需要同号');
-        throw new Error('金额和数量需要同号');
+    } else {
+        message.error('合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。');
+        throw new Error('合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。');
     }
 }