fix(version1011):整机价格

This commit is contained in:
zzs 2024-10-14 16:01:19 +08:00
parent 8b7ccb4e09
commit 69fce54a49

View File

@ -2030,9 +2030,8 @@ public class ClientUtils {
* @param idx 明细行
*/
public static void calculatePortAmt(IDataModel model, int idx) {
BigDecimal calc = BigDecimal.ZERO;
if (isFCAPriceItem(model, idx)) {
BigDecimal qty = (BigDecimal) model.getValue("yem_qty", idx);
BigDecimal calc = BigDecimal.ZERO;
Map<String, Object> logistics = queryLogistics(model, idx, "FYXM0023.6");
if (YEM.isNotEmpty(logistics)) {
DynamicObject logisticsObj = (DynamicObject) logistics.get("obj");
@ -2041,13 +2040,13 @@ public class ClientUtils {
BigDecimal price = entry.getBigDecimal("yem_price");
BigDecimal squareqty = (BigDecimal) model.getValue("yem_squareqty", idx);
if (squareqty.compareTo(BigDecimal.ZERO) > 0) {
calc = qty.multiply(price).multiply(squareqty);
calc = price.multiply(squareqty);
} else {
calc = qty.multiply(price);
calc = price;
}
}
model.setValue("yem_portamt", calc, idx);
}
model.setValue("yem_portamt", calc, idx);
}
/**
@ -2059,6 +2058,7 @@ public class ClientUtils {
* @param idx 明细行
*/
public static void calcInlandTransportationAmt(IDataModel model, int idx) {
BigDecimal calc = BigDecimal.ZERO;
if (isFCAPriceItem(model, idx)) {
BigDecimal tonsqty = (BigDecimal) model.getValue("yem_tonsqty", idx);
BigDecimal price = BigDecimal.ZERO;
@ -2070,9 +2070,9 @@ public class ClientUtils {
DynamicObjectCollection subC = entryObj.getDynamicObjectCollection("yem_subentryentity");
price = queryIntervalPrice(subC, tonsqty);
}
BigDecimal calc = price.multiply(tonsqty);
model.setValue("yem_inlandtransportation", calc, idx);
calc = price.multiply(tonsqty);
}
model.setValue("yem_inlandtransportation", calc, idx);
}
/**