结算修改

pom.xml

@@ -111,13 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMS_SALE_ORDER_CARRIER</param><!--销售计划物资中间表-->
-<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
-<!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
-<!--                        <param>RMS_RECEIVE_PLACE</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->
-<!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->
-<!--                            <param>AMS_CONTRACT_TRANSPORT_PRICE</param>-->
+                        <param>AMSTRUCK_INWARD_REQUIREMENT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -61,13 +61,34 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer deleted){
-        if(deleted != null) mapValue.put("deleted", deleted);
+        if(deleted != null) {
+            mapValue.put("deleted", deleted);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
         return success(pageList);
     }
 
+    @ApiOperation(value="查询内转汽运单价信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getInwardContractPrice")
+    public RESTfulResult getInwardContractPrice(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer deleted){
+        if(deleted != null) {
+            mapValue.put("deleted", deleted);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getInwardContractPrice(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
+        return success(pageList);
+    }
+
     /**
      * 新增汽运单价
      * @param mapValue
@@ -83,6 +104,21 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         return success(i);
     }
 
+    /**
+     * 新增内转汽运单价
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value="新增内转汽运单价")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsContractTransportPrice", value = "销售订单对象", required = false, dataType = "AmsContractTransportPrice")
+    })
+    @PostMapping(value = "/insertInwardPrice")
+    public RESTfulResult insertInwardPrice(@RequestBody(required = false) Map<String,Object> mapValue){
+        int i = amsContractTruckPriceService.insertInwardPrice(mapValue);
+        return success(i);
+    }
+
     /**
      * 通过主键删除汽运单价
      * @param priceId
@@ -252,4 +288,28 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amsContractTruckPriceService.getRealAddressByLike(map);
         return success(mapList);
     }
+
+    @ApiOperation("通过物资，车型，承运起止范围匹配运输单价")
+    @PostMapping("/getInwardPriceBy")
+    public Map<String,Object> getInwardPriceBy(@RequestBody(required = false) Map<String,Object> mapvalue){
+        //接受结算是内转计重还是计时还是计数
+        String settleMentType = (String) mapvalue.get("requirementType");
+        BigDecimal type = null;
+        if("计重".equals(settleMentType)){
+            type = new BigDecimal(2);
+        }else if("计时".equals(settleMentType)){
+            type = new BigDecimal(5);
+        }else if("计次".equals(settleMentType)){
+            type = new BigDecimal(6);
+        }
+        mapvalue.put("type",type);
+        List<Map<String,Object>> mapList = amsContractTruckPriceService.selectInwardPrice(mapvalue);
+        if(mapList.size()!=0){
+            return mapList.get(0);
+        }
+        else{
+            return null;
+        }
+
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsContaactPriceMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsContaactPriceMaterialMapper extends IBaseMapper<AmsContaactPriceMaterial, BigDecimal> {
+    List<Map<String, Object>> getMaterialName(BigDecimal priceId);
+
+
+}

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

@@ -14,6 +14,10 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     //查询主键最大值
     @Select("select seq_truck_price.nextval from dual")
     BigDecimal selectMaxId();
+
+    //查询物资价格中间表主键最大值
+    @Select("select seq__ams_price_material.nextval from dual")
+    BigDecimal selectPriceMaterialMaxId();
     //获取汽运单价信息
     List<Map<String, Object>> getAmsContractTransportPrice(Map<String,Object> map);
     //获取承运商名称
@@ -50,4 +54,11 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     List<Map<String, Object>> getRealAddressByLike(Map<String, Object> map);
 
     BigDecimal selectFormulaId(BigDecimal priceId);
+
+    List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
+
+    List<Map<String, Object>> selectInwardPrice1(Map<String, Object> mapvalue);
+
 }

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

@@ -0,0 +1,77 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+
+@ApiModel(value="单价与物资中间表")
+public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRICE_MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal priceMaterialId;
+
+    /**
+     * 单价ID(PRICE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="单价ID",required=false)
+    private BigDecimal priceId;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.priceMaterialId;
+    }
+
+    @Override
+    public void setId(BigDecimal priceMaterialId) {
+        this.priceMaterialId = priceMaterialId;
+    }
+
+    public BigDecimal getPriceMaterialId() {
+        return priceMaterialId;
+    }
+
+    public void setPriceMaterialId(BigDecimal priceMaterialId) {
+        this.priceMaterialId = priceMaterialId;
+    }
+
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", priceMaterialId=").append(priceMaterialId);
+        sb.append(", priceId=").append(priceId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -14,6 +14,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal requirementId;
+    
 
     /**
      * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,0)
@@ -159,6 +160,12 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="截止日期",required=false)
     private Date dueDate;
 
+    /**
+     * 矿石备注(IS_MINERAL,VARCHAR,255)
+     */
+    @ApiModelProperty(value="矿石备注",required=false)
+    private String isMineral;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -371,6 +378,14 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.dueDate = dueDate;
     }
 
+    public String getIsMineral() {
+        return isMineral;
+    }
+
+    public void setIsMineral(String isMineral) {
+        this.isMineral = isMineral == null ? null : isMineral.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -402,6 +417,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         sb.append(", requirementPlatformId=").append(requirementPlatformId);
         sb.append(", requirementLinkType=").append(requirementLinkType);
         sb.append(", dueDate=").append(dueDate);
+        sb.append(", isMineral=").append(isMineral);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -48,4 +48,12 @@ public interface IAmsContractTruckPriceService {
     List<Map<String,Object>> getOilTypeName();
     // 边输边查具体地址
     List<Map<String, Object>> getRealAddressByLike(Map<String, Object> map);
+
+    //新增内转汽运单价
+    int insertInwardPrice(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
+
 }

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

@@ -1,7 +1,9 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.AmsContaactPriceMaterialMapper;
 import com.steerinfo.dil.mapper.AmsContractTruckPriceMapper;
 import com.steerinfo.dil.mapper.RmsReceivePlaceMapper;
+import com.steerinfo.dil.model.AmsContaactPriceMaterial;
 import com.steerinfo.dil.model.AmsContractTransportPrice;
 import com.steerinfo.dil.model.RmsReceivePlace;
 import com.steerinfo.dil.service.IAmsContractTruckPriceService;
@@ -39,6 +41,9 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     @Autowired
     RmsReceivePlaceMapper rmsReceivePlaceMapper;
 
+    @Autowired
+    AmsContaactPriceMaterialMapper amsContaactPriceMaterialMapper;
+
     /**
      * 新增汽运单价
      * @Author zzd
@@ -525,4 +530,92 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     public List<Map<String, Object>> getRealAddressByLike(Map<String, Object> map) {
         return amsContractTruckPriceMapper.getRealAddressByLike(map);
     }
+
+    @Override
+    public int insertInwardPrice(Map<String, Object> mapValue) {
+        int i = 0;
+        BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
+        BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
+        BigDecimal formulaId = DataChange.dataToBigDecimal(mapValue.get("formulaId"));
+        BigDecimal priceValue = DataChange.dataToBigDecimal(mapValue.get("priceValue"));
+        Date priceDate = new Date((Long)mapValue.get("priceDate"));
+        BigDecimal type = DataChange.dataToBigDecimal(mapValue.get("type"));
+        BigDecimal oilpriceBase = DataChange.dataToBigDecimal(mapValue.get("oilpriceBase"));
+        BigDecimal oilTypeId = DataChange.dataToBigDecimal(mapValue.get("oilTypeId"));
+        BigDecimal oilpriceChangeThreshold = DataChange.dataToBigDecimal(mapValue.get("oilpriceChangeThreshold"));
+        List<Map<String,Object>>mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        AmsContractTransportPrice amsContractTransportPrice = new AmsContractTransportPrice();
+        amsContractTransportPrice.setType(type);
+        amsContractTransportPrice.setOilpriceBase(oilpriceBase);
+        //承运起止点ID
+        amsContractTransportPrice.setLineId(lineId);
+        amsContractTransportPrice.setOilpriceChangeThreshold(oilpriceChangeThreshold);
+        amsContractTransportPrice.setOilTypeId(oilTypeId);
+        amsContractTransportPrice.setPriceValue(priceValue);
+        amsContractTransportPrice.setPriceDate(priceDate);
+        amsContractTransportPrice.setCapacityTypeId(capacityTypeId);
+        amsContractTransportPrice.setCargonameId(formulaId);
+        //生成主键id
+        amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
+        amsContractTransportPrice.setInsertUsername("admin");
+        amsContractTransportPrice.setInsertTime(new Date());
+        amsContractTransportPrice.setUpdateUsername("admin");
+        amsContractTransportPrice.setUpdateTime(new Date());
+        amsContractTransportPrice.setInsertUpdateRemark("无");
+        amsContractTransportPrice.setDeleted(new BigDecimal(0));
+        i =  amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
+        for (Map<String,Object>map:mapList
+             ) {
+            map.get("materialId");
+            AmsContaactPriceMaterial amsContaactPriceMaterial = new AmsContaactPriceMaterial();
+            //设置最大主键ID
+            amsContaactPriceMaterial.setId(amsContractTruckPriceMapper.selectPriceMaterialMaxId());
+            amsContaactPriceMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+            amsContaactPriceMaterial.setPriceId(amsContractTransportPrice.getPriceId());
+            i = amsContaactPriceMaterialMapper.insertSelective(amsContaactPriceMaterial);
+        }
+        return i;
+    }
+
+    @Override
+    public List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue) {
+        List<Map<String,Object>>mapList =  amsContractTruckPriceMapper.getInwardContractPrice(mapValue);
+        for (Map<String,Object>map:mapList
+             ) {
+            List<Map<String,Object>> materialList = amsContaactPriceMaterialMapper.getMaterialName(DataChange.dataToBigDecimal(map.get("priceId")));
+            String materialNames = "";
+            int i = 1;
+            for (Map<String,Object>materialMap:materialList
+                 ) {
+                if(i==materialList.size()){
+                    materialNames = materialNames + materialMap.get("materialName") ;
+                }
+                else{
+                    materialNames = materialNames + materialMap.get("materialName") + "、";
+                }
+                i++;
+            }
+            map.put("materialNames",materialNames);
+            if(((BigDecimal)map.get("type")).intValue() == 2){
+                map.put("type","元/吨");
+            }else if(((BigDecimal)map.get("type")).intValue() == 5){
+                map.put("type","元/小时");
+            }else if(((BigDecimal)map.get("type")).intValue() == 6){
+                map.put("type","元/趟");
+            }
+
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue) {
+        String isMineral = (String)mapvalue.get("isMineral");
+        if("矿石".equals(isMineral)){
+            return amsContractTruckPriceMapper.selectInwardPrice1(mapvalue);
+        }else{
+            return amsContractTruckPriceMapper.selectInwardPrice(mapvalue);
+        }
+
+    }
 }

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

@@ -66,11 +66,18 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
         String InsertUpdateRemark = (String) mapValue.get("remark");
+        String isMineral    = (String)mapValue.get("isMineral");
         Long dueTime =(Long) mapValue.get("DueTime");
+
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
         BigDecimal requirementId = amstruckInwardRequirementMapper.selectOtherId();
         amstruckInwardRequirement.setRequirementId(requirementId);
+        if(mapValue.get("rangeId") != null){
+            //承运起止范围
+            BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
+            amstruckInwardRequirement.setLineId(lineId);
+        }
         amstruckInwardRequirement.setRequirementNumber(DataChange.generateEightDigitsNumber("YSXQ",amstruckInwardRequirementMapper.selectOtherId().intValue()));
         amstruckInwardRequirement.setRequirementStatus(new BigDecimal(0));
         if(purchaseOrderId != null){
@@ -98,6 +105,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckInwardRequirement.setDueDate(null);
         }
         // 设置常规字段
+        amstruckInwardRequirement.setIsMineral(isMineral);
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
         amstruckInwardRequirement.setInsertUpdateRemark(InsertUpdateRemark);
@@ -296,6 +304,8 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     public int insertPurInwardRequirement(Map<String, Object> mapValue) {
         BigDecimal purchaseOrderId = DataChange.dataToBigDecimal(mapValue.get("purchaseOrderId"));
         BigDecimal unloadPointId = DataChange.dataToBigDecimal(mapValue.get("unloadPointId"));
+        //承运起止范围ID
+        BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
         String userId = (String)mapValue.get("userId");
         BigDecimal carrierId = DataChange.dataToBigDecimal(mapValue.get("carrierId"));
         BigDecimal materialId = DataChange.dataToBigDecimal(mapValue.get("materialId"));
@@ -303,6 +313,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         //设置主键
         BigDecimal requirementId = amstruckInwardRequirementMapper.selectOtherId();
         amstruckInwardRequirement.setRequirementId(requirementId);
+        amstruckInwardRequirement.setLineId(lineId);
         amstruckInwardRequirement.setRequirementNumber(DataChange.generateEightDigitsNumber("YSXQ",amstruckInwardRequirementMapper.selectOtherId().intValue()));
         amstruckInwardRequirement.setRequirementStatus(new BigDecimal(0));
         amstruckInwardRequirement.setPurchaseOrderId(purchaseOrderId);

src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@ openfeign:
    ColumnDataFeign:
      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
    TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
 

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

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmsContaactPriceMaterialMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    <id column="PRICE_MATERIAL_ID" jdbcType="DECIMAL" property="priceMaterialId" />
+    <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+  </resultMap>
+  <sql id="columns">
+    PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
+  </sql>
+  <sql id="columns_alias">
+    t.PRICE_MATERIAL_ID, t.PRICE_ID, t.MATERIAL_ID
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM AMS_CONTAACT_PRICE_MATERIAL
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM AMS_CONTAACT_PRICE_MATERIAL t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="priceMaterialId != null">
+        and PRICE_MATERIAL_ID = #{priceMaterialId}
+      </if>
+      <if test="priceId != null">
+        and PRICE_ID = #{priceId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="priceMaterialId != null">
+        and PRICE_MATERIAL_ID = #{priceMaterialId}
+      </if>
+      <if test="priceId != null">
+        and PRICE_ID = #{priceId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from AMS_CONTAACT_PRICE_MATERIAL
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMS_CONTAACT_PRICE_MATERIAL
+    where 1!=1
+      <if test="priceId != null">
+        or PRICE_ID = #{priceId}
+      </if>
+      <if test="materialId != null">
+        or MATERIAL_ID = #{materialId}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    insert into AMS_CONTAACT_PRICE_MATERIAL (PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
+      )
+    values (#{priceMaterialId,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    insert into AMS_CONTAACT_PRICE_MATERIAL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="priceMaterialId != null">
+        PRICE_MATERIAL_ID,
+      </if>
+      <if test="priceId != null">
+        PRICE_ID,
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="priceMaterialId != null">
+        #{priceMaterialId,jdbcType=DECIMAL},
+      </if>
+      <if test="priceId != null">
+        #{priceId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialId != null">
+        #{materialId,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    update AMS_CONTAACT_PRICE_MATERIAL
+    set PRICE_ID = #{priceId,jdbcType=DECIMAL},
+      MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    update AMS_CONTAACT_PRICE_MATERIAL
+    <set>
+      <if test="priceId != null">
+        PRICE_ID = #{priceId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMS_CONTAACT_PRICE_MATERIAL
+      (PRICE_MATERIAL_ID,
+      PRICE_ID, MATERIAL_ID)
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.priceMaterialId,jdbcType=DECIMAL},
+      #{item.priceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL} from dual
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update AMS_CONTAACT_PRICE_MATERIAL
+     set
+       PRICE_MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceMaterialId,jdbcType=DECIMAL}
+       </foreach>
+       ,PRICE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+       </foreach>
+     where PRICE_MATERIAL_ID in
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.priceMaterialId,jdbcType=DECIMAL}
+     </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMS_CONTAACT_PRICE_MATERIAL
+    where PRICE_MATERIAL_ID in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="getMaterialName" resultType="java.util.Map" parameterType="decimal">
+    select
+    rm.MATERIAL_NAME "materialName",
+    rm.MATERIAL_ID "materialId"
+    from AMS_CONTAACT_PRICE_MATERIAL acpr
+    left join RMS_MATERIAL RM
+    on rm.MATERIAL_ID = acpr.MATERIAL_ID
+    where PRICE_ID = #{priceId}
+  </select>
+</mapper>

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

@@ -878,4 +878,57 @@
     FROM AMS_CONTRACT_TRANSPORT_PRICE ACTP
     WHERE ACTP.PRICE_ID = #{priceId}
   </select>
+  <select id="getInwardContractPrice" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT *
+    FROM (SELECT a_t_price.PRICE_ID                  "priceId",
+                 r_o_type.OIL_TYPE_NAME              "oilTypeName",
+                 r_c_type.CAPACITY_TYPE_NAME         "capacityTypeName",
+                 a_t_price.PRICE_VALUE               "priceValue",
+                 a_t_price.PRICE_DATE                "priceDate",
+                 a_t_price.OILPRICE_BASE             "oilpriceBase",
+                 a_t_price.INSERT_TIME               "insertTime",
+                 a_t_price.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
+                 RGR.TRANS_RANGE_VALUE               "transRange",
+                 a_t_price.TYPE                       "type"
+          FROM AMS_CONTRACT_TRANSPORT_PRICE a_t_price
+                 LEFT JOIN RMS_RECEIVE_PLACE rrp
+                           ON a_t_price.PLACE_ID = rrp.PLACE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS r_r_address
+                           ON rrp.ADDRESS_ID = r_r_address.ADDRESS_ID
+                 LEFT JOIN RMS_CAPACITY_TYPE r_c_type
+                           ON a_t_price.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
+                 LEFT JOIN RMS_CARRIER r_carrier
+                           ON a_t_price.CARRIER_ID = r_carrier.CARRIER_ID
+                 LEFT JOIN RMS_TRANS_RANGE RGR
+                           ON a_t_price.LINE_ID = RGR.TRANS_RANGE_ID
+                 LEFT JOIN RMS_OIL_TYPE r_o_type
+                           ON a_t_price.OIL_TYPE_ID = r_o_type.OIL_TYPE_ID
+        where TYPE in (2,5,6))
+  </select>
+    <select id="selectInwardPrice" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+      select * from (select
+      distinct
+      actp.price_id "priceId", actp.price_value "priceValue" ,actp.PRICE_DATE "priceDate"
+      from ams_contract_transport_price actp
+      left join ams_contaact_price_material acpm
+      on acpm.price_id = actp.price_id
+      left join rms_trans_range rtr
+      on rtr.trans_range_id = actp.line_id
+      where type = #{type}
+      and actp.DELETED = 0
+      <if test="rangeId != null">
+        and actp.LINE_ID = #{rangeId}
+      </if>
+      <if test="materialId != null">
+        and acpm.MATERIAL_ID = #{materialId}
+      </if>
+      <if test="capacityTypeId != null">
+        and actp.CAPACITY_TYPE_ID = #{capacityTypeId}
+      </if>
+      )
+      Order by "priceDate" desc
+    </select>
+  <select id="selectInwardPrice1" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+
+  </select>
 </mapper>

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

@@ -457,6 +457,7 @@
         AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
         AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        RTR.TRANS_RANGE_VALUE              AS "rangeValue",
         AIP.PLAN_ID                        AS "planId",
         AIP.INSERT_TIME                    AS "insertTime",
         RS.SHIPPER_NAME                    AS "shipperName"
@@ -469,6 +470,8 @@
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
         LEFT JOIN RMS_SHIPPER RS
         ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE AIP.PLAN_STATUS = #{planStatus}
         AND AIP.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
@@ -578,6 +581,7 @@
         select *
         from (SELECT AIP.PLAN_NUMBER AS "planNumber",
         RCA.CARRIER_NAME AS "carrierName",
+        RTR.TRANS_RANGE_VALUE  AS "rangeValue",
         AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
         AIR.REQUIREMENT_NUMBER AS "requirementNumber",
         AIP.PLAN_ISSUE_TIME AS "planIssueTime",
@@ -622,6 +626,8 @@
         ON rw2.warehouse_id = arm.requirement_platform_id
         LEFT JOIN rms_material rm
         ON rm.material_id = arm.material_id
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE AIP.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="planId != null">
@@ -725,6 +731,7 @@
         SELECT *
         FROM (SELECT AIP.PLAN_NUMBER                    AS "planNumber",
         RCA.CARRIER_NAME                   AS "carrierName",
+        RTR.TRANS_RANGE_VALUE              AS "rangeValue",
         AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
         AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
         AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
@@ -749,6 +756,8 @@
         ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE  AIP.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="planId != null">

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

@@ -27,23 +27,24 @@
         <result column="REQUIREMENT_PLATFORM_ID" jdbcType="DECIMAL" property="requirementPlatformId" />
         <result column="REQUIREMENT_LINK_TYPE" jdbcType="DECIMAL" property="requirementLinkType" />
         <result column="DUE_DATE" jdbcType="TIMESTAMP" property="dueDate" />
+        <result column="IS_MINERAL" jdbcType="VARCHAR" property="isMineral" />
     </resultMap>
     <sql id="columns">
-        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID,
-    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT,
-    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT,
-    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
-    REQUIREMENT_LINK_TYPE, DUE_DATE
+        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID, 
+    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT, 
+    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT, 
+    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID, 
+    REQUIREMENT_LINK_TYPE, DUE_DATE, IS_MINERAL
     </sql>
     <sql id="columns_alias">
-        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE,
-    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE,
-    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION,
-    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE,
-    t.DUE_DATE
+        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE, 
+    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE, 
+    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION, 
+    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
+    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE, 
+    t.DUE_DATE, t.IS_MINERAL
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_INWARD_REQUIREMENT
@@ -128,6 +129,9 @@
             <if test="dueDate != null">
                 and TO_CHAR(DUE_DATE,'yyyy-MM-dd') = #{dueDate}
             </if>
+            <if test="isMineral != null and isMineral != ''">
+                and IS_MINERAL = #{isMineral}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -207,9 +211,12 @@
             <if test="dueDate != null">
                 and TO_CHAR(DUE_DATE,'yyyy-MM-dd') = #{dueDate}
             </if>
+            <if test="isMineral != null and isMineral != ''">
+                and IS_MINERAL LIKE '%${isMineral}%'
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <delete id="deleteByPrimaryKey" parameterType="decimal">
         delete from AMSTRUCK_INWARD_REQUIREMENT
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </delete>
@@ -288,6 +295,9 @@
         <if test="dueDate != null">
             or TO_CHAR(DUE_DATE,'yyyy-MM-dd') = '#{dueDate}'
         </if>
+        <if test="isMineral != null and isMineral != ''">
+            or IS_MINERAL = #{isMineral}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT (REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER,
@@ -299,7 +309,7 @@
                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                                  INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID,
                                                  REQUIREMENT_PLATFORM_ID, REQUIREMENT_LINK_TYPE,
-                                                 DUE_DATE)
+                                                 DUE_DATE, IS_MINERAL)
         values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{requirementNumber,jdbcType=VARCHAR},
                 #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL}, #{requirementTruckTime,jdbcType=TIMESTAMP},
                 #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=VARCHAR},
@@ -309,7 +319,7 @@
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{requirementUnloadUnitId,jdbcType=DECIMAL},
                 #{requirementPlatformId,jdbcType=DECIMAL}, #{requirementLinkType,jdbcType=DECIMAL},
-                #{dueDate,jdbcType=TIMESTAMP})
+                #{dueDate,jdbcType=TIMESTAMP}, #{isMineral,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT
@@ -389,6 +399,9 @@
             <if test="dueDate != null">
                 DUE_DATE,
             </if>
+            <if test="isMineral != null">
+                IS_MINERAL,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="requirementId != null">
@@ -466,6 +479,9 @@
             <if test="dueDate != null">
                 #{dueDate,jdbcType=TIMESTAMP},
             </if>
+            <if test="isMineral != null">
+                #{isMineral,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -493,7 +509,8 @@
             REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
             REQUIREMENT_PLATFORM_ID = #{requirementPlatformId,jdbcType=DECIMAL},
             REQUIREMENT_LINK_TYPE = #{requirementLinkType,jdbcType=DECIMAL},
-            DUE_DATE = #{dueDate,jdbcType=TIMESTAMP}
+            DUE_DATE = #{dueDate,jdbcType=TIMESTAMP},
+            IS_MINERAL = #{isMineral,jdbcType=VARCHAR}
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -571,10 +588,13 @@
             <if test="dueDate != null">
                 DUE_DATE = #{dueDate,jdbcType=TIMESTAMP},
             </if>
+            <if test="isMineral != null">
+                IS_MINERAL = #{isMineral,jdbcType=VARCHAR},
+            </if>
         </set>
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="decimal" resultMap="BaseResultMap">
         <include refid="select" />
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </select>
@@ -600,8 +620,8 @@
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
         REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
-        REQUIREMENT_LINK_TYPE, DUE_DATE
-        )
+        REQUIREMENT_LINK_TYPE, DUE_DATE,
+        IS_MINERAL)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.requirementId,jdbcType=DECIMAL},
@@ -616,8 +636,8 @@
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
         #{item.requirementUnloadUnitId,jdbcType=DECIMAL}, #{item.requirementPlatformId,jdbcType=DECIMAL},
-        #{item.requirementLinkType,jdbcType=DECIMAL}, #{item.dueDate,jdbcType=TIMESTAMP}
-        from dual
+        #{item.requirementLinkType,jdbcType=DECIMAL}, #{item.dueDate,jdbcType=TIMESTAMP},
+        #{item.isMineral,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -723,6 +743,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.dueDate,jdbcType=TIMESTAMP}
         </foreach>
+        ,IS_MINERAL=
+        <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.isMineral,jdbcType=VARCHAR}
+        </foreach>
         where REQUIREMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.requirementId,jdbcType=DECIMAL}
@@ -735,8 +759,6 @@
             #{id}
         </foreach>
     </delete>
-    <!-- 友情提示！！！-->
-
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 展示用车需求 -->
@@ -749,6 +771,7 @@
         AIR.REQUIREMENT_NUMBER AS "requirementNumber",
         AIR.REQUIREMENT_TYPE AS "requirementType",
         AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        RTR.TRANS_RANGE_VALUE   AS "rangeValue",
         AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
         AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
         AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
@@ -776,6 +799,7 @@
         LEFT JOIN rms_warehouse rw2 ON rw2.warehouse_id = arm.requirement_platform_id
         LEFT JOIN rms_material rm ON rm.material_id = arm.material_id
         LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
+        LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE
         AIR.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
@@ -874,6 +898,7 @@
         SELECT
         AIR.REQUIREMENT_NUMBER AS "requirementNumber",
         AIR.REQUIREMENT_TYPE AS "requirementType",
+        RTR.TRANS_RANGE_VALUE AS "rangeValue",
         AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
         AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
         AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
@@ -905,6 +930,7 @@
         LEFT JOIN rms_warehouse rw2 ON rw2.warehouse_id = arm.requirement_platform_id
         LEFT JOIN rms_material rm ON rm.material_id = arm.material_id
         LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
+        LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE
         AIR.REQUIREMENT_STATUS = #{ requirementStatus }
         AND AIR.DELETED = 0
@@ -1205,6 +1231,7 @@
         SELECT
         AIR.REQUIREMENT_ID "requirementId",
         AIP.PLAN_ID "planId",
+        RTR.TRANS_RANGE_VALUE "rangeValue",
         APO.PURCHASE_ORDER_ID "purchaseOrderId",
         AIR.REQUIREMENT_NUMBER    "requirementNo",
         APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
@@ -1236,6 +1263,8 @@
         ON AIP.PLAN_ID = ARP.PLAN_ID
         LEFT JOIN RMS_CARRIER RCR
         ON RCR.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE AIR.PURCHASE_ORDER_ID IS NOT NULL
         AND AIR.REQUIREMENT_STATUS = #{requirementStatus}
         AND AIR.DELETED = 0