is

pom.xml

@@ -118,7 +118,6 @@
 <!--                        <param>AMS_SALE_ORDER_MATERIAL</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->
                             <param>AMS_CONTRACT_TRANSPORT_PRICE</param>
-                            <param>TMSTRUCK_LOAD_RESULT</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/AmsContractTruckPriceController.java

@@ -122,7 +122,7 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             @ApiImplicitParam(name = "amsContractTransportPrice", value = "销售订单对象", required = false, dataType = "AmsContractTransportPrice")
     })
     @PostMapping(value = "/updateAmsContractTransportPrice1")
-    public RESTfulResult updateAmsContractTransportPrice(@RequestBody(required = false) AmsContractTransportPrice amsContractTransportPrice){
+    public RESTfulResult updateAmsContractTransportPrice(@RequestParam AmsContractTransportPrice amsContractTransportPrice){
         int i = amsContractTruckPriceService.updateAmsContractTransportPrice(amsContractTransportPrice);
         return success(i);
     }
@@ -136,8 +136,8 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/batchUpdateTransportPriceByOilPrice1")
-    public RESTfulResult batchUpdateTransportPriceByOilPrice(){
-        int i = amsContractTruckPriceService.batchUpdateTransportPriceByOilPrice();
+    public RESTfulResult batchUpdateTransportPriceByOilPrice(@RequestBody Map<String,Object> map){
+        int i = amsContractTruckPriceService.batchUpdateTransportPriceByOilPrice(map);
         return success(i);
     }
 

src/main/java/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.AmsContractTransportPrice;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.Map;
 @Mapper
 public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTransportPrice, BigDecimal> {
     //查询主键最大值
+    @Select("select seq_truck_price.nextval from dual")
     BigDecimal selectMaxId();
     //获取汽运单价信息
     List<Map<String, Object>> getAmsContractTransportPrice(Map<String,Object> map);
@@ -30,8 +32,14 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     int batchUpdateTransportPriceByOilPrice(Double updateOilPrice);
     //通过主键查询参考运距
     BigDecimal getLinePathLength(BigDecimal lineId);
+    //获取运价数值列表
+    List<Map<String, Object>> getPriceValueList();
     //获取运价和吨公里数值列表
     List<Map<String, Object>> getPriceValueAndPriceTonKilometer();
     //通过主键修改吨公里数
     int updatePriceTonKilometer(BigDecimal priceId,BigDecimal priceTonKilometer);
+    //获取焦炭运价计算公式
+    String getTruckFormula(BigDecimal formulaId);
+    //查询货物名称
+    String getCargonameValue(BigDecimal cargonameId);
 }

src/main/java/com/steerinfo/dil/model/AmsContractTransportPrice.java

@@ -34,16 +34,16 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
     private BigDecimal lineId;
 
     /**
-     * 运力ID(CAPACITY_ID,DECIMAL,0)
+     * 运力类型ID(CAPACITY_TYPE_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="运力ID",required=false)
-    private BigDecimal capacityId;
+    @ApiModelProperty(value="运力类型ID",required=false)
+    private BigDecimal capacityTypeId;
 
     /**
-     * 物资ID(MATERIAL_ID,CHAR,10)
+     * 货物类型ID(CARGONAME_ID,CHAR,10)
      */
-    @ApiModelProperty(value="物资ID",required=false)
-    private String materialId;
+    @ApiModelProperty(value="货物类型ID",required=false)
+    private String cargonameId;
 
     /**
      * 吨公里（元/吨.km）(PRICE_TON_KILOMETER,DECIMAL,0)
@@ -161,20 +161,20 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
         this.lineId = lineId;
     }
 
-    public BigDecimal getCapacityId() {
-        return capacityId;
+    public BigDecimal getCapacityTypeId() {
+        return capacityTypeId;
     }
 
-    public void setCapacityId(BigDecimal capacityId) {
-        this.capacityId = capacityId;
+    public void setCapacityTypeId(BigDecimal capacityTypeId) {
+        this.capacityTypeId = capacityTypeId;
     }
 
-    public String getMaterialId() {
-        return materialId;
+    public String getCargonameId() {
+        return cargonameId;
     }
 
-    public void setMaterialId(String materialId) {
-        this.materialId = materialId == null ? null : materialId.trim();
+    public void setCargonameId(String cargonameId) {
+        this.cargonameId = cargonameId == null ? null : cargonameId.trim();
     }
 
     public BigDecimal getPriceTonKilometer() {
@@ -283,8 +283,8 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
         sb.append(", shipperId=").append(shipperId);
         sb.append(", carrierId=").append(carrierId);
         sb.append(", lineId=").append(lineId);
-        sb.append(", capacityId=").append(capacityId);
-        sb.append(", materialId=").append(materialId);
+        sb.append(", capacityTypeId=").append(capacityTypeId);
+        sb.append(", cargonameId=").append(cargonameId);
         sb.append(", priceTonKilometer=").append(priceTonKilometer);
         sb.append(", priceValue=").append(priceValue);
         sb.append(", priceDate=").append(priceDate);

src/main/java/com/steerinfo/dil/service/IAmsContractTruckPriceService.java

@@ -41,6 +41,6 @@ public interface IAmsContractTruckPriceService {
     //获取所有的油价
     List<Map<String, Object>> getOriginAndNowOilPrice();
     //油价联动导致运价变动，批量修改运价,同时修改吨公里的数值
-    int batchUpdateTransportPriceByOilPrice();
+    int batchUpdateTransportPriceByOilPrice(Map<String,Object> map);
 
 }

src/main/java/com/steerinfo/dil/service/impl/AmsContractTruckPriceServiceImpl.java

@@ -10,6 +10,9 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Stack;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * AmsContractTransportPrice服务实现：
@@ -130,50 +133,277 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
      * @return
      */
     @Override
-    public int batchUpdateTransportPriceByOilPrice() {
-        //获取所有油价信息
-        List<Map<String, Object>> originAndNowOilPrice = amsContractTruckPriceMapper.getOriginAndNowOilPrice();
-        //原油价
-        BigDecimal originOilPrice = new BigDecimal("1");
-        //现油价
-        BigDecimal nowOilPrice = new BigDecimal("0");
-        for (int i = 0; i < 2; i++) {
-            if(i==0){
-                nowOilPrice = (BigDecimal) originAndNowOilPrice.get(i).get("priceValue");
-            }else if(i==1){
-                originOilPrice = (BigDecimal) originAndNowOilPrice.get(i).get("priceValue");
+    public int batchUpdateTransportPriceByOilPrice(Map<String,Object> map) {
+        //现执行价
+        BigDecimal nowPriceValue;
+        //油价变化率
+        String n = map.get("n").toString();
+        //承运商Id
+        BigDecimal carrierId = (BigDecimal) map.get("carrierId");
+        //批量修改焦炭运价
+        List<Map<String, Object>> PriceValueList = amsContractTruckPriceMapper.getPriceValueList();
+        //存储原运输单价实绩
+        AmsContractTransportPrice oldAmsContractTransportPrice = new AmsContractTransportPrice();
+        //存储新运输单价实绩
+        AmsContractTransportPrice amsContractTransportPrice;
+        //存储主键最大值
+        BigDecimal i;
+        //存储货物名称
+        String cargonameValue = "";
+        for (Map<String, Object> stringObjectMap : PriceValueList) {
+            //查询货物名称
+            cargonameValue = amsContractTruckPriceMapper.getCargonameValue(new BigDecimal(stringObjectMap.get("cargonameId").toString()));
+            //获取原主键Id
+            BigDecimal priceId = (BigDecimal) stringObjectMap.get("priceId");
+            //获取承运商Id
+            BigDecimal carrierId1 = (BigDecimal) stringObjectMap.get("carrierId");
+            //修改原单价为历史数据
+            oldAmsContractTransportPrice.setPriceId(priceId);
+            oldAmsContractTransportPrice.setDeleted(new BigDecimal(1));
+            amsContractTruckPriceMapper.updateByPrimaryKeySelective(oldAmsContractTransportPrice);
+            //获取原单价的所有数据
+            amsContractTransportPrice = amsContractTruckPriceMapper.selectByPrimaryKey(priceId);
+            i = amsContractTruckPriceMapper.selectMaxId();
+            //主键
+            amsContractTransportPrice.setPriceId(i);
+            //执行日期
+            amsContractTransportPrice.setPriceDate(new Date());
+            //修改现单价为执行数据
+            amsContractTransportPrice.setDeleted(new BigDecimal(0));
+            //若货物名称为焦炭
+            if(cargonameValue.equals("焦炭")&&carrierId.intValue()==carrierId1.intValue()){
+                //现执行价＝((63.00+63.00*0.13*n)+(66.50+66.50*0.3*n)+40.00)
+                //调用焦炭运价计算公式计算现执行价
+                try {
+                    nowPriceValue = UpdateCokePriceValueByOilPrice(n);
+                    //调整焦炭运价
+                    amsContractTransportPrice.setPriceValue(nowPriceValue);
+                    amsContractTruckPriceMapper.insert(amsContractTransportPrice);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            if(cargonameValue.equals("纯苯")&&carrierId.intValue()==carrierId1.intValue()){
+                //现执行价=(中标价*0.7)+(中标价*0.3)*(1+n)
+                //调用纯苯运价计算公式计算现执行价
+                try {
+                    nowPriceValue = UpdatePureBenzenePriceValueByOilPrice(n,amsContractTransportPrice.getPriceValue());
+                    amsContractTransportPrice.setPriceValue(nowPriceValue);
+                    amsContractTruckPriceMapper.insert(amsContractTransportPrice);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }
-        //油价变动率
-        Double updateOilPrice = nowOilPrice.doubleValue()/originOilPrice.doubleValue()-1;
-        //获取原运价和吨公里数
-        List<Map<String, Object>> priceValueAndPriceTonKilometer = amsContractTruckPriceMapper.getPriceValueAndPriceTonKilometer();
-
-        if(updateOilPrice>0.05||updateOilPrice<-0.05) {
-            //逐条修改吨公里数
-            for (Map<String, Object> stringObjectMap : priceValueAndPriceTonKilometer) {
-                //主键Id
-                BigDecimal priceId = (BigDecimal) stringObjectMap.get("priceId");
-                //原运价
-                BigDecimal priceValue = (BigDecimal) stringObjectMap.get("priceValue");
-                //吨公里数
-                BigDecimal priceTonKilometer = (BigDecimal) stringObjectMap.get("priceTonKilometer");
-                //参考距离,四舍五入，保留两位小数
-                BigDecimal distance;
-                if (priceTonKilometer.doubleValue() != 0) {
-                    distance = priceValue.divide(priceTonKilometer, 2, BigDecimal.ROUND_HALF_UP);
-                    //现运价
-                    Double nowPriceValue = priceValue.doubleValue() * 0.65 + priceValue.doubleValue() * 0.35 * (1 + updateOilPrice);
-                    BigDecimal nowPriceValue1 = new BigDecimal(nowPriceValue);
-                    //新吨公里数
-                    BigDecimal newPriceTonKilometer = nowPriceValue1.divide(distance, 4, BigDecimal.ROUND_HALF_UP);
-                    //通过主键修改一条吨公里数
-                    amsContractTruckPriceMapper.updatePriceTonKilometer(priceId, newPriceTonKilometer);
+
+//        if(updateOilPrice>0.05||updateOilPrice<-0.05) {
+//            //逐条修改吨公里数
+//            for (Map<String, Object> stringObjectMap : priceValueAndPriceTonKilometer) {
+//                //主键Id
+//                BigDecimal priceId = (BigDecimal) stringObjectMap.get("priceId");
+//                //原运价
+//                BigDecimal priceValue = (BigDecimal) stringObjectMap.get("priceValue");
+//                //吨公里数
+//                BigDecimal priceTonKilometer = (BigDecimal) stringObjectMap.get("priceTonKilometer");
+//                //参考距离,四舍五入，保留两位小数
+//                BigDecimal distance;
+//                if (priceTonKilometer.doubleValue() != 0) {
+//                    distance = priceValue.divide(priceTonKilometer, 2, BigDecimal.ROUND_HALF_UP);
+//                    //现运价
+//                    Double nowPriceValue = priceValue.doubleValue() * 0.65 + priceValue.doubleValue() * 0.35 * (1 + updateOilPrice);
+//                    BigDecimal nowPriceValue1 = new BigDecimal(nowPriceValue);
+//                    //新吨公里数
+//                    BigDecimal newPriceTonKilometer = nowPriceValue1.divide(distance, 4, BigDecimal.ROUND_HALF_UP);
+//                    //通过主键修改一条吨公里数
+//                    amsContractTruckPriceMapper.updatePriceTonKilometer(priceId, newPriceTonKilometer);
+//                }
+//                return amsContractTruckPriceMapper.batchUpdateTransportPriceByOilPrice(updateOilPrice);
+//            }
+//        }
+        return 1;
+    }
+
+    /**
+     * 替换焦炭运价公式并进行计算
+     * @param n
+     * @return
+     * @throws Exception
+     */
+    public BigDecimal UpdateCokePriceValueByOilPrice(String n) throws Exception {
+        // 得到运算公式
+        String formula_string = null;
+            // 得到焦炭运价计算公式
+            formula_string = amsContractTruckPriceMapper.getTruckFormula(new BigDecimal(12));
+            // 替换焦炭运价计算公式
+            formula_string = formula_string.replace("油价变动率",n);
+
+        String s = toSufExpr(formula_string);
+        return calSufExpr(s);
+    }
+
+    /**
+     * 替换纯苯运价公式并进行计算
+     * @param n
+     * @return
+     * @throws Exception
+     */
+    public BigDecimal UpdatePureBenzenePriceValueByOilPrice(String n,BigDecimal priceValue) throws Exception {
+        // 得到运算公式
+        String formula_string = null;
+        // 得到纯苯运价计算公式
+        formula_string = amsContractTruckPriceMapper.getTruckFormula(new BigDecimal(13));
+        // 替换纯苯运价计算公式
+        formula_string = formula_string.replace("中标价",priceValue.toString())
+        .replace("油价变动率",n);
+        String s = toSufExpr(formula_string);
+        return calSufExpr(s);
+    }
+
+    /**
+     * 中缀转换后缀表达式
+     */
+    public  String toSufExpr(String s) {
+        StringBuffer sufExpr = new StringBuffer();
+        Stack<String> stack = new Stack<>();
+        //压入空方便判断
+        stack.push(null);
+        Pattern pattern = Pattern.compile("\\(int\\)|(?<!\\d|[)])-?\\d+(\\.\\d+)?|!=|>=|<=|==|[+\\-*/%()><=|]");
+        Matcher matcher = pattern.matcher(s);
+        while (matcher.find()) {
+            String group = matcher.group();
+            if (group.matches("!=|>=|<=|==|[+\\-*/%()><=|]|\\(int\\)")) {//是运算符
+                if (group.equals("(")) {//之间压栈
+                    stack.push(group);
+                } else if (group.equals(")")) {//等于右括号，一直弹栈，直到遇到左括号
+                    String pop = null;
+                    while (!(pop = stack.pop()).equals("(")) {//遍历循环至左括号
+                        sufExpr.append(pop + " ");
+                    }
+                } else {//是运算符：加减乘除强转，根据优先级压栈
+                    while (getPriority(group) <= getPriority(stack.peek())) {
+                        String pop = stack.pop();
+                        System.out.println(pop);
+                        System.out.println(sufExpr);
+                        if(pop!=null&&!pop.equals("|")){
+                            sufExpr.append(pop + " ");
+                        }
+                    }
+                    stack.push(group);
                 }
-                return amsContractTruckPriceMapper.batchUpdateTransportPriceByOilPrice(updateOilPrice);
+            } else {//是数字
+                sufExpr.append(group + " ");
             }
         }
+        String pop = null;
+        while (null != (pop = stack.pop())) {
+            sufExpr.append(pop + " ");
+        }
+        return sufExpr.toString();
+    }
+
+    /**
+     * 设置出栈优先级，(：优先级最低，表示只有遇到)才能出栈
+     * 当栈顶遇到优先级比自己小或等于的弹栈
+     */
+    public  Integer getPriority(String c) {
+        if (c == null) {
+            return 0;
+        }
+        switch (c) {
+            case "(":
+                return 1;
+            case "+":
+            case "-":
+                return 2;
+            case "*":
+            case "/":
+            case "%":
+                return 3;
+            case ">":
+            case "<":
+            case ">=":
+            case "<=":
+            case "!=":
+            case "==":
+                return 4;
+            case "|":
+                return 5;
+            case "=":
+                return 6;
+            case "(int)":
+                return 7;
+        }
         return 0;
     }
 
+    /**
+     * 计算值
+     */
+    public  BigDecimal cal(BigDecimal a1, BigDecimal a2, String operator) throws Exception {
+        switch (operator){
+            case "+":return a1.add(a2);
+            case "-":return a1.subtract(a2);
+            case "*":return a1.multiply(a2);
+            case "/":return a1.divide(a2,3,BigDecimal.ROUND_CEILING);
+            case "%":return a1.divideAndRemainder(a2)[1];
+            default:
+                break;
+        }
+        throw new Exception("非法运算符");
+    }
+
+    public  Boolean calBoolean(BigDecimal a1, BigDecimal a2, String operator) throws Exception {
+        switch (operator){
+            case ">":return a1.compareTo(a2) == 1;
+            case "<":return a1.compareTo(a2) == -1;
+            case ">=":return a1.compareTo(a2) > -1;
+            case "<=":return a1.compareTo(a2) < 1;
+            case "!=":return a1.compareTo(a2) != 0;
+            case "==":return a1.compareTo(a2) == 0;
+            default:
+                break;
+        }
+        throw new Exception("非法运算符");
+    }
+
+    /**
+     * 计算后缀表达式
+     */
+    public  BigDecimal calSufExpr(String sufExpr) throws Exception {
+        Stack<BigDecimal> stack = new Stack<>();
+        Pattern pattern=Pattern.compile("\\(int\\)|-?\\d+(\\.\\d+)?|!=|>=|<=|==|[+\\-*/%><=]");//提取运算符和数字
+        Matcher matcher = pattern.matcher(sufExpr);
+        BigDecimal result=new BigDecimal("0.0");
+        while (matcher.find()){
+            String group = matcher.group();
+            if(group.matches("[+\\-*/%]")){
+                BigDecimal a1 =stack.pop();
+                BigDecimal a2 =stack.pop();
+                result = cal(a2, a1, group);
+                stack.push(result);
+            }
+            else if(group.equals("(int)")){
+                BigDecimal pop = stack.pop();
+                BigDecimal bigDecimal = pop.setScale(0, BigDecimal.ROUND_DOWN);
+                stack.push(bigDecimal);
+            }
+            else if(group.matches("!=|>=|<=|==|[><]")){
+                BigDecimal a1 =stack.pop();
+                BigDecimal a2 =stack.pop();
+                stack.push(calBoolean(a2,a1,group)?new BigDecimal(1):new BigDecimal(0));
+            }
+            else if(group.equals("=")){
+                BigDecimal a1 =stack.pop();
+                BigDecimal a2 =stack.pop();
+                if (a2.compareTo(new BigDecimal(1))==0) {
+                    stack.push(a1);
+                }
+            }
+            else {//为数字直接压栈
+                stack.push(new BigDecimal(group));
+            }
+        }
+        return result;
+    }
+
 }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/ams
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

src/main/resources/com/steerinfo/dil/mapper/AmsContractTransportPriceMapper.xml

@@ -6,8 +6,8 @@
         <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId" />
         <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
         <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
-        <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
-        <result column="MATERIAL_ID" jdbcType="CHAR" property="materialId" />
+        <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId" />
+        <result column="CARGONAME_ID" jdbcType="CHAR" property="cargonameId" />
         <result column="PRICE_TON_KILOMETER" jdbcType="DECIMAL" property="priceTonKilometer" />
         <result column="PRICE_VALUE" jdbcType="DECIMAL" property="priceValue" />
         <result column="PRICE_DATE" jdbcType="TIMESTAMP" property="priceDate" />
@@ -22,12 +22,12 @@
         <result column="DEPARTMENT" jdbcType="DECIMAL" property="department" />
     </resultMap>
     <sql id="columns">
-        PRICE_ID, SHIPPER_ID, CARRIER_ID, LINE_ID, CAPACITY_ID, MATERIAL_ID, PRICE_TON_KILOMETER, 
+        PRICE_ID, SHIPPER_ID, CARRIER_ID, LINE_ID, CAPACITY_TYPE_ID, CARGONAME_ID, PRICE_TON_KILOMETER, 
     PRICE_VALUE, PRICE_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
     INSERT_UPDATE_REMARK, DELETED, ADDRESS_ID, TYPE, DEPARTMENT
     </sql>
     <sql id="columns_alias">
-        t.PRICE_ID, t.SHIPPER_ID, t.CARRIER_ID, t.LINE_ID, t.CAPACITY_ID, t.MATERIAL_ID, 
+        t.PRICE_ID, t.SHIPPER_ID, t.CARRIER_ID, t.LINE_ID, t.CAPACITY_TYPE_ID, t.CARGONAME_ID, 
     t.PRICE_TON_KILOMETER, t.PRICE_VALUE, t.PRICE_DATE, t.INSERT_USERNAME, t.INSERT_TIME, 
     t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.ADDRESS_ID, 
     t.TYPE, t.DEPARTMENT
@@ -52,11 +52,11 @@
             <if test="lineId != null">
                 and LINE_ID = #{lineId}
             </if>
-            <if test="capacityId != null">
-                and CAPACITY_ID = #{capacityId}
+            <if test="capacityTypeId != null">
+                and CAPACITY_TYPE_ID = #{capacityTypeId}
             </if>
-            <if test="materialId != null">
-                and MATERIAL_ID = #{materialId}
+            <if test="cargonameId != null">
+                and CARGONAME_ID = #{cargonameId}
             </if>
             <if test="priceTonKilometer != null">
                 and PRICE_TON_KILOMETER = #{priceTonKilometer}
@@ -110,11 +110,11 @@
             <if test="lineId != null">
                 and LINE_ID = #{lineId}
             </if>
-            <if test="capacityId != null">
-                and CAPACITY_ID = #{capacityId}
+            <if test="capacityTypeId != null">
+                and CAPACITY_TYPE_ID = #{capacityTypeId}
             </if>
-            <if test="materialId != null">
-                and MATERIAL_ID = #{materialId}
+            <if test="cargonameId != null">
+                and CARGONAME_ID = #{cargonameId}
             </if>
             <if test="priceTonKilometer != null">
                 and PRICE_TON_KILOMETER = #{priceTonKilometer}
@@ -154,7 +154,7 @@
             </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
         delete from AMS_CONTRACT_TRANSPORT_PRICE
         where PRICE_ID = #{priceId,jdbcType=DECIMAL}
     </delete>
@@ -170,11 +170,11 @@
         <if test="lineId != null">
             or LINE_ID = #{lineId}
         </if>
-        <if test="capacityId != null">
-            or CAPACITY_ID = #{capacityId}
+        <if test="capacityTypeId != null">
+            or CAPACITY_TYPE_ID = #{capacityTypeId}
         </if>
-        <if test="materialId != null">
-            or MATERIAL_ID = #{materialId}
+        <if test="cargonameId != null">
+            or CARGONAME_ID = #{cargonameId}
         </if>
         <if test="priceTonKilometer != null">
             or PRICE_TON_KILOMETER = #{priceTonKilometer}
@@ -215,14 +215,14 @@
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmsContractTransportPrice">
         insert into AMS_CONTRACT_TRANSPORT_PRICE (PRICE_ID, SHIPPER_ID, CARRIER_ID,
-                                                  LINE_ID, CAPACITY_ID, MATERIAL_ID,
+                                                  LINE_ID, CAPACITY_TYPE_ID, CARGONAME_ID,
                                                   PRICE_TON_KILOMETER, PRICE_VALUE, PRICE_DATE,
                                                   INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                                   UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
                                                   ADDRESS_ID, TYPE, DEPARTMENT
         )
         values (#{priceId,jdbcType=DECIMAL}, #{shipperId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
-                #{lineId,jdbcType=DECIMAL}, #{capacityId,jdbcType=DECIMAL}, #{materialId,jdbcType=CHAR},
+                #{lineId,jdbcType=DECIMAL}, #{capacityTypeId,jdbcType=DECIMAL}, #{cargonameId,jdbcType=CHAR},
                 #{priceTonKilometer,jdbcType=DECIMAL}, #{priceValue,jdbcType=DECIMAL}, #{priceDate,jdbcType=TIMESTAMP},
                 #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
                 #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
@@ -244,11 +244,11 @@
             <if test="lineId != null">
                 LINE_ID,
             </if>
-            <if test="capacityId != null">
-                CAPACITY_ID,
+            <if test="capacityTypeId != null">
+                CAPACITY_TYPE_ID,
             </if>
-            <if test="materialId != null">
-                MATERIAL_ID,
+            <if test="cargonameId != null">
+                CARGONAME_ID,
             </if>
             <if test="priceTonKilometer != null">
                 PRICE_TON_KILOMETER,
@@ -300,11 +300,11 @@
             <if test="lineId != null">
                 #{lineId,jdbcType=DECIMAL},
             </if>
-            <if test="capacityId != null">
-                #{capacityId,jdbcType=DECIMAL},
+            <if test="capacityTypeId != null">
+                #{capacityTypeId,jdbcType=DECIMAL},
             </if>
-            <if test="materialId != null">
-                #{materialId,jdbcType=CHAR},
+            <if test="cargonameId != null">
+                #{cargonameId,jdbcType=CHAR},
             </if>
             <if test="priceTonKilometer != null">
                 #{priceTonKilometer,jdbcType=DECIMAL},
@@ -349,8 +349,8 @@
         set SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
             CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
             LINE_ID = #{lineId,jdbcType=DECIMAL},
-            CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
-            MATERIAL_ID = #{materialId,jdbcType=CHAR},
+            CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
+            CARGONAME_ID = #{cargonameId,jdbcType=CHAR},
             PRICE_TON_KILOMETER = #{priceTonKilometer,jdbcType=DECIMAL},
             PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
             PRICE_DATE = #{priceDate,jdbcType=TIMESTAMP},
@@ -377,11 +377,11 @@
             <if test="lineId != null">
                 LINE_ID = #{lineId,jdbcType=DECIMAL},
             </if>
-            <if test="capacityId != null">
-                CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+            <if test="capacityTypeId != null">
+                CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
             </if>
-            <if test="materialId != null">
-                MATERIAL_ID = #{materialId,jdbcType=CHAR},
+            <if test="cargonameId != null">
+                CARGONAME_ID = #{cargonameId,jdbcType=CHAR},
             </if>
             <if test="priceTonKilometer != null">
                 PRICE_TON_KILOMETER = #{priceTonKilometer,jdbcType=DECIMAL},
@@ -422,7 +422,7 @@
         </set>
         where PRICE_ID = #{priceId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
         <include refid="select" />
         where PRICE_ID = #{priceId,jdbcType=DECIMAL}
     </select>
@@ -438,7 +438,7 @@
         insert into AMS_CONTRACT_TRANSPORT_PRICE
         (PRICE_ID,
         SHIPPER_ID, CARRIER_ID, LINE_ID,
-        CAPACITY_ID, MATERIAL_ID, PRICE_TON_KILOMETER,
+        CAPACITY_TYPE_ID, CARGONAME_ID, PRICE_TON_KILOMETER,
         PRICE_VALUE, PRICE_DATE, INSERT_USERNAME,
         INSERT_TIME, UPDATE_USERNAME,
         UPDATE_TIME, INSERT_UPDATE_REMARK,
@@ -448,7 +448,7 @@
         select
         #{item.priceId,jdbcType=DECIMAL},
         #{item.shipperId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL}, #{item.lineId,jdbcType=DECIMAL},
-        #{item.capacityId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=CHAR}, #{item.priceTonKilometer,jdbcType=DECIMAL},
+        #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.cargonameId,jdbcType=CHAR}, #{item.priceTonKilometer,jdbcType=DECIMAL},
         #{item.priceValue,jdbcType=DECIMAL}, #{item.priceDate,jdbcType=TIMESTAMP}, #{item.insertUsername,jdbcType=VARCHAR},
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
@@ -475,13 +475,13 @@
         <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
             when #{item.priceId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
         </foreach>
-        ,CAPACITY_ID=
+        ,CAPACITY_TYPE_ID=
         <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-            when #{item.priceId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.capacityTypeId,jdbcType=DECIMAL}
         </foreach>
-        ,MATERIAL_ID=
+        ,CARGONAME_ID=
         <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-            when #{item.priceId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=CHAR}
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.cargonameId,jdbcType=CHAR}
         </foreach>
         ,PRICE_TON_KILOMETER=
         <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
@@ -545,6 +545,7 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
     <select id="selectMaxId" resultType="DECIMAL">
         SELECT MAX(PRICE_ID) + 1
         FROM AMS_CONTRACT_TRANSPORT_PRICE
@@ -784,4 +785,5 @@
                a_t_price.PRICE_TON_KILOMETER "priceTonKilometer"
         from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
     </select>
+
 </mapper>