kts-component-invoice-operate 3.2.97 → 3.2.98

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

@@ -1,26 +1,26 @@
-
-import IGood from "../InvoiceControllerState/GoodsListState/IGood";
-
-/**
- * 计算搜索商品
- * @param goodsList 被搜索列表
- * @param search 搜索条件
- * @param isTaxIncluded 是否含税
- * @returns
- */
-export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
-    if (!search) return goodsList;
-    return goodsList.filter(e => {
-        if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
-            return true;
-        } else if ((e.itemCode?.indexOf(search) ?? -1) >= 0) {
-          return true
-        } else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
-            return true
-        } else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
-            return true
-        } else {
-            return false;
-        }
-    })
-}
+
+import IGood from "../InvoiceControllerState/GoodsListState/IGood";
+
+/**
+ * 计算搜索商品
+ * @param goodsList 被搜索列表
+ * @param search 搜索条件
+ * @param isTaxIncluded 是否含税
+ * @returns
+ */
+export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
+    if (!search) return goodsList;
+    return goodsList.filter(e => {
+        if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
+            return true;
+        } else if ((e.itemCode?.indexOf(search) ?? -1) >= 0) {
+          return true
+        } else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
+            return true
+        } else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
+            return true
+        } else {
+            return false;
+        }
+    })
+}

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

@@ -1,79 +1,79 @@
-import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../ui/default/GoodsList/hook/useColumns/autoFillFn';
-import { InvoiceControllerState, IGood } from '../';
-import evaluate from '../../tools/evaluate';
-import { countAmountIncludeTax } from '../../tools/calculate';
-
-/**
- * 删除一个货物
- */
-export default async (s: InvoiceControllerState, record: any, controller:any) => {
-    Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
-
-    // 没用 被编辑的货物 和 form 就退出
-    if (!s.goodsListState.editGood || !s.goodsListState.form) return;
-
-    // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
-    record.quantity = undefined;
-    record.lineAmountExcludeTax = undefined;
-    record.lineAmountIncludeTax = undefined;
-
-    // 中间数据
-    const between: any = {...record };
-
-    between.itemCode = record.itemCode;
-    between.shorthand = record.shorthand;
-    between.itemName = record.itemName;
-    between.itemNameOther = record.itemName;
-    between.itemModelName = record.itemModelName;
-    between.unit = record.unit;
-    between.quantity = record.quantity;
-    between.priceIncludeTax = record.priceIncludeTax;
-    between.lineAmountIncludeTax = record.lineAmountIncludeTax;
-    between.lineAmountExcludeTax = record.lineAmountExcludeTax;
-    between.taxRate = record.taxRate;
-    between.taxAmount = record.taxAmount;
-
-    // 设置编辑货物
-    const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
-
-    if (editGood.taxRate) {
-        editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
-    }
-
-    if (`${editGood.priceIncludeTax}` === '0') {
-        editGood.priceIncludeTax = undefined;
-        editGood.priceExcludeTax = undefined;
-    } else {
-        editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
-    }
-
-    if (editGood.quantity && editGood.priceIncludeTax) {
-        editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
-    }
-
-    // 导入FORM里
-    if (s.goodsListState.isMyShow) {
-        s.goodsListState.form.setFieldsValue({
-            ...editGood,
-            itemName: editGood.itemNameSelf,
-            itemModelName: editGood.itemModelNameSelf,
-        });
-    } else {
-        s.goodsListState.form.setFieldsValue({
-            ...editGood,
-        });
-    }
-
-    s.goodsListState.importGoods.isVisibleDrawer = false;
-    s.goodsListState.isTaxIncluded
-        ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
-        : await updateUnitPriceTax(controller, s.goodsListState.form, record)
-}
-
-/** 货物单价，不含税 */
-const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) => {
-    if ((!s.taxRate && s.taxRate !== 0) || (!record.priceIncludeTax && record.priceIncludeTax !== 0)) return;
-
-    // 单价(含税)/(1+税率) = 单价(不含税)
-    return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
-};
+import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../ui/default/GoodsList/hook/useColumns/autoFillFn';
+import { InvoiceControllerState, IGood } from '../';
+import evaluate from '../../tools/evaluate';
+import { countAmountIncludeTax } from '../../tools/calculate';
+
+/**
+ * 删除一个货物
+ */
+export default async (s: InvoiceControllerState, record: any, controller:any) => {
+    Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
+
+    // 没用 被编辑的货物 和 form 就退出
+    if (!s.goodsListState.editGood || !s.goodsListState.form) return;
+
+    // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+    record.quantity = undefined;
+    record.lineAmountExcludeTax = undefined;
+    record.lineAmountIncludeTax = undefined;
+
+    // 中间数据
+    const between: any = {...record };
+
+    between.itemCode = record.itemCode;
+    between.shorthand = record.shorthand;
+    between.itemName = record.itemName;
+    between.itemNameOther = record.itemName;
+    between.itemModelName = record.itemModelName;
+    between.unit = record.unit;
+    between.quantity = record.quantity;
+    between.priceIncludeTax = record.priceIncludeTax;
+    between.lineAmountIncludeTax = record.lineAmountIncludeTax;
+    between.lineAmountExcludeTax = record.lineAmountExcludeTax;
+    between.taxRate = record.taxRate;
+    between.taxAmount = record.taxAmount;
+
+    // 设置编辑货物
+    const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
+
+    if (editGood.taxRate) {
+        editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
+    }
+
+    if (`${editGood.priceIncludeTax}` === '0') {
+        editGood.priceIncludeTax = undefined;
+        editGood.priceExcludeTax = undefined;
+    } else {
+        editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
+    }
+
+    if (editGood.quantity && editGood.priceIncludeTax) {
+        editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
+    }
+
+    // 导入FORM里
+    if (s.goodsListState.isMyShow) {
+        s.goodsListState.form.setFieldsValue({
+            ...editGood,
+            itemName: editGood.itemNameSelf,
+            itemModelName: editGood.itemModelNameSelf,
+        });
+    } else {
+        s.goodsListState.form.setFieldsValue({
+            ...editGood,
+        });
+    }
+
+    s.goodsListState.importGoods.isVisibleDrawer = false;
+    s.goodsListState.isTaxIncluded
+        ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+        : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+}
+
+/** 货物单价，不含税 */
+const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) => {
+    if ((!s.taxRate && s.taxRate !== 0) || (!record.priceIncludeTax && record.priceIncludeTax !== 0)) return;
+
+    // 单价(含税)/(1+税率) = 单价(不含税)
+    return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
+};

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

@@ -1,166 +1,166 @@
-
-import { message } from 'kts-xui';
-import { chain, bignumber } from 'mathjs';
-import idGenerator from '../../tools/idGenerator';
-import { IGood, InvoiceControllerState, LineAttributeType } from '..';
-import { format15 } from '../../tools/calculate';
-
-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 => selectedGoodIndex.indexOf(e.$index) >= 0);
-    if (goodsList.length < 2) return;
-
-    try {
-        // 创建合并后的商品对象
-        let sum: IGood = { $index: idGenerator(), lineAttribute: LineAttributeType.正常 }
-
-        // 存在税率不一样的明细，不能合并
-        await checkTaxTate(goodsList);
-
-        // 填充行明细信息
-        sum = await fillingInformationGood(goodsList, sum);
-
-        // 合并数量
-        sum.quantity = await mergeQuantity(goodsList);
-
-        // 合并金额(不含税)
-        sum.lineAmountExcludeTax = await mergeLineAmountExcludeTax(goodsList);
-
-        // 合并金额(含税)
-        sum.lineAmountIncludeTax = await mergeLineAmountIncludeTax(goodsList);
-
-        // 计算单价(不含税)
-        sum.priceExcludeTax = await calculatePriceExcludeTax(sum, state.calculatingDigits);
-
-        // 计算单价(含税)
-        sum.priceIncludeTax = await calculatePriceIncludeTax(sum, state.calculatingDigits);
-
-        // 计算税额
-        sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
-
-        // 校验数据 是否数量和金额是否同号
-        await checkSameNumber(sum);
-
-        const p = state.goodsListState.goodsList.indexOf(goodsList[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();
-        state.goodsListState.goodsList.forEach(e => { state.goodsListState.goodsMap.set(e.$index, e) });
-        state.goodsListState.selectedGoodIndex = [];
-    } catch (error: any) {
-        showError(error)
-    }
-}
-
-/** 计算单价(含税) */
-async function calculatePriceIncludeTax(sum: IGood, calculatingDigits?: number) {
-    if (!sum.quantity) return undefined;
-    const value = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber()
-    return format15(value, calculatingDigits) || undefined;
-}
-
-/** 计算单价(不含税) */
-async function calculatePriceExcludeTax(sum: IGood, calculatingDigits?: number) {
-    if (!sum.quantity) return undefined;
-    const value = format15(chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
-    return format15(value, calculatingDigits) || undefined;;
-}
-
-/** 合并金额(含税) */
-async function mergeLineAmountIncludeTax(goodsList: IGood[]) {
-    let sum = chain(bignumber(0));
-    goodsList.forEach(e => {
-        sum = sum.add(bignumber(e.lineAmountIncludeTax || 0))
-    })
-    return sum.done().toNumber();
-}
-
-/** 合并金额(不含税) */
-async function mergeLineAmountExcludeTax(goodsList: IGood[]) {
-    let sum = chain(bignumber(0));
-    goodsList.forEach(e => {
-        sum = sum.add(bignumber(e.lineAmountExcludeTax || 0))
-    })
-    return sum.done().toNumber();
-}
-
-/** 合并数量 */
-async function mergeQuantity(goodsList: IGood[]) {
-    let sum = chain(bignumber(0));
-    goodsList.forEach(e => {
-        sum = sum.add(bignumber(e.quantity || 0))
-    })
-    return sum.done().toNumber() || undefined;
-}
-
-/** 填充行明细信息 */
-async function fillingInformationGood(goodsList: IGood[], sum: IGood) {
-    sum = { ...sum };
-
-    const goods = goodsList[findMaxIndex(goodsList.map(e => e.lineAmountIncludeTax || 0))]
-
-    return { ...goods, lineAttribute: LineAttributeType.正常 };
-}
-
-/** 存在税率不一样的明细，不能合并 */
-async function checkTaxTate(goodsList: IGood[]) {
-    const tax = goodsList[0].taxRate;
-    for (let i = 1; i < goodsList.length; i++) {
-        if (tax !== goodsList[i].taxRate) {
-            throw new Error('存在税率不一样的明细，不能合并');
-        }
-    }
-}
-
-/** 校验数据 是否数量和金额是否同号 */
-async function checkSameNumber(good: IGood) {
-    if (!good.quantity) return;
-
-    if (!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0) {
-        const content = '金额不能为空';
-        message.error({ content, key: content });
-        throw new Error(content);
-    }
-
-    if (
-        good.quantity >= 0 && good.lineAmountExcludeTax >= 0 ||
-        good.lineAmountExcludeTax === 0 ||
-        good.quantity < 0 && good.lineAmountExcludeTax < 0
-    ) {
-        return;
-    } else {
-        const content = '合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。';
-        message.error({ content, key: content });
-        throw new Error(content);
-    }
-}
-
-/** 显示错误信息 */
-function showError(error: Error) {
-    console.log(error);
-    message.error({ content: error.message, key: error.message });
-}
-
-/** 查询最大数据的索引 */
-function findMaxIndex(arr: number[]): number {
-    if (arr.length === 0) {
-        throw new Error("数组为空");
-    }
-
-    let maxIndex = 0;
-    let maxValue = arr[0];
-
-    for (let i = arr.length - 1; i >= 0; i--) {
-        if (arr[i] > maxValue) {
-            maxValue = arr[i];
-            maxIndex = i;
-        }
-    }
-
-    return maxIndex;
+
+import { message } from 'kts-xui';
+import { chain, bignumber } from 'mathjs';
+import idGenerator from '../../tools/idGenerator';
+import { IGood, InvoiceControllerState, LineAttributeType } from '..';
+import { format15 } from '../../tools/calculate';
+
+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 => selectedGoodIndex.indexOf(e.$index) >= 0);
+    if (goodsList.length < 2) return;
+
+    try {
+        // 创建合并后的商品对象
+        let sum: IGood = { $index: idGenerator(), lineAttribute: LineAttributeType.正常 }
+
+        // 存在税率不一样的明细，不能合并
+        await checkTaxTate(goodsList);
+
+        // 填充行明细信息
+        sum = await fillingInformationGood(goodsList, sum);
+
+        // 合并数量
+        sum.quantity = await mergeQuantity(goodsList);
+
+        // 合并金额(不含税)
+        sum.lineAmountExcludeTax = await mergeLineAmountExcludeTax(goodsList);
+
+        // 合并金额(含税)
+        sum.lineAmountIncludeTax = await mergeLineAmountIncludeTax(goodsList);
+
+        // 计算单价(不含税)
+        sum.priceExcludeTax = await calculatePriceExcludeTax(sum, state.calculatingDigits);
+
+        // 计算单价(含税)
+        sum.priceIncludeTax = await calculatePriceIncludeTax(sum, state.calculatingDigits);
+
+        // 计算税额
+        sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
+
+        // 校验数据 是否数量和金额是否同号
+        await checkSameNumber(sum);
+
+        const p = state.goodsListState.goodsList.indexOf(goodsList[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();
+        state.goodsListState.goodsList.forEach(e => { state.goodsListState.goodsMap.set(e.$index, e) });
+        state.goodsListState.selectedGoodIndex = [];
+    } catch (error: any) {
+        showError(error)
+    }
+}
+
+/** 计算单价(含税) */
+async function calculatePriceIncludeTax(sum: IGood, calculatingDigits?: number) {
+    if (!sum.quantity) return undefined;
+    const value = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber()
+    return format15(value, calculatingDigits) || undefined;
+}
+
+/** 计算单价(不含税) */
+async function calculatePriceExcludeTax(sum: IGood, calculatingDigits?: number) {
+    if (!sum.quantity) return undefined;
+    const value = format15(chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
+    return format15(value, calculatingDigits) || undefined;;
+}
+
+/** 合并金额(含税) */
+async function mergeLineAmountIncludeTax(goodsList: IGood[]) {
+    let sum = chain(bignumber(0));
+    goodsList.forEach(e => {
+        sum = sum.add(bignumber(e.lineAmountIncludeTax || 0))
+    })
+    return sum.done().toNumber();
+}
+
+/** 合并金额(不含税) */
+async function mergeLineAmountExcludeTax(goodsList: IGood[]) {
+    let sum = chain(bignumber(0));
+    goodsList.forEach(e => {
+        sum = sum.add(bignumber(e.lineAmountExcludeTax || 0))
+    })
+    return sum.done().toNumber();
+}
+
+/** 合并数量 */
+async function mergeQuantity(goodsList: IGood[]) {
+    let sum = chain(bignumber(0));
+    goodsList.forEach(e => {
+        sum = sum.add(bignumber(e.quantity || 0))
+    })
+    return sum.done().toNumber() || undefined;
+}
+
+/** 填充行明细信息 */
+async function fillingInformationGood(goodsList: IGood[], sum: IGood) {
+    sum = { ...sum };
+
+    const goods = goodsList[findMaxIndex(goodsList.map(e => e.lineAmountIncludeTax || 0))]
+
+    return { ...goods, lineAttribute: LineAttributeType.正常 };
+}
+
+/** 存在税率不一样的明细，不能合并 */
+async function checkTaxTate(goodsList: IGood[]) {
+    const tax = goodsList[0].taxRate;
+    for (let i = 1; i < goodsList.length; i++) {
+        if (tax !== goodsList[i].taxRate) {
+            throw new Error('存在税率不一样的明细，不能合并');
+        }
+    }
+}
+
+/** 校验数据 是否数量和金额是否同号 */
+async function checkSameNumber(good: IGood) {
+    if (!good.quantity) return;
+
+    if (!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0) {
+        const content = '金额不能为空';
+        message.error({ content, key: content });
+        throw new Error(content);
+    }
+
+    if (
+        good.quantity >= 0 && good.lineAmountExcludeTax >= 0 ||
+        good.lineAmountExcludeTax === 0 ||
+        good.quantity < 0 && good.lineAmountExcludeTax < 0
+    ) {
+        return;
+    } else {
+        const content = '合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。';
+        message.error({ content, key: content });
+        throw new Error(content);
+    }
+}
+
+/** 显示错误信息 */
+function showError(error: Error) {
+    console.log(error);
+    message.error({ content: error.message, key: error.message });
+}
+
+/** 查询最大数据的索引 */
+function findMaxIndex(arr: number[]): number {
+    if (arr.length === 0) {
+        throw new Error("数组为空");
+    }
+
+    let maxIndex = 0;
+    let maxValue = arr[0];
+
+    for (let i = arr.length - 1; i >= 0; i--) {
+        if (arr[i] > maxValue) {
+            maxValue = arr[i];
+            maxIndex = i;
+        }
+    }
+
+    return maxIndex;
 }

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

@@ -1,29 +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.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber();
-            sum.quantity = good.quantity;
-            if (sum.quantity) {
-                sum.priceExcludeTax = chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
-                sum.priceIncludeTax = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
-            }
-            goodsList.splice(i, 2, sum);
-        }
-    }
-    state.goodsListState.goodsList = goodsList;
+
+
+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.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber();
+            sum.quantity = good.quantity;
+            if (sum.quantity) {
+                sum.priceExcludeTax = chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+                sum.priceIncludeTax = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+            }
+            goodsList.splice(i, 2, sum);
+        }
+    }
+    state.goodsListState.goodsList = goodsList;
 }

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

@@ -1,24 +1,24 @@
-import { InvoiceControllerState } from '../';
-
-/**
- * 保存正在编辑的货物
- */
-export default async (state: InvoiceControllerState) => {
-
-  const editGood = state.goodsListState.editGood;
-  const form = state.goodsListState.form;
-  
-  if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
-  if ((await validateFields(form)).err) return;
-
-  state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>
-    e.$index === editGood.$index ? { ...e, ...editGood } : e,
-  );
-  state.goodsListState.editGood = undefined;
-};
-
-const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
-  form.validateFields(async (err: any, values: any) => {
-    resolve({ err, values });
-  });
-});
+import { InvoiceControllerState } from '../';
+
+/**
+ * 保存正在编辑的货物
+ */
+export default async (state: InvoiceControllerState) => {
+
+  const editGood = state.goodsListState.editGood;
+  const form = state.goodsListState.form;
+  
+  if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
+  if ((await validateFields(form)).err) return;
+
+  state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>
+    e.$index === editGood.$index ? { ...e, ...editGood } : e,
+  );
+  state.goodsListState.editGood = undefined;
+};
+
+const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
+  form.validateFields(async (err: any, values: any) => {
+    resolve({ err, values });
+  });
+});