diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
index 2729f754f..201ec8052 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
@@ -598,6 +598,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             env.put("d", exprItem.getAdditionalWeight());
                             profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString());
                         }
+                        // 柜数
+                        else if ("5".equals(quoteItem.getCalcType())) {
+                            BigDecimal cabinetNumber = BigDecimal.ZERO;
+                            if (waybill.getWaybillOther() != null && waybill.getWaybillOther().getCabinetNumber() != null) {
+                                cabinetNumber = new BigDecimal(waybill.getWaybillOther().getCabinetNumber().toString());
+                            }
+                            calcExprStr = calcExp.replaceAll("w", cabinetNumber.stripTrailingZeros().toPlainString())
+                                    .replaceAll("s", exprItem.getInitialWeight().toString())
+                                    .replaceAll("d", exprItem.getAdditionalWeight().toString());
+                            log.info("按柜数:计算公式:" + calcExprStr + ",柜数:" + cabinetNumber.stripTrailingZeros().toPlainString());
+                            Map<String, Object> env = new HashMap<>();
+                            env.put("w", cabinetNumber);
+                            env.put("s", exprItem.getInitialWeight());
+                            env.put("d", exprItem.getAdditionalWeight());
+                            profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp, env).toString());
+                        }
 
                         // 参与分成人员计算
                         if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
@@ -738,6 +754,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString());
 
                         }
+                        // 柜数
+                        else if ("5".equals(quoteItem.getCalcType())) {
+                            BigDecimal cabinetNumber = BigDecimal.ZERO;
+                            if (waybill.getWaybillOther() != null && waybill.getWaybillOther().getCabinetNumber() != null) {
+                                cabinetNumber = new BigDecimal(waybill.getWaybillOther().getCabinetNumber().toString());
+                            }
+                            calcExprStr = calcExp.replaceAll("w", cabinetNumber.stripTrailingZeros().toPlainString())
+                                    .replaceAll("s", exprItem.getInitialWeight().toString())
+                                    .replaceAll("d", exprItem.getAdditionalWeight().toString());
+                            log.info("按柜数:计算公式:" + calcExprStr + ",柜数:" + cabinetNumber.stripTrailingZeros().toPlainString());
+                            Map<String, Object> env = new HashMap<>();
+                            env.put("w", cabinetNumber);
+                            env.put("s", exprItem.getInitialWeight());
+                            env.put("d", exprItem.getAdditionalWeight());
+                            profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp, env).toString());
+                        }
 
                         // 插入参与分成人员
                         // 插入提成
@@ -888,6 +920,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             env.put("d", exprItem.getAdditionalWeight());
                             profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString());
                         }
+                        // 柜数
+                        else if ("5".equals(quoteItem.getCalcType())) {
+                            BigDecimal cabinetNumber = BigDecimal.ZERO;
+                            if (waybill.getWaybillOther() != null && waybill.getWaybillOther().getCabinetNumber() != null) {
+                                cabinetNumber = new BigDecimal(waybill.getWaybillOther().getCabinetNumber().toString());
+                            }
+                            calcExprStr = calcExp.replaceAll("w", cabinetNumber.stripTrailingZeros().toPlainString())
+                                    .replaceAll("s", exprItem.getInitialWeight().toString())
+                                    .replaceAll("d", exprItem.getAdditionalWeight().toString());
+                            log.info("按柜数:计算公式:" + calcExprStr + ",柜数:" + cabinetNumber.stripTrailingZeros().toPlainString());
+                            Map<String, Object> env = new HashMap<>();
+                            env.put("w", cabinetNumber);
+                            env.put("s", exprItem.getInitialWeight());
+                            env.put("d", exprItem.getAdditionalWeight());
+                            profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp, env).toString());
+                        }
 
                         // 插入提成
                         if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
@@ -1044,6 +1092,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             env.put("d", exprItem.getAdditionalWeight());
                             profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString());
                         }
+                        // 柜数
+                        else if ("5".equals(quoteItem.getCalcType())) {
+                            BigDecimal cabinetNumber = BigDecimal.ZERO;
+                            if (waybill.getWaybillOther() != null && waybill.getWaybillOther().getCabinetNumber() != null) {
+                                cabinetNumber = new BigDecimal(waybill.getWaybillOther().getCabinetNumber().toString());
+                            }
+                            calcExprStr = calcExp.replaceAll("w", cabinetNumber.stripTrailingZeros().toPlainString())
+                                    .replaceAll("s", exprItem.getInitialWeight().toString())
+                                    .replaceAll("d", exprItem.getAdditionalWeight().toString());
+                            log.info("按柜数:计算公式:" + calcExprStr + ",柜数:" + cabinetNumber.stripTrailingZeros().toPlainString());
+                            Map<String, Object> env = new HashMap<>();
+                            env.put("w", cabinetNumber);
+                            env.put("s", exprItem.getInitialWeight());
+                            env.put("d", exprItem.getAdditionalWeight());
+                            profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp, env).toString());
+                        }
 
                         // 插入提成
                         if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
@@ -1202,6 +1266,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString());
 
                         }
+                        // 柜数
+                        else if ("5".equals(quoteItem.getCalcType())) {
+                            BigDecimal cabinetNumber = BigDecimal.ZERO;
+                            if (waybill.getWaybillOther() != null && waybill.getWaybillOther().getCabinetNumber() != null) {
+                                cabinetNumber = new BigDecimal(waybill.getWaybillOther().getCabinetNumber().toString());
+                            }
+                            calcExprStr = calcExp.replaceAll("w", cabinetNumber.stripTrailingZeros().toPlainString())
+                                    .replaceAll("s", exprItem.getInitialWeight().toString())
+                                    .replaceAll("d", exprItem.getAdditionalWeight().toString());
+                            log.info("按柜数:计算公式:" + calcExprStr + ",柜数:" + cabinetNumber.stripTrailingZeros().toPlainString());
+                            Map<String, Object> env = new HashMap<>();
+                            env.put("w", cabinetNumber);
+                            env.put("s", exprItem.getInitialWeight());
+                            env.put("d", exprItem.getAdditionalWeight());
+                            profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp, env).toString());
+                        }
 
                         // 插入提成
                         if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
@@ -1352,6 +1432,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString());
 
                         }
+                        // 柜数
+                        else if ("5".equals(quoteItem.getCalcType())) {
+                            BigDecimal cabinetNumber = BigDecimal.ZERO;
+                            if (waybill.getWaybillOther() != null && waybill.getWaybillOther().getCabinetNumber() != null) {
+                                cabinetNumber = new BigDecimal(waybill.getWaybillOther().getCabinetNumber().toString());
+                            }
+                            calcExprStr = calcExp.replaceAll("w", cabinetNumber.stripTrailingZeros().toPlainString())
+                                    .replaceAll("s", exprItem.getInitialWeight().toString())
+                                    .replaceAll("d", exprItem.getAdditionalWeight().toString());
+                            log.info("按柜数:计算公式:" + calcExprStr + ",柜数:" + cabinetNumber.stripTrailingZeros().toPlainString());
+                            Map<String, Object> env = new HashMap<>();
+                            env.put("w", cabinetNumber);
+                            env.put("s", exprItem.getInitialWeight());
+                            env.put("d", exprItem.getAdditionalWeight());
+                            profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp, env).toString());
+                        }
 
                         // 插入提成
                         if (BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO) > 0) {
@@ -1575,6 +1671,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
 
                             profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString());
                         }
+                        // 柜数
+                        else if ("5".equals(quoteItem.getCalcType())) {
+                            BigDecimal cabinetNumber = BigDecimal.ZERO;
+                            if (waybill.getWaybillOther() != null && waybill.getWaybillOther().getCabinetNumber() != null) {
+                                cabinetNumber = new BigDecimal(waybill.getWaybillOther().getCabinetNumber().toString());
+                            }
+                            calcExprStr = calcExp.replaceAll("w", cabinetNumber.stripTrailingZeros().toPlainString())
+                                    .replaceAll("s", exprItem.getInitialWeight().toString())
+                                    .replaceAll("d", exprItem.getAdditionalWeight().toString());
+                            log.info("按柜数:计算公式:" + calcExprStr + ",柜数:" + cabinetNumber.stripTrailingZeros().toPlainString());
+                            Map<String, Object> env = new HashMap<>();
+                            env.put("w", cabinetNumber);
+                            env.put("s", exprItem.getInitialWeight());
+                            env.put("d", exprItem.getAdditionalWeight());
+                            profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp, env).toString());
+                        }
 
                         // 插入提成
                         if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {