violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(version1011):整机价格

Browse Source
This commit is contained in:
zzs 2024-10-14 16:01:19 +08:00
parent 8b7ccb4e09
commit 69fce54a49
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
View File

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