@unizhen/ui 0.1.144 → 0.1.145

package/lib/components/bom/quantity.d.ts

@@ -1,4 +1,4 @@
 import { BomRow } from './interface';
 export declare const calculateRequiredQuantity: (row: BomRow) => number | null;
-export declare const calculatePlannedQuantity: (quantity: BomRow["quantity"], requiredQuantity: number | null, firstLevelPlannedQuantity: unknown) => number | null;
-export declare const syncDescendantPlannedQuantities: (rows: BomRow[], firstLevelPlannedQuantity: unknown) => void;
+export declare const calculatePlannedQuantity: (quantity: BomRow["quantity"], lossRateValue: BomRow["lossRate"], parentPlannedQuantity: unknown) => number | null;
+export declare const syncDescendantPlannedQuantities: (rows: BomRow[], parentPlannedQuantity: unknown) => void;

package/lib/ui.js

@@ -2766,13 +2766,13 @@ var Xr = (e, t) => e.map((e, n) => {
 	let t = Number(e.quantity), n = ei(e.lossRate);
 	return !Number.isFinite(t) || n === null || n < 0 ? null : Math.ceil(t * (1 + n / 100));
 }, ni = (e, t, n) => {
-	if (t === null || n == null || n === "") return null;
-	let r = Number(e), i = Number(n);
-	return Number.isFinite(r) && Number.isFinite(i) ? r * i + (t - r) : null;
+	let r = ei(t);
+	if (r === null || r < 0 || n == null || n === "") return null;
+	let i = Number(e), a = Number(n);
+	return Number.isFinite(i) && Number.isFinite(a) ? Math.ceil(i * a * (1 + r / 100)) : null;
 }, ri = (e, t) => {
 	e.forEach((e) => {
-		let n = ti(e);
-		e.required_quantity = n, e.counts = ni(e.quantity, n, t), Array.isArray(e.children) && ri(e.children, t);
+		e.required_quantity = ti(e), e.counts = ni(e.quantity, e.lossRate, t), Array.isArray(e.children) && ri(e.children, e.counts);
 	});
 }, ii = (e) => e.key ?? e.code, ai = () => globalThis.crypto?.randomUUID?.() ?? `bom-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`, oi = (e, t, n) => {
 	let r = e.findIndex((e) => ii(e) === t);
@@ -3462,7 +3462,7 @@ var Di = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 			row: e,
 			index: t
 		})).sort((e, t) => (typeof e.row.sort_index == "number" && Number.isFinite(e.row.sort_index) ? e.row.sort_index : Number.isFinite(e.row.sort) ? e.row.sort : e.index) - (typeof t.row.sort_index == "number" && Number.isFinite(t.row.sort_index) ? t.row.sort_index : Number.isFinite(t.row.sort) ? t.row.sort : t.index)).map(({ row: e }, i) => {
-			let a = l(e, i, n), o = e.children, s = ti(e), d = t === 1 ? c() : ni(e.quantity, s, r);
+			let a = l(e, i, n), o = e.children, s = ti(e), d = t === 1 ? c() : ni(e.quantity, e.lossRate, r);
 			return {
 				...e,
 				required_quantity: s,
@@ -3472,7 +3472,7 @@ var Di = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 				code: a,
 				sort: i,
 				sort_index: i,
-				...Array.isArray(o) ? { children: u(o, t + 1, a, t === 1 ? d : r) } : {}
+				...Array.isArray(o) ? { children: u(o, t + 1, a, d) } : {}
 			};
 		}), d = w(u(e.value)), m = w([]), h = !1, g = 1, _ = ii, b = (e, t = 1, n) => {
 			e.forEach((e, r) => {
@@ -7875,7 +7875,7 @@ function oc(e, t, n) {
 }
 //#endregion
 //#region package.json
-var sc = "0.1.144", cc;
+var sc = "0.1.145", cc;
 async function lc() {
 	let e = await fetch(`${window.location.protocol}//${window.location.host}`, {
 		method: "HEAD",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unizhen/ui",
-  "version": "0.1.144",
+  "version": "0.1.145",
   "author": {
     "name": "Donovan"
   },