'需求'

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>AMS_DISPATCH_SALE_ORDER</param><!--销售计划-->
+                        <param>AMSTRUCK_REQUIREMENT_PLAN</param><!--销售计划-->
 <!--                        <param>AMS_SALE_PLAN_MATERIAL</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
 <!--                        <param>AMS_SALE_ORDER_MATERIAL</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->

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

@@ -45,26 +45,42 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
      */
     @PostMapping("/addTruckPlan")
     public RESTfulResult addTruckPlan(@RequestBody(required=false) Map<String,Object> mapValue) {
-        amstruckInwardPlanService.insert(mapValue);
-        return success();
+        int result = amstruckInwardPlanService.insert(mapValue);
+        return success(result);
     }
     /**
      * 删除运输计划
      */
-    @PostMapping("/deleteTruckRequirement/{planId}")
+    @PostMapping("/deleteTruckPlan/{planId}")
     public RESTfulResult deleteTruckPlan(@PathVariable("planId") BigDecimal planId) {
-        amstruckInwardPlanService.delete(planId);
-        return success("删除成功");
+        int result = amstruckInwardPlanService.deleteTruckPlan(planId);
+        return success(result);
     }
     /**
-     * 修改运输计划/下发运输计划/承运商接收运输计划
+     * 修改运输计划
      */
     @PostMapping("/updateTruckPlan")
     public RESTfulResult updateTruckPlan(@RequestBody AmstruckInwardPlan amstruckInwardPlan) {
-        amstruckInwardPlan.setUpdateTime(new Date());
-        amstruckInwardPlan.setUpdateUsername("admin");
-        amstruckInwardPlanService.modify(amstruckInwardPlan);
-        return success("修改成功");
+        int result = amstruckInwardPlanService.updateTruckPlan(amstruckInwardPlan);
+        return success(result);
+    }
+
+    /**
+     * 查询修改渲染
+     */
+    @PostMapping("/selectInwardPlanToUpdate/{planId}")
+    public RESTfulResult selectInwardPlanToUpdate(@PathVariable("planId") BigDecimal planId) {
+        List<Map<String,Object>> mapList = amstruckInwardPlanService.selectInwardPlanToUpdate(planId);
+        return success(mapList);
+    }
+
+    /**
+     * 下发运输计划
+     */
+    @PostMapping("/downTruckPlan/{planId}")
+    public RESTfulResult downTruckPlan(@PathVariable("planId") BigDecimal planId) {
+        int result = amstruckInwardPlanService.downTruckPlan(planId);
+        return success(result);
     }
     /**
      * 展示未下发的运输计划

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.AmstruckInwardRequirement;
 import com.steerinfo.dil.service.IAmstruckInwardRequirementService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -10,11 +11,13 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,33 +42,62 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
     IAmstruckInwardRequirementService amstruckInwardRequirementService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
+
     /**
      *用车单位提出需求
      *新增用车需求
      */
     @PostMapping("/addTruckRequirement")
     public RESTfulResult addTruckRequirement(@RequestBody AmstruckInwardRequirement amstruckInwardRequirement) {
-        amstruckInwardRequirementService.insert(amstruckInwardRequirement);
-        return success();
+        int result = amstruckInwardRequirementService.insert(amstruckInwardRequirement);
+        return success(result);
     }
     /**
      * 删除用车需求
      */
     @PostMapping("/deleteTruckRequirement/{requirementId}")
     public RESTfulResult deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
-        amstruckInwardRequirementService.delete(requirementId);
-        return success("删除成功");
+        int result = amstruckInwardRequirementService.deleteTruckRequirement(requirementId);
+        return success(result);
     }
     /**
      * 修改用车需求/下发用车需求
      */
     @PostMapping("/updateTruckRequirement")
     public RESTfulResult updateTruckRequirement(@RequestBody AmstruckInwardRequirement amstruckInwardRequirement) {
-        amstruckInwardRequirement.setUpdateTime(new Date());
-        amstruckInwardRequirement.setUpdateUsername("admin");
-        amstruckInwardRequirementService.modify(amstruckInwardRequirement);
-        return success("修改成功");
+        int result = amstruckInwardRequirementService.updateTruckRequirement(amstruckInwardRequirement);
+        return success(result);
+    }
+
+    /**
+     * 查询修改渲染
+     */
+    @PostMapping("/selectRequirement/{requirementId}")
+    public RESTfulResult selectRequirement(@PathVariable("requirementId") Integer requirementId) {
+        List<Map<String,Object>> result = amstruckInwardRequirementService.selectRequirement(requirementId);
+        return success(result);
+    }
+
+    /**
+     * 下发需求
+     */
+    @PostMapping("/downRequirement")
+    public RESTfulResult downRequirement(@RequestBody List<Map<String,Object>> requirementIds) {
+        int result = amstruckInwardRequirementService.downRequirement(requirementIds);
+        return success(result);
     }
+
+    /**
+     * 接收需求
+     */
+    @PostMapping("/receiveRequirement/{requirementId}")
+    public RESTfulResult receiveRequirement(@PathVariable("requirementId") Integer requirementId) {
+        int result = amstruckInwardRequirementService.receiveRequirement(requirementId);
+        return success(result);
+    }
+
     /**
      * 展示未下发的用车需求
      * @param mapValue
@@ -74,23 +106,157 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
      * @param apiId
      * @return
      */
-    @ApiModelProperty(value = "展示未下发的用车需求")
+    @ApiModelProperty(value = "展示用车需求")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "207", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "207(0,1)/250(2)", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "requirementStatus", value = "需求状态", required = false, dataType = "Integer")
     })
     @PostMapping("/getTruckRequirementList")
     public RESTfulResult getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId) {
-        List<Map<String, Object>> list = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
+                                                 Integer apiId,
+                                                 Integer requirementStatus,
+                                                 String con) {
+        if (con != null) {
+            if (!con.equals("undefined")) {
+                String index="get_truck_requirement_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("requirementStatus",requirementStatus);
+        List<Map<String, Object>> truckRequirementList = null;
+        if (mapValue.size() == 1) {
+            //将查询结果存入索引中
+            truckRequirementList =  amstruckInwardRequirementService.getTruckRequirementList(mapValue);
+            Map<String, Object> map1 = new HashMap<>();
+            //添加索引
+            map1.put("index","get_truck_requirement_list");
+            //添加id
+            map1.put("indexId","requirementId");
+            truckRequirementList.add(map1);
+            //新建索引
+            esFeign.insertIndex(truckRequirementList);
+            //删除
+            truckRequirementList.remove(truckRequirementList.size()-1);
+        }
+        if (truckRequirementList == null) {
+            truckRequirementList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
         return success(data);
     }
 
+    @ApiModelProperty(value = "展示批次信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "252", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getPurchaseIdByBatch")
+    public RESTfulResult getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String con) {
+        if (con != null) {
+            if (!con.equals("undefined")) {
+                String index="get_purchase_batch";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        List<Map<String, Object>> truckRequirementList = null;
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            truckRequirementList =  amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+            Map<String, Object> map1 = new HashMap<>();
+            //添加索引
+            map1.put("index","get_purchase_batch");
+            //添加id
+            map1.put("indexId","purchaseOrderId");
+            truckRequirementList.add(map1);
+            //新建索引
+            esFeign.insertIndex(truckRequirementList);
+            //删除
+            truckRequirementList.remove(truckRequirementList.size()-1);
+        }
+        if (truckRequirementList == null) {
+            truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "仓库模代框")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "251", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getWareHouse")
+    public RESTfulResult getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              String con) {
+        if (con != null) {
+            if (!con.equals("undefined")) {
+                String index="get_ware_house";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        List<Map<String, Object>> truckRequirementList = null;
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            truckRequirementList =  amstruckInwardRequirementService.getWareHouse(mapValue);
+            Map<String, Object> map1 = new HashMap<>();
+            //添加索引
+            map1.put("index","get_ware_house");
+            //添加id
+            map1.put("indexId","wareHouseId");
+            truckRequirementList.add(map1);
+            //新建索引
+            esFeign.insertIndex(truckRequirementList);
+            //删除
+            truckRequirementList.remove(truckRequirementList.size()-1);
+        }
+        if (truckRequirementList == null) {
+            truckRequirementList = amstruckInwardRequirementService.getWareHouse(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amstruckInwardRequirementService.getWareHouse(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        return success(data);
+    }
+
+    @GetMapping("/getCapacityType")
+    public RESTfulResult getCapacityType() {
+        List<Map<String,Object>> mapList = amstruckInwardRequirementService.getCapacityType();
+        return success(mapList);
+    }
+
+    @GetMapping("/getShipperUser")
+    public RESTfulResult getShipperUser() {
+        List<Map<String,Object>> mapList = amstruckInwardRequirementService.getShipperUser();
+        return success(mapList);
+    }
+
 }

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

@@ -15,4 +15,7 @@ public interface AmstruckInwardPlanMapper extends IBaseMapper<AmstruckInwardPlan
     BigDecimal selectOtherId();
     //展示运输计划
     List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue);
+
+    // 查询修改渲染
+    List<Map<String, Object>> selectInwardPlanToUpdate(BigDecimal planId);
 }

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

@@ -16,4 +16,24 @@ public interface AmstruckInwardRequirementMapper extends IBaseMapper<AmstruckInw
     BigDecimal selectOtherId();
     //展示用车需求
     List<Map<String, Object>> getTruckRequirementList(Map<String, Object> mapValue);
+    // 得到物资数量
+    List<Map<String,Object>> getMaterialNumber(BigDecimal requirementId);
+
+    // 得到修改渲染
+    List<Map<String, Object>> selectRequirement(BigDecimal requirementId);
+
+    // 展示批次
+    List<Map<String, Object>> getPurchaseIdByBatch(Map<String, Object> mapValue);
+
+    // 车型下拉
+    List<Map<String, Object>> getCapacityType();
+
+    // 用车单位下拉
+    List<Map<String, Object>> getShipperUser();
+
+    // 展示用车需求
+    List<Map<String, Object>> getFinishTruckRequirementList(Map<String, Object> mapValue);
+
+    // 展示用车地点
+    List<Map<String, Object>> getWareHouse(Map<String, Object> mapValue);
 }

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

@@ -75,6 +75,20 @@ public class AmstruckInwardPlan implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 逻辑删除(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
     private static final long serialVersionUID = 1L;
 
     @Override

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

@@ -3,7 +3,6 @@ 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;
 import java.util.Date;
 
@@ -79,7 +78,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
      * 预计作业时长(REQUIREMENT_ESTIMATED_DURATION,DECIMAL,0)
      */
     @ApiModelProperty(value="预计作业时长",required=false)
-    private Short requirementEstimatedDuration;
+    private BigDecimal requirementEstimatedDuration;
 
     /**
      * 是否超限(REQUIREMENT_OVERLIMIT,VARCHAR,20)
@@ -129,6 +128,12 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 0:未删除，1：已删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="0:未删除，1：已删除",required=false)
+    private BigDecimal deleted;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -229,11 +234,11 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.requirementWorkEnvironment = requirementWorkEnvironment == null ? null : requirementWorkEnvironment.trim();
     }
 
-    public Short getRequirementEstimatedDuration() {
+    public BigDecimal getRequirementEstimatedDuration() {
         return requirementEstimatedDuration;
     }
 
-    public void setRequirementEstimatedDuration(Short requirementEstimatedDuration) {
+    public void setRequirementEstimatedDuration(BigDecimal requirementEstimatedDuration) {
         this.requirementEstimatedDuration = requirementEstimatedDuration;
     }
 
@@ -301,6 +306,14 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -327,6 +340,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -3,7 +3,6 @@ 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;
 import java.util.Date;
 

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

@@ -25,4 +25,12 @@ public interface IAmstruckInwardPlanService extends IBaseService<AmstruckInwardP
     int insert(Map<String,Object> mapValue);
 
     List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue);
+
+    int deleteTruckPlan(BigDecimal planId);
+
+    int updateTruckPlan(AmstruckInwardPlan amstruckInwardPlan);
+
+    int downTruckPlan(BigDecimal planId);
+
+    List<Map<String, Object>> selectInwardPlanToUpdate(BigDecimal planId);
 }

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

@@ -25,4 +25,22 @@ public interface IAmstruckInwardRequirementService extends IBaseService<Amstruck
     int insert(AmstruckInwardRequirement amstruckInwardRequirement);
 
     List<Map<String, Object>> getTruckRequirementList(Map<String, Object> mapValue);
+
+    int deleteTruckRequirement(BigDecimal requirementId);
+
+    int updateTruckRequirement(AmstruckInwardRequirement amstruckInwardRequirement);
+
+    List<Map<String, Object>> selectRequirement(Integer requirementId);
+
+    int downRequirement(List<Map<String,Object>> requirementIds);
+
+    int receiveRequirement(Integer requirementId);
+
+    List<Map<String, Object>> getPurchaseIdByBatch(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getCapacityType();
+
+    List<Map<String, Object>> getShipperUser();
+
+    List<Map<String, Object>> getWareHouse(Map<String, Object> mapValue);
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.AmstruckInwardPlanMapper;
 import com.steerinfo.dil.model.AmstruckInwardPlan;
 import com.steerinfo.dil.model.AmstruckInwardRequirement;
+import com.steerinfo.dil.model.AmstruckRequirementPlan;
 import com.steerinfo.dil.service.IAmstruckInwardPlanService;
 import com.steerinfo.dil.service.IAmstruckInwardRequirementService;
 import com.steerinfo.dil.service.IAmstruckRequirementPlanService;
@@ -47,15 +48,14 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
     @Override
     public int insert(Map<String,Object> mapValue) {
         BigDecimal requirementId=new BigDecimal(mapValue.get("requirementId").toString());
-        //修改需求的状态为已接受
-        AmstruckInwardRequirement amstruckInwardRequirement =new AmstruckInwardRequirement();
-        amstruckInwardRequirement.setRequirementId(requirementId);
-        amstruckInwardRequirement.setRequirementStatus(new BigDecimal(2));
-        amstruckInwardRequirement.setUpdateTime(new Date());
-        amstruckInwardRequirement.setUpdateUsername("damin");
-        amstruckInwardRequirementService.modify(amstruckInwardRequirement);
-
+        AmstruckRequirementPlan amstruckRequirementPlan = new AmstruckRequirementPlan();
         BigDecimal planId=amstruckInwardPlanMapper.selectOtherId();
+        amstruckRequirementPlan.setPlanId(planId);
+        amstruckRequirementPlan.setRequirementId(requirementId);
+        amstruckRequirementPlan.setInsertTime(new Date());
+        amstruckRequirementPlan.setInsertUsername("admin");
+        amstruckRequirementPlan.setInsertUpdateRemark("无");
+
         //在中间表中将需求与计划绑定
         amstruckRequirementPlanService.insert(requirementId,planId);
         AmstruckInwardPlan amstruckInwardPlan=new AmstruckInwardPlan();
@@ -74,6 +74,7 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         amstruckInwardPlan.setInsertTime(new Date());
         amstruckInwardPlan.setInsertUsername("admin");
         amstruckInwardPlan.setInsertUpdateRemark("无");
+        amstruckInwardPlan.setDeleted(new BigDecimal(0));
         return amstruckInwardPlanMapper.insertSelective(amstruckInwardPlan);
     }
 
@@ -81,4 +82,54 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
     public List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue) {
         return amstruckInwardPlanMapper.getTruckPlanList(mapValue);
     }
+
+    /**
+     * 删除计划
+     * @param planId
+     * @return
+     */
+    @Override
+    public int deleteTruckPlan(BigDecimal planId) {
+        AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
+        amstruckInwardPlan.setDeleted(new BigDecimal(1));
+        int result = amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
+        return result;
+    }
+
+    /**
+     * 修改计划
+     * @param amstruckInwardPlan
+     * @return
+     */
+    @Override
+    public int updateTruckPlan(AmstruckInwardPlan amstruckInwardPlan) {
+        amstruckInwardPlan.setUpdateTime(new Date());
+        amstruckInwardPlan.setUpdateUsername("admin");
+        int result = amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
+        return result;
+    }
+
+    /**
+     * 下发计划
+     * @param planId
+     * @return
+     */
+    @Override
+    public int downTruckPlan(BigDecimal planId) {
+        AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
+        amstruckInwardPlan.setPlanStatus(new BigDecimal(1));
+        amstruckInwardPlan.setPlanIssueTime(new Date());
+        int result = amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
+        return result;
+    }
+
+    /**
+     * 主键查询修改渲染
+     * @param planId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectInwardPlanToUpdate(BigDecimal planId) {
+        return amstruckInwardPlanMapper.selectInwardPlanToUpdate(planId);
+    }
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,11 +51,141 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername("admin");
         amstruckInwardRequirement.setInsertUpdateRemark("无");
+        amstruckInwardRequirement.setDeleted(new BigDecimal(0));
         return amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
     }
 
+    /**
+     * 查询用车需求
+     * @param mapValue
+     * @return
+     */
     @Override
     public List<Map<String, Object>> getTruckRequirementList(Map<String, Object> mapValue) {
-        return amstruckInwardRequirementMapper.getTruckRequirementList(mapValue);
+        List<Map<String, Object>> mapList;
+        if (((Integer) mapValue.get("requirementStatus")) == 2) {
+            mapList = amstruckInwardRequirementMapper.getFinishTruckRequirementList(mapValue);
+        }
+        else {
+            mapList = amstruckInwardRequirementMapper.getTruckRequirementList(mapValue);
+        }
+
+        return mapList;
+    }
+
+    /**
+     * 删除用车需求
+     * @param requirementId
+     * @return
+     */
+    @Override
+    public int deleteTruckRequirement(BigDecimal requirementId) {
+        AmstruckInwardRequirement amstruckInwardRequirement = amstruckInwardRequirementMapper.selectByPrimaryKey(requirementId);
+        amstruckInwardRequirement.setDeleted(new BigDecimal(1));
+        int result = amstruckInwardRequirementMapper.updateByPrimaryKeySelective(amstruckInwardRequirement);
+        return result;
+    }
+
+    /**
+     * 修改用车需求
+     * @param amstruckInwardRequirement
+     * @return
+     */
+    @Override
+    public int updateTruckRequirement(AmstruckInwardRequirement amstruckInwardRequirement) {
+        int result = amstruckInwardRequirementMapper.updateByPrimaryKeySelective(amstruckInwardRequirement);
+        return result;
+    }
+
+    /**
+     * 查询修改渲染
+     * @param requirementId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectRequirement(Integer requirementId) {
+        return amstruckInwardRequirementMapper.selectRequirement(new BigDecimal(requirementId));
+    }
+
+    /**
+     * 下发需求
+     * @param requirementIds
+     * @return
+     */
+    @Override
+    public int downRequirement(List<Map<String,Object>> requirementIds) {
+        int result = 0;
+        for (Map<String,Object> map : requirementIds) {
+            Integer requirementId = (Integer) map.get("requirementId");
+            AmstruckInwardRequirement amstruckInwardRequirement = amstruckInwardRequirementMapper.selectByPrimaryKey(new BigDecimal(requirementId));
+            amstruckInwardRequirement.setRequirementStatus(new BigDecimal(1));
+            result += amstruckInwardRequirementMapper.updateByPrimaryKeySelective(amstruckInwardRequirement);
+        }
+        return result;
+    }
+
+    /**
+     * 接收需求
+     * @param requirementId
+     * @return
+     */
+    @Override
+    public int receiveRequirement(Integer requirementId) {
+        AmstruckInwardRequirement amstruckInwardRequirement = amstruckInwardRequirementMapper.selectByPrimaryKey(new BigDecimal(requirementId));
+        amstruckInwardRequirement.setRequirementStatus(new BigDecimal(2));
+        amstruckInwardRequirement.setUpdateTime(new Date());
+        amstruckInwardRequirement.setUpdateUsername("admin");
+        int result = amstruckInwardRequirementMapper.updateByPrimaryKeySelective(amstruckInwardRequirement);
+        return result;
+    }
+
+    /**
+     * 批次信息
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPurchaseIdByBatch(Map<String, Object> mapValue) {
+        List<Map<String, Object>> mapList = amstruckInwardRequirementMapper.getPurchaseIdByBatch(mapValue);
+//        for (Map<String,Object> map : mapList) {
+//            BigDecimal purchaseOrderId = (BigDecimal) map.get("purchaseOrderId");
+//            Map<String,Object> purchaseMap = new HashMap<>();
+//            purchaseMap.put("purchaseOrderId",purchaseOrderId);
+//            List<AmstruckInwardRequirement> amstruckInwardRequirements = amstruckInwardRequirementMapper.selectByParameters(purchaseMap);
+//            if (amstruckInwardRequirements.size() == 0 || amstruckInwardRequirements == null) {
+//            }
+//            else {
+//                mapList.remove(map);
+//            }
+//        }
+        return mapList;
+    }
+
+    /**
+     * 车型下拉
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getCapacityType() {
+        return amstruckInwardRequirementMapper.getCapacityType();
+    }
+
+    /**
+     * 用车单位下拉
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getShipperUser() {
+        return amstruckInwardRequirementMapper.getShipperUser();
+    }
+
+    /**
+     * 查询所有仓库
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWareHouse(Map<String, Object> mapValue) {
+        return amstruckInwardRequirementMapper.getWareHouse(mapValue);
     }
 }

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

@@ -1,394 +1,562 @@
 <?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.AmstruckInwardPlanMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckInwardPlan">
-    <id column="PLAN_ID" jdbcType="DECIMAL" property="planId" />
-    <result column="PLAN_NUMBER" jdbcType="VARCHAR" property="planNumber" />
-    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
-    <result column="PLAN_TRUCK_NUMBER" jdbcType="DECIMAL" property="planTruckNumber" />
-    <result column="PLAN_STATUS" jdbcType="DECIMAL" property="planStatus" />
-    <result column="PLAN_ISSUE_TIME" jdbcType="TIMESTAMP" property="planIssueTime" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-  </resultMap>
-  <sql id="columns">
-    PLAN_ID, PLAN_NUMBER, CARRIER_ID, PLAN_TRUCK_NUMBER, PLAN_STATUS, PLAN_ISSUE_TIME,
-  INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.PLAN_ID, t.PLAN_NUMBER, t.CARRIER_ID, t.PLAN_TRUCK_NUMBER, t.PLAN_STATUS, t.PLAN_ISSUE_TIME,
-  t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM AMSTRUCK_INWARD_PLAN
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM AMSTRUCK_INWARD_PLAN t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="planId != null">
-        and PLAN_ID = #{planId}
-      </if>
-      <if test="planNumber != null and planNumber != ''">
-        and PLAN_NUMBER = #{planNumber}
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="planTruckNumber != null">
-        and PLAN_TRUCK_NUMBER = #{planTruckNumber}
-      </if>
-      <if test="planStatus != null">
-        and PLAN_STATUS = #{planStatus}
-      </if>
-      <if test="planIssueTime != null">
-        and TO_CHAR(PLAN_ISSUE_TIME,'yyyy-MM-dd') = #{planIssueTime}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="planId != null">
-        and PLAN_ID = #{planId}
-      </if>
-      <if test="planNumber != null and planNumber != ''">
-        and PLAN_NUMBER LIKE '%${planNumber}%'
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="planTruckNumber != null">
-        and PLAN_TRUCK_NUMBER = #{planTruckNumber}
-      </if>
-      <if test="planStatus != null">
-        and PLAN_STATUS = #{planStatus}
-      </if>
-      <if test="planIssueTime != null">
-        and TO_CHAR(PLAN_ISSUE_TIME,'yyyy-MM-dd') = #{planIssueTime}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from AMSTRUCK_INWARD_PLAN
-    where PLAN_ID = #{planId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from AMSTRUCK_INWARD_PLAN
-    where 1!=1 
-      <if test="planNumber != null and planNumber != ''">
-        or PLAN_NUMBER = #{planNumber}
-      </if>
-      <if test="carrierId != null">
-        or CARRIER_ID = #{carrierId}
-      </if>
-      <if test="planTruckNumber != null">
-        or PLAN_TRUCK_NUMBER = #{planTruckNumber}
-      </if>
-      <if test="planStatus != null">
-        or PLAN_STATUS = #{planStatus}
-      </if>
-      <if test="planIssueTime != null">
-        or TO_CHAR(PLAN_ISSUE_TIME,'yyyy-MM-dd') = '#{planIssueTime}'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
-    insert into AMSTRUCK_INWARD_PLAN (PLAN_ID, PLAN_NUMBER, CARRIER_ID, 
-      PLAN_TRUCK_NUMBER, PLAN_STATUS, PLAN_ISSUE_TIME, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{planId,jdbcType=DECIMAL}, #{planNumber,jdbcType=VARCHAR}, #{carrierId,jdbcType=DECIMAL}, 
-      #{planTruckNumber,jdbcType=DECIMAL}, #{planStatus,jdbcType=DECIMAL}, #{planIssueTime,jdbcType=TIMESTAMP}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
-    insert into AMSTRUCK_INWARD_PLAN
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="planId != null">
-        PLAN_ID,
-      </if>
-      <if test="planNumber != null">
-        PLAN_NUMBER,
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID,
-      </if>
-      <if test="planTruckNumber != null">
-        PLAN_TRUCK_NUMBER,
-      </if>
-      <if test="planStatus != null">
-        PLAN_STATUS,
-      </if>
-      <if test="planIssueTime != null">
-        PLAN_ISSUE_TIME,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="planId != null">
-        #{planId,jdbcType=DECIMAL},
-      </if>
-      <if test="planNumber != null">
-        #{planNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="carrierId != null">
-        #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="planTruckNumber != null">
-        #{planTruckNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="planStatus != null">
-        #{planStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="planIssueTime != null">
-        #{planIssueTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
-    update AMSTRUCK_INWARD_PLAN
-    set PLAN_NUMBER = #{planNumber,jdbcType=VARCHAR},
-      CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      PLAN_TRUCK_NUMBER = #{planTruckNumber,jdbcType=DECIMAL},
-      PLAN_STATUS = #{planStatus,jdbcType=DECIMAL},
-      PLAN_ISSUE_TIME = #{planIssueTime,jdbcType=TIMESTAMP},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
-    where PLAN_ID = #{planId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
-    update AMSTRUCK_INWARD_PLAN
-    <set>
-      <if test="planNumber != null">
-        PLAN_NUMBER = #{planNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="planTruckNumber != null">
-        PLAN_TRUCK_NUMBER = #{planTruckNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="planStatus != null">
-        PLAN_STATUS = #{planStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="planIssueTime != null">
-        PLAN_ISSUE_TIME = #{planIssueTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where PLAN_ID = #{planId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PLAN_ID = #{planId,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 AMSTRUCK_INWARD_PLAN 
-      (PLAN_ID, 
-      PLAN_NUMBER, CARRIER_ID, PLAN_TRUCK_NUMBER, 
-      PLAN_STATUS, PLAN_ISSUE_TIME, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.planId,jdbcType=DECIMAL}, 
-      #{item.planNumber,jdbcType=VARCHAR}, #{item.carrierId,jdbcType=DECIMAL}, #{item.planTruckNumber,jdbcType=DECIMAL}, 
-      #{item.planStatus,jdbcType=DECIMAL}, #{item.planIssueTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update AMSTRUCK_INWARD_PLAN
-     set
-       PLAN_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
-       </foreach>
-       ,PLAN_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.planNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,CARRIER_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-       </foreach>
-       ,PLAN_TRUCK_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.planTruckNumber,jdbcType=DECIMAL}
-       </foreach>
-       ,PLAN_STATUS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.planStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,PLAN_ISSUE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.planIssueTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
-          when #{item.planId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where PLAN_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.planId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from AMSTRUCK_INWARD_PLAN
-    where PLAN_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <!-- 展示运输计划 -->
-  <select id="getTruckPlanList" resultType="java.util.Map" parameterType="java.util.Map">
-    select
-      aip.plan_number as "planNumber",
-      aip.plan_truck_number as "planTruckNumber",
-      rc.carrier_name as "carrierName",
-      air.purchase_order_id as "purchaseOrderId",
-      air.requirement_number as "requirementNumber",
-      air.requirement_type as "requirementType",
-      rct.capacity_type_name as "capacityTypeName",
-      air.requirement_truck_time as "requirementTruckTime",
-      rl.line_end_node_desc as "lineEndNodeDesc",
-      air.requirement_work_type as "requirementWorkType",
-      air.requirement_work_content as "requirementWorkContent",
-      air.requirement_work_environment as "requirementWorkEnvironment",
-      air.requirement_estimated_duration as "requirementEstimatedDuration",
-      air.requirement_overlimit as "requirementOverlimit",
-      rs.shipper_name as "shipperName"
-    from amstruck_inward_plan aip
-           left join amstruck_requirement_plan arp on aip.plan_id=arp.plan_id
-           left join amstruck_inward_requirement air on arp.requirement_id=air.requirement_id
-           left join rms_capacity_type rct on air.capacity_type_id=rct.capacity_type_id
-           left join rms_shipper rs on rs.shipper_id=air.requirement_shipper_id
-           left join rms_line rl on air.line_id=rl.line_id
-           left join rms_carrier rc on aip.carrier_id=rc.carrier_id
-    where air.requirement_status=0
-  </select>
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckInwardPlan">
+        <id column="PLAN_ID" jdbcType="DECIMAL" property="planId"/>
+        <result column="PLAN_NUMBER" jdbcType="VARCHAR" property="planNumber"/>
+        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId"/>
+        <result column="PLAN_TRUCK_NUMBER" jdbcType="DECIMAL" property="planTruckNumber"/>
+        <result column="PLAN_STATUS" jdbcType="DECIMAL" property="planStatus"/>
+        <result column="PLAN_ISSUE_TIME" jdbcType="TIMESTAMP" property="planIssueTime"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </resultMap>
+    <sql id="columns">
+        PLAN_ID, PLAN_NUMBER, CARRIER_ID, PLAN_TRUCK_NUMBER, PLAN_STATUS, PLAN_ISSUE_TIME,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.PLAN_ID, t.PLAN_NUMBER, t.CARRIER_ID, t.PLAN_TRUCK_NUMBER, t.PLAN_STATUS, t.PLAN_ISSUE_TIME,
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM AMSTRUCK_INWARD_PLAN
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM AMSTRUCK_INWARD_PLAN t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="planId != null">
+                and PLAN_ID = #{planId}
+            </if>
+            <if test="planNumber != null and planNumber != ''">
+                and PLAN_NUMBER = #{planNumber}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="planTruckNumber != null">
+                and PLAN_TRUCK_NUMBER = #{planTruckNumber}
+            </if>
+            <if test="planStatus != null">
+                and PLAN_STATUS = #{planStatus}
+            </if>
+            <if test="planIssueTime != null">
+                and TO_CHAR(PLAN_ISSUE_TIME,'yyyy-MM-dd') = #{planIssueTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="planId != null">
+                and PLAN_ID = #{planId}
+            </if>
+            <if test="planNumber != null and planNumber != ''">
+                and PLAN_NUMBER LIKE '%${planNumber}%'
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="planTruckNumber != null">
+                and PLAN_TRUCK_NUMBER = #{planTruckNumber}
+            </if>
+            <if test="planStatus != null">
+                and PLAN_STATUS = #{planStatus}
+            </if>
+            <if test="planIssueTime != null">
+                and TO_CHAR(PLAN_ISSUE_TIME,'yyyy-MM-dd') = #{planIssueTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from AMSTRUCK_INWARD_PLAN
+        where PLAN_ID = #{planId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from AMSTRUCK_INWARD_PLAN
+        where 1!=1
+        <if test="planNumber != null and planNumber != ''">
+            or PLAN_NUMBER = #{planNumber}
+        </if>
+        <if test="carrierId != null">
+            or CARRIER_ID = #{carrierId}
+        </if>
+        <if test="planTruckNumber != null">
+            or PLAN_TRUCK_NUMBER = #{planTruckNumber}
+        </if>
+        <if test="planStatus != null">
+            or PLAN_STATUS = #{planStatus}
+        </if>
+        <if test="planIssueTime != null">
+            or TO_CHAR(PLAN_ISSUE_TIME,'yyyy-MM-dd') = '#{planIssueTime}'
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
+        insert into AMSTRUCK_INWARD_PLAN (PLAN_ID, PLAN_NUMBER, CARRIER_ID,
+                                          PLAN_TRUCK_NUMBER, PLAN_STATUS, PLAN_ISSUE_TIME,
+                                          INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                          UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED)
+        values (#{planId,jdbcType=DECIMAL}, #{planNumber,jdbcType=VARCHAR}, #{carrierId,jdbcType=DECIMAL},
+                #{planTruckNumber,jdbcType=DECIMAL}, #{planStatus,jdbcType=DECIMAL},
+                #{planIssueTime,jdbcType=TIMESTAMP},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
+        insert into AMSTRUCK_INWARD_PLAN
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="planId != null">
+                PLAN_ID,
+            </if>
+            <if test="planNumber != null">
+                PLAN_NUMBER,
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID,
+            </if>
+            <if test="planTruckNumber != null">
+                PLAN_TRUCK_NUMBER,
+            </if>
+            <if test="planStatus != null">
+                PLAN_STATUS,
+            </if>
+            <if test="planIssueTime != null">
+                PLAN_ISSUE_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="planId != null">
+                #{planId,jdbcType=DECIMAL},
+            </if>
+            <if test="planNumber != null">
+                #{planNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="carrierId != null">
+                #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="planTruckNumber != null">
+                #{planTruckNumber,jdbcType=DECIMAL},
+            </if>
+            <if test="planStatus != null">
+                #{planStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="planIssueTime != null">
+                #{planIssueTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
+        update AMSTRUCK_INWARD_PLAN
+        set PLAN_NUMBER          = #{planNumber,jdbcType=VARCHAR},
+            CARRIER_ID           = #{carrierId,jdbcType=DECIMAL},
+            PLAN_TRUCK_NUMBER    = #{planTruckNumber,jdbcType=DECIMAL},
+            PLAN_STATUS          = #{planStatus,jdbcType=DECIMAL},
+            PLAN_ISSUE_TIME      = #{planIssueTime,jdbcType=TIMESTAMP},
+            INSERT_USERNAME      = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME          = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME      = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME          = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED              = #{deleted,jdbcType=DECIMAL}
+        where PLAN_ID = #{planId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardPlan">
+        update AMSTRUCK_INWARD_PLAN
+        <set>
+            <if test="planNumber != null">
+                PLAN_NUMBER = #{planNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="planTruckNumber != null">
+                PLAN_TRUCK_NUMBER = #{planTruckNumber,jdbcType=DECIMAL},
+            </if>
+            <if test="planStatus != null">
+                PLAN_STATUS = #{planStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="planIssueTime != null">
+                PLAN_ISSUE_TIME = #{planIssueTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where PLAN_ID = #{planId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where PLAN_ID = #{planId,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 AMSTRUCK_INWARD_PLAN
+        (PLAN_ID,
+        PLAN_NUMBER, CARRIER_ID, PLAN_TRUCK_NUMBER,
+        PLAN_STATUS, PLAN_ISSUE_TIME,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK, DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.planId,jdbcType=DECIMAL},
+        #{item.planNumber,jdbcType=VARCHAR}, #{item.carrierId,jdbcType=DECIMAL},
+        #{item.planTruckNumber,jdbcType=DECIMAL},
+        #{item.planStatus,jdbcType=DECIMAL}, #{item.planIssueTime,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update AMSTRUCK_INWARD_PLAN
+        set
+        PLAN_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
+        </foreach>
+        ,PLAN_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.planNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,CARRIER_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+        </foreach>
+        ,PLAN_TRUCK_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.planTruckNumber,jdbcType=DECIMAL}
+        </foreach>
+        ,PLAN_STATUS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.planStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,PLAN_ISSUE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.planIssueTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PLAN_ID" close="end">
+            when #{item.planId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where PLAN_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.planId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from AMSTRUCK_INWARD_PLAN
+        where PLAN_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!-- 展示运输计划 -->
+    <select id="getTruckPlanList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+                     RM.MATERIAL_NAME                   AS "materialName",
+                     DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+                     AIP.PLAN_NUMBER                    AS "planNumber",
+                     RCA.CARRIER_NAME                   AS "carrierName",
+                     AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
+                     AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+                     AIR.REQUIREMENT_TYPE               AS "requirementType",
+                     RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
+                     ARM.MATERIAL_COUNT                 AS "materialNumber",
+                     AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+                     RW.WAREHOUSE_NAME                  AS "wareHouseName",
+                     AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+                     AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+                     AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+                     AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+                     AIP.PLAN_ID                        AS "planId",
+                     AIP.INSERT_TIME                    AS "insertTime"
+              FROM AMSTRUCK_INWARD_PLAN AIP
+                       LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                                 ON ARP.PLAN_ID = AIP.PLAN_ID
+                       LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                                 ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                       LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                                 ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+                       LEFT JOIN AMS_PURCHASE_ORDER APO
+                                 ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                       LEFT JOIN DIL_BATCH DB
+                                 ON APO.BATCH_ID = DB.BATCH_ID
+                       LEFT JOIN RMS_MATERIAL RM
+                                 ON RM.MATERIAL_ID = DB.MATERIAL_ID
+                       LEFT JOIN RMS_WAREHOUSE RW
+                                 ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+                       LEFT JOIN RMS_CARRIER RCA
+                                 ON RCA.CARRIER_ID = AIP.CARRIER_ID
+                       LEFT JOIN RMS_CAPACITY_TYPE RCT
+                                 ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID)
+        <where>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialNumber != null">
+                and
+                <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
+                    "materialNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementNumber != null">
+                and
+                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
+                    "requirementNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementType != null">
+                and
+                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
+                    "requirementType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityTypeName != null">
+                and
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementTruckTime != null">
+                and
+                <foreach collection="requirementTruckTime" item="item" open="(" separator="or" close=")">
+                    "requirementTruckTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkType != null">
+                and
+                <foreach collection="requirementWorkType" item="item" open="(" separator="or" close=")">
+                    "requirementWorkType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkContent != null">
+                and
+                <foreach collection="requirementWorkContent" item="item" open="(" separator="or" close=")">
+                    "requirementWorkContent" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkEnvironment != null">
+                and
+                <foreach collection="requirementWorkEnvironment" item="item" open="(" separator="or" close=")">
+                    "requirementWorkEnvironment" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                and
+                <foreach collection="requirementEstimatedDuration" item="item" open="(" separator="or" close=")">
+                    "requirementEstimatedDuration" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planNumber != null">
+                and
+                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
+                    "planNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planTruckNumber != null">
+                and
+                <foreach collection="planTruckNumber" item="item" open="(" separator="or" close=")">
+                    "planTruckNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="wareHouseName != null">
+                and
+                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </sql>
+
+    <select id="selectInwardPlanToUpdate" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT AIP.PLAN_NUMBER       AS "planNumber",
+               AIP.CARRIER_ID        AS "carrierId",
+               AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
+               AIP.PLAN_STATUS       AS "planStatus"
+        FROM AMSTRUCK_INWARD_PLAN AIP
+        WHERE AIP.PLAN_ID = #{planId}
+    </select>
 </mapper>

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

@@ -1,627 +1,1046 @@
 <?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.AmstruckInwardRequirementMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckInwardRequirement">
-    <id column="REQUIREMENT_ID" jdbcType="DECIMAL" property="requirementId" />
-    <result column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId" />
-    <result column="REQUIREMENT_NUMBER" jdbcType="VARCHAR" property="requirementNumber" />
-    <result column="REQUIREMENT_TYPE" jdbcType="VARCHAR" property="requirementType" />
-    <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId" />
-    <result column="REQUIREMENT_TRUCK_TIME" jdbcType="TIMESTAMP" property="requirementTruckTime" />
-    <result column="REQUIREMENT_SHIPPER_ID" jdbcType="DECIMAL" property="requirementShipperId" />
-    <result column="REQUIREMENT_WORK_TYPE" jdbcType="DECIMAL" property="requirementWorkType" />
-    <result column="REQUIREMENT_WORK_CONTENT" jdbcType="VARCHAR" property="requirementWorkContent" />
-    <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
-    <result column="REQUIREMENT_WORK_ENVIRONMENT" jdbcType="VARCHAR" property="requirementWorkEnvironment" />
-    <result column="REQUIREMENT_ESTIMATED_DURATION" jdbcType="DECIMAL" property="requirementEstimatedDuration" />
-    <result column="REQUIREMENT_OVERLIMIT" jdbcType="VARCHAR" property="requirementOverlimit" />
-    <result column="REQUIREMNT_UNIT_ID" jdbcType="DECIMAL" property="requiremntUnitId" />
-    <result column="REQUIREMENT_STATUS" jdbcType="DECIMAL" property="requirementStatus" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-  </resultMap>
-  <sql id="columns">
-    REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID,
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckInwardRequirement">
+        <id column="REQUIREMENT_ID" jdbcType="DECIMAL" property="requirementId"/>
+        <result column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId"/>
+        <result column="REQUIREMENT_NUMBER" jdbcType="VARCHAR" property="requirementNumber"/>
+        <result column="REQUIREMENT_TYPE" jdbcType="VARCHAR" property="requirementType"/>
+        <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId"/>
+        <result column="REQUIREMENT_TRUCK_TIME" jdbcType="TIMESTAMP" property="requirementTruckTime"/>
+        <result column="REQUIREMENT_SHIPPER_ID" jdbcType="DECIMAL" property="requirementShipperId"/>
+        <result column="REQUIREMENT_WORK_TYPE" jdbcType="DECIMAL" property="requirementWorkType"/>
+        <result column="REQUIREMENT_WORK_CONTENT" jdbcType="VARCHAR" property="requirementWorkContent"/>
+        <result column="LINE_ID" jdbcType="DECIMAL" property="lineId"/>
+        <result column="REQUIREMENT_WORK_ENVIRONMENT" jdbcType="VARCHAR" property="requirementWorkEnvironment"/>
+        <result column="REQUIREMENT_ESTIMATED_DURATION" jdbcType="DECIMAL" property="requirementEstimatedDuration"/>
+        <result column="REQUIREMENT_OVERLIMIT" jdbcType="VARCHAR" property="requirementOverlimit"/>
+        <result column="REQUIREMNT_UNIT_ID" jdbcType="DECIMAL" property="requiremntUnitId"/>
+        <result column="REQUIREMENT_STATUS" jdbcType="DECIMAL" property="requirementStatus"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </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
-  </sql>
-  <sql id="columns_alias">
-    t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE,
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+    </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
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM AMSTRUCK_INWARD_REQUIREMENT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM AMSTRUCK_INWARD_REQUIREMENT t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="requirementId != null">
-        and REQUIREMENT_ID = #{requirementId}
-      </if>
-      <if test="purchaseOrderId != null">
-        and PURCHASE_ORDER_ID = #{purchaseOrderId}
-      </if>
-      <if test="requirementNumber != null and requirementNumber != ''">
-        and REQUIREMENT_NUMBER = #{requirementNumber}
-      </if>
-      <if test="requirementType != null and requirementType != ''">
-        and REQUIREMENT_TYPE = #{requirementType}
-      </if>
-      <if test="capacityTypeId != null">
-        and CAPACITY_TYPE_ID = #{capacityTypeId}
-      </if>
-      <if test="requirementTruckTime != null">
-        and TO_CHAR(REQUIREMENT_TRUCK_TIME,'yyyy-MM-dd') = #{requirementTruckTime}
-      </if>
-      <if test="requirementShipperId != null">
-        and REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
-      </if>
-      <if test="requirementWorkType != null">
-        and REQUIREMENT_WORK_TYPE = #{requirementWorkType}
-      </if>
-      <if test="requirementWorkContent != null and requirementWorkContent != ''">
-        and REQUIREMENT_WORK_CONTENT = #{requirementWorkContent}
-      </if>
-      <if test="lineId != null">
-        and LINE_ID = #{lineId}
-      </if>
-      <if test="requirementWorkEnvironment != null and requirementWorkEnvironment != ''">
-        and REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment}
-      </if>
-      <if test="requirementEstimatedDuration != null">
-        and REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration}
-      </if>
-      <if test="requirementOverlimit != null and requirementOverlimit != ''">
-        and REQUIREMENT_OVERLIMIT = #{requirementOverlimit}
-      </if>
-      <if test="requiremntUnitId != null">
-        and REQUIREMNT_UNIT_ID = #{requiremntUnitId}
-      </if>
-      <if test="requirementStatus != null">
-        and REQUIREMENT_STATUS = #{requirementStatus}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="requirementId != null">
-        and REQUIREMENT_ID = #{requirementId}
-      </if>
-      <if test="purchaseOrderId != null">
-        and PURCHASE_ORDER_ID = #{purchaseOrderId}
-      </if>
-      <if test="requirementNumber != null and requirementNumber != ''">
-        and REQUIREMENT_NUMBER LIKE '%${requirementNumber}%'
-      </if>
-      <if test="requirementType != null and requirementType != ''">
-        and REQUIREMENT_TYPE LIKE '%${requirementType}%'
-      </if>
-      <if test="capacityTypeId != null">
-        and CAPACITY_TYPE_ID = #{capacityTypeId}
-      </if>
-      <if test="requirementTruckTime != null">
-        and TO_CHAR(REQUIREMENT_TRUCK_TIME,'yyyy-MM-dd') = #{requirementTruckTime}
-      </if>
-      <if test="requirementShipperId != null">
-        and REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
-      </if>
-      <if test="requirementWorkType != null">
-        and REQUIREMENT_WORK_TYPE = #{requirementWorkType}
-      </if>
-      <if test="requirementWorkContent != null and requirementWorkContent != ''">
-        and REQUIREMENT_WORK_CONTENT LIKE '%${requirementWorkContent}%'
-      </if>
-      <if test="lineId != null">
-        and LINE_ID = #{lineId}
-      </if>
-      <if test="requirementWorkEnvironment != null and requirementWorkEnvironment != ''">
-        and REQUIREMENT_WORK_ENVIRONMENT LIKE '%${requirementWorkEnvironment}%'
-      </if>
-      <if test="requirementEstimatedDuration != null">
-        and REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration}
-      </if>
-      <if test="requirementOverlimit != null and requirementOverlimit != ''">
-        and REQUIREMENT_OVERLIMIT LIKE '%${requirementOverlimit}%'
-      </if>
-      <if test="requiremntUnitId != null">
-        and REQUIREMNT_UNIT_ID = #{requiremntUnitId}
-      </if>
-      <if test="requirementStatus != null">
-        and REQUIREMENT_STATUS = #{requirementStatus}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from AMSTRUCK_INWARD_REQUIREMENT
-    where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from AMSTRUCK_INWARD_REQUIREMENT
-    where 1!=1
-    <if test="purchaseOrderId != null">
-      or PURCHASE_ORDER_ID = #{purchaseOrderId}
-    </if>
-    <if test="requirementNumber != null and requirementNumber != ''">
-      or REQUIREMENT_NUMBER = #{requirementNumber}
-    </if>
-    <if test="requirementType != null and requirementType != ''">
-      or REQUIREMENT_TYPE = #{requirementType}
-    </if>
-    <if test="capacityTypeId != null">
-      or CAPACITY_TYPE_ID = #{capacityTypeId}
-    </if>
-    <if test="requirementTruckTime != null">
-      or TO_CHAR(REQUIREMENT_TRUCK_TIME,'yyyy-MM-dd') = '#{requirementTruckTime}'
-    </if>
-    <if test="requirementShipperId != null">
-      or REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
-    </if>
-    <if test="requirementWorkType != null">
-      or REQUIREMENT_WORK_TYPE = #{requirementWorkType}
-    </if>
-    <if test="requirementWorkContent != null and requirementWorkContent != ''">
-      or REQUIREMENT_WORK_CONTENT = #{requirementWorkContent}
-    </if>
-    <if test="lineId != null">
-      or LINE_ID = #{lineId}
-    </if>
-    <if test="requirementWorkEnvironment != null and requirementWorkEnvironment != ''">
-      or REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment}
-    </if>
-    <if test="requirementEstimatedDuration != null">
-      or REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration}
-    </if>
-    <if test="requirementOverlimit != null and requirementOverlimit != ''">
-      or REQUIREMENT_OVERLIMIT = #{requirementOverlimit}
-    </if>
-    <if test="requiremntUnitId != null">
-      or REQUIREMNT_UNIT_ID = #{requiremntUnitId}
-    </if>
-    <if test="requirementStatus != null">
-      or REQUIREMENT_STATUS = #{requirementStatus}
-    </if>
-    <if test="insertUsername != null and insertUsername != ''">
-      or INSERT_USERNAME = #{insertUsername}
-    </if>
-    <if test="insertTime != null">
-      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-    </if>
-    <if test="updateUsername != null and updateUsername != ''">
-      or UPDATE_USERNAME = #{updateUsername}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
-    insert into AMSTRUCK_INWARD_REQUIREMENT (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)
-    values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{requirementNumber,jdbcType=VARCHAR},
-            #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL}, #{requirementTruckTime,jdbcType=TIMESTAMP},
-            #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=DECIMAL},
-            #{requirementWorkContent,jdbcType=VARCHAR}, #{lineId,jdbcType=DECIMAL}, #{requirementWorkEnvironment,jdbcType=VARCHAR},
-            #{requirementEstimatedDuration,jdbcType=DECIMAL}, #{requirementOverlimit,jdbcType=VARCHAR},
-            #{requiremntUnitId,jdbcType=DECIMAL}, #{requirementStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
-            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-            #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
-    insert into AMSTRUCK_INWARD_REQUIREMENT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="requirementId != null">
-        REQUIREMENT_ID,
-      </if>
-      <if test="purchaseOrderId != null">
-        PURCHASE_ORDER_ID,
-      </if>
-      <if test="requirementNumber != null">
-        REQUIREMENT_NUMBER,
-      </if>
-      <if test="requirementType != null">
-        REQUIREMENT_TYPE,
-      </if>
-      <if test="capacityTypeId != null">
-        CAPACITY_TYPE_ID,
-      </if>
-      <if test="requirementTruckTime != null">
-        REQUIREMENT_TRUCK_TIME,
-      </if>
-      <if test="requirementShipperId != null">
-        REQUIREMENT_SHIPPER_ID,
-      </if>
-      <if test="requirementWorkType != null">
-        REQUIREMENT_WORK_TYPE,
-      </if>
-      <if test="requirementWorkContent != null">
-        REQUIREMENT_WORK_CONTENT,
-      </if>
-      <if test="lineId != null">
-        LINE_ID,
-      </if>
-      <if test="requirementWorkEnvironment != null">
-        REQUIREMENT_WORK_ENVIRONMENT,
-      </if>
-      <if test="requirementEstimatedDuration != null">
-        REQUIREMENT_ESTIMATED_DURATION,
-      </if>
-      <if test="requirementOverlimit != null">
-        REQUIREMENT_OVERLIMIT,
-      </if>
-      <if test="requiremntUnitId != null">
-        REQUIREMNT_UNIT_ID,
-      </if>
-      <if test="requirementStatus != null">
-        REQUIREMENT_STATUS,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="requirementId != null">
-        #{requirementId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseOrderId != null">
-        #{purchaseOrderId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementNumber != null">
-        #{requirementNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="requirementType != null">
-        #{requirementType,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityTypeId != null">
-        #{capacityTypeId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementTruckTime != null">
-        #{requirementTruckTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="requirementShipperId != null">
-        #{requirementShipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementWorkType != null">
-        #{requirementWorkType,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementWorkContent != null">
-        #{requirementWorkContent,jdbcType=VARCHAR},
-      </if>
-      <if test="lineId != null">
-        #{lineId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementWorkEnvironment != null">
-        #{requirementWorkEnvironment,jdbcType=VARCHAR},
-      </if>
-      <if test="requirementEstimatedDuration != null">
-        #{requirementEstimatedDuration,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementOverlimit != null">
-        #{requirementOverlimit,jdbcType=VARCHAR},
-      </if>
-      <if test="requiremntUnitId != null">
-        #{requiremntUnitId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementStatus != null">
-        #{requirementStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
-    update AMSTRUCK_INWARD_REQUIREMENT
-    set PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
-        REQUIREMENT_NUMBER = #{requirementNumber,jdbcType=VARCHAR},
-        REQUIREMENT_TYPE = #{requirementType,jdbcType=VARCHAR},
-        CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-        REQUIREMENT_TRUCK_TIME = #{requirementTruckTime,jdbcType=TIMESTAMP},
-        REQUIREMENT_SHIPPER_ID = #{requirementShipperId,jdbcType=DECIMAL},
-        REQUIREMENT_WORK_TYPE = #{requirementWorkType,jdbcType=DECIMAL},
-        REQUIREMENT_WORK_CONTENT = #{requirementWorkContent,jdbcType=VARCHAR},
-        LINE_ID = #{lineId,jdbcType=DECIMAL},
-        REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment,jdbcType=VARCHAR},
-        REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration,jdbcType=DECIMAL},
-        REQUIREMENT_OVERLIMIT = #{requirementOverlimit,jdbcType=VARCHAR},
-        REQUIREMNT_UNIT_ID = #{requiremntUnitId,jdbcType=DECIMAL},
-        REQUIREMENT_STATUS = #{requirementStatus,jdbcType=DECIMAL},
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
-    where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
-    update AMSTRUCK_INWARD_REQUIREMENT
-    <set>
-      <if test="purchaseOrderId != null">
-        PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementNumber != null">
-        REQUIREMENT_NUMBER = #{requirementNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="requirementType != null">
-        REQUIREMENT_TYPE = #{requirementType,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityTypeId != null">
-        CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementTruckTime != null">
-        REQUIREMENT_TRUCK_TIME = #{requirementTruckTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="requirementShipperId != null">
-        REQUIREMENT_SHIPPER_ID = #{requirementShipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementWorkType != null">
-        REQUIREMENT_WORK_TYPE = #{requirementWorkType,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementWorkContent != null">
-        REQUIREMENT_WORK_CONTENT = #{requirementWorkContent,jdbcType=VARCHAR},
-      </if>
-      <if test="lineId != null">
-        LINE_ID = #{lineId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementWorkEnvironment != null">
-        REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment,jdbcType=VARCHAR},
-      </if>
-      <if test="requirementEstimatedDuration != null">
-        REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementOverlimit != null">
-        REQUIREMENT_OVERLIMIT = #{requirementOverlimit,jdbcType=VARCHAR},
-      </if>
-      <if test="requiremntUnitId != null">
-        REQUIREMNT_UNIT_ID = #{requiremntUnitId,jdbcType=DECIMAL},
-      </if>
-      <if test="requirementStatus != null">
-        REQUIREMENT_STATUS = #{requirementStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where REQUIREMENT_ID = #{requirementId,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 AMSTRUCK_INWARD_REQUIREMENT
-    (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)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.requirementId,jdbcType=DECIMAL},
-    #{item.purchaseOrderId,jdbcType=DECIMAL}, #{item.requirementNumber,jdbcType=VARCHAR},
-    #{item.requirementType,jdbcType=VARCHAR}, #{item.capacityTypeId,jdbcType=DECIMAL},
-    #{item.requirementTruckTime,jdbcType=TIMESTAMP}, #{item.requirementShipperId,jdbcType=DECIMAL},
-    #{item.requirementWorkType,jdbcType=DECIMAL}, #{item.requirementWorkContent,jdbcType=VARCHAR},
-    #{item.lineId,jdbcType=DECIMAL}, #{item.requirementWorkEnvironment,jdbcType=VARCHAR},
-    #{item.requirementEstimatedDuration,jdbcType=DECIMAL}, #{item.requirementOverlimit,jdbcType=VARCHAR},
-    #{item.requiremntUnitId,jdbcType=DECIMAL}, #{item.requirementStatus,jdbcType=DECIMAL},
-    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-    #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update AMSTRUCK_INWARD_REQUIREMENT
-    set
-    REQUIREMENT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementId,jdbcType=DECIMAL}
-    </foreach>
-    ,PURCHASE_ORDER_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUIREMENT_NUMBER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementNumber,jdbcType=VARCHAR}
-    </foreach>
-    ,REQUIREMENT_TYPE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementType,jdbcType=VARCHAR}
-    </foreach>
-    ,CAPACITY_TYPE_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.capacityTypeId,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUIREMENT_TRUCK_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementTruckTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,REQUIREMENT_SHIPPER_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementShipperId,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUIREMENT_WORK_TYPE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkType,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUIREMENT_WORK_CONTENT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkContent,jdbcType=VARCHAR}
-    </foreach>
-    ,LINE_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUIREMENT_WORK_ENVIRONMENT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkEnvironment,jdbcType=VARCHAR}
-    </foreach>
-    ,REQUIREMENT_ESTIMATED_DURATION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementEstimatedDuration,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUIREMENT_OVERLIMIT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementOverlimit,jdbcType=VARCHAR}
-    </foreach>
-    ,REQUIREMNT_UNIT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requiremntUnitId,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUIREMENT_STATUS=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementStatus,jdbcType=DECIMAL}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
-      when #{item.requirementId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    where REQUIREMENT_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.requirementId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from AMSTRUCK_INWARD_REQUIREMENT
-    where REQUIREMENT_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <!-- 展示用车需求 -->
-  <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
-    select air.purchase_order_id as "purchaseOrderId",
-           air.requirement_number as "requirementNumber",
-           air.requirement_type as "requirementType",
-           rct.capacity_type_name as "capacityTypeName",
-           air.requirement_truck_time as "requirementTruckTime",
-           rl.line_end_node_desc as "lineEndNodeDesc",
-           air.requirement_work_type as "requirementWorkType",
-           air.requirement_work_content as "requirementWorkContent",
-           air.requirement_work_environment as "requirementWorkEnvironment",
-           air.requirement_estimated_duration as "requirementEstimatedDuration",
-           air.requirement_overlimit as "requirementOverlimit",
-           rs.shipper_name as "shipperName"
-    from amstruck_inward_requirement air
-           left join rms_capacity_type rct on air.capacity_type_id=rct.capacity_type_id
-           left join rms_shipper rs on rs.shipper_id=air.requirement_shipper_id
-           left join rms_line rl on air.line_id=rl.line_id
-    where air.requirement_status=0
-  </select>
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM AMSTRUCK_INWARD_REQUIREMENT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM AMSTRUCK_INWARD_REQUIREMENT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="requirementId != null">
+                and REQUIREMENT_ID = #{requirementId}
+            </if>
+            <if test="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="requirementNumber != null and requirementNumber != ''">
+                and REQUIREMENT_NUMBER = #{requirementNumber}
+            </if>
+            <if test="requirementType != null and requirementType != ''">
+                and REQUIREMENT_TYPE = #{requirementType}
+            </if>
+            <if test="capacityTypeId != null">
+                and CAPACITY_TYPE_ID = #{capacityTypeId}
+            </if>
+            <if test="requirementTruckTime != null">
+                and TO_CHAR(REQUIREMENT_TRUCK_TIME,'yyyy-MM-dd') = #{requirementTruckTime}
+            </if>
+            <if test="requirementShipperId != null">
+                and REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
+            </if>
+            <if test="requirementWorkType != null">
+                and REQUIREMENT_WORK_TYPE = #{requirementWorkType}
+            </if>
+            <if test="requirementWorkContent != null and requirementWorkContent != ''">
+                and REQUIREMENT_WORK_CONTENT = #{requirementWorkContent}
+            </if>
+            <if test="lineId != null">
+                and LINE_ID = #{lineId}
+            </if>
+            <if test="requirementWorkEnvironment != null and requirementWorkEnvironment != ''">
+                and REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment}
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                and REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration}
+            </if>
+            <if test="requirementOverlimit != null and requirementOverlimit != ''">
+                and REQUIREMENT_OVERLIMIT = #{requirementOverlimit}
+            </if>
+            <if test="requiremntUnitId != null">
+                and REQUIREMNT_UNIT_ID = #{requiremntUnitId}
+            </if>
+            <if test="requirementStatus != null">
+                and REQUIREMENT_STATUS = #{requirementStatus}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="requirementId != null">
+                and REQUIREMENT_ID = #{requirementId}
+            </if>
+            <if test="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="requirementNumber != null and requirementNumber != ''">
+                and REQUIREMENT_NUMBER LIKE '%${requirementNumber}%'
+            </if>
+            <if test="requirementType != null and requirementType != ''">
+                and REQUIREMENT_TYPE LIKE '%${requirementType}%'
+            </if>
+            <if test="capacityTypeId != null">
+                and CAPACITY_TYPE_ID = #{capacityTypeId}
+            </if>
+            <if test="requirementTruckTime != null">
+                and TO_CHAR(REQUIREMENT_TRUCK_TIME,'yyyy-MM-dd') = #{requirementTruckTime}
+            </if>
+            <if test="requirementShipperId != null">
+                and REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
+            </if>
+            <if test="requirementWorkType != null">
+                and REQUIREMENT_WORK_TYPE = #{requirementWorkType}
+            </if>
+            <if test="requirementWorkContent != null and requirementWorkContent != ''">
+                and REQUIREMENT_WORK_CONTENT LIKE '%${requirementWorkContent}%'
+            </if>
+            <if test="lineId != null">
+                and LINE_ID = #{lineId}
+            </if>
+            <if test="requirementWorkEnvironment != null and requirementWorkEnvironment != ''">
+                and REQUIREMENT_WORK_ENVIRONMENT LIKE '%${requirementWorkEnvironment}%'
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                and REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration}
+            </if>
+            <if test="requirementOverlimit != null and requirementOverlimit != ''">
+                and REQUIREMENT_OVERLIMIT LIKE '%${requirementOverlimit}%'
+            </if>
+            <if test="requiremntUnitId != null">
+                and REQUIREMNT_UNIT_ID = #{requiremntUnitId}
+            </if>
+            <if test="requirementStatus != null">
+                and REQUIREMENT_STATUS = #{requirementStatus}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from AMSTRUCK_INWARD_REQUIREMENT
+        where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from AMSTRUCK_INWARD_REQUIREMENT
+        where 1!=1
+        <if test="purchaseOrderId != null">
+            or PURCHASE_ORDER_ID = #{purchaseOrderId}
+        </if>
+        <if test="requirementNumber != null and requirementNumber != ''">
+            or REQUIREMENT_NUMBER = #{requirementNumber}
+        </if>
+        <if test="requirementType != null and requirementType != ''">
+            or REQUIREMENT_TYPE = #{requirementType}
+        </if>
+        <if test="capacityTypeId != null">
+            or CAPACITY_TYPE_ID = #{capacityTypeId}
+        </if>
+        <if test="requirementTruckTime != null">
+            or TO_CHAR(REQUIREMENT_TRUCK_TIME,'yyyy-MM-dd') = '#{requirementTruckTime}'
+        </if>
+        <if test="requirementShipperId != null">
+            or REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
+        </if>
+        <if test="requirementWorkType != null">
+            or REQUIREMENT_WORK_TYPE = #{requirementWorkType}
+        </if>
+        <if test="requirementWorkContent != null and requirementWorkContent != ''">
+            or REQUIREMENT_WORK_CONTENT = #{requirementWorkContent}
+        </if>
+        <if test="lineId != null">
+            or LINE_ID = #{lineId}
+        </if>
+        <if test="requirementWorkEnvironment != null and requirementWorkEnvironment != ''">
+            or REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment}
+        </if>
+        <if test="requirementEstimatedDuration != null">
+            or REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration}
+        </if>
+        <if test="requirementOverlimit != null and requirementOverlimit != ''">
+            or REQUIREMENT_OVERLIMIT = #{requirementOverlimit}
+        </if>
+        <if test="requiremntUnitId != null">
+            or REQUIREMNT_UNIT_ID = #{requiremntUnitId}
+        </if>
+        <if test="requirementStatus != null">
+            or REQUIREMENT_STATUS = #{requirementStatus}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
+        insert into AMSTRUCK_INWARD_REQUIREMENT (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)
+        values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL},
+                #{requirementNumber,jdbcType=VARCHAR},
+                #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL},
+                #{requirementTruckTime,jdbcType=TIMESTAMP},
+                #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=DECIMAL},
+                #{requirementWorkContent,jdbcType=VARCHAR}, #{lineId,jdbcType=DECIMAL},
+                #{requirementWorkEnvironment,jdbcType=VARCHAR},
+                #{requirementEstimatedDuration,jdbcType=DECIMAL}, #{requirementOverlimit,jdbcType=VARCHAR},
+                #{requiremntUnitId,jdbcType=DECIMAL}, #{requirementStatus,jdbcType=DECIMAL},
+                #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
+        insert into AMSTRUCK_INWARD_REQUIREMENT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="requirementId != null">
+                REQUIREMENT_ID,
+            </if>
+            <if test="purchaseOrderId != null">
+                PURCHASE_ORDER_ID,
+            </if>
+            <if test="requirementNumber != null">
+                REQUIREMENT_NUMBER,
+            </if>
+            <if test="requirementType != null">
+                REQUIREMENT_TYPE,
+            </if>
+            <if test="capacityTypeId != null">
+                CAPACITY_TYPE_ID,
+            </if>
+            <if test="requirementTruckTime != null">
+                REQUIREMENT_TRUCK_TIME,
+            </if>
+            <if test="requirementShipperId != null">
+                REQUIREMENT_SHIPPER_ID,
+            </if>
+            <if test="requirementWorkType != null">
+                REQUIREMENT_WORK_TYPE,
+            </if>
+            <if test="requirementWorkContent != null">
+                REQUIREMENT_WORK_CONTENT,
+            </if>
+            <if test="lineId != null">
+                LINE_ID,
+            </if>
+            <if test="requirementWorkEnvironment != null">
+                REQUIREMENT_WORK_ENVIRONMENT,
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                REQUIREMENT_ESTIMATED_DURATION,
+            </if>
+            <if test="requirementOverlimit != null">
+                REQUIREMENT_OVERLIMIT,
+            </if>
+            <if test="requiremntUnitId != null">
+                REQUIREMNT_UNIT_ID,
+            </if>
+            <if test="requirementStatus != null">
+                REQUIREMENT_STATUS,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="requirementId != null">
+                #{requirementId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderId != null">
+                #{purchaseOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementNumber != null">
+                #{requirementNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="requirementType != null">
+                #{requirementType,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityTypeId != null">
+                #{capacityTypeId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementTruckTime != null">
+                #{requirementTruckTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="requirementShipperId != null">
+                #{requirementShipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementWorkType != null">
+                #{requirementWorkType,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementWorkContent != null">
+                #{requirementWorkContent,jdbcType=VARCHAR},
+            </if>
+            <if test="lineId != null">
+                #{lineId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementWorkEnvironment != null">
+                #{requirementWorkEnvironment,jdbcType=VARCHAR},
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                #{requirementEstimatedDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementOverlimit != null">
+                #{requirementOverlimit,jdbcType=VARCHAR},
+            </if>
+            <if test="requiremntUnitId != null">
+                #{requiremntUnitId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementStatus != null">
+                #{requirementStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
+        update AMSTRUCK_INWARD_REQUIREMENT
+        set PURCHASE_ORDER_ID              = #{purchaseOrderId,jdbcType=DECIMAL},
+            REQUIREMENT_NUMBER             = #{requirementNumber,jdbcType=VARCHAR},
+            REQUIREMENT_TYPE               = #{requirementType,jdbcType=VARCHAR},
+            CAPACITY_TYPE_ID               = #{capacityTypeId,jdbcType=DECIMAL},
+            REQUIREMENT_TRUCK_TIME         = #{requirementTruckTime,jdbcType=TIMESTAMP},
+            REQUIREMENT_SHIPPER_ID         = #{requirementShipperId,jdbcType=DECIMAL},
+            REQUIREMENT_WORK_TYPE          = #{requirementWorkType,jdbcType=DECIMAL},
+            REQUIREMENT_WORK_CONTENT       = #{requirementWorkContent,jdbcType=VARCHAR},
+            LINE_ID                        = #{lineId,jdbcType=DECIMAL},
+            REQUIREMENT_WORK_ENVIRONMENT   = #{requirementWorkEnvironment,jdbcType=VARCHAR},
+            REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration,jdbcType=DECIMAL},
+            REQUIREMENT_OVERLIMIT          = #{requirementOverlimit,jdbcType=VARCHAR},
+            REQUIREMNT_UNIT_ID             = #{requiremntUnitId,jdbcType=DECIMAL},
+            REQUIREMENT_STATUS             = #{requirementStatus,jdbcType=DECIMAL},
+            INSERT_USERNAME                = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME                    = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME                = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME                    = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK           = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED                        = #{deleted,jdbcType=DECIMAL}
+        where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
+        update AMSTRUCK_INWARD_REQUIREMENT
+        <set>
+            <if test="purchaseOrderId != null">
+                PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementNumber != null">
+                REQUIREMENT_NUMBER = #{requirementNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="requirementType != null">
+                REQUIREMENT_TYPE = #{requirementType,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityTypeId != null">
+                CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementTruckTime != null">
+                REQUIREMENT_TRUCK_TIME = #{requirementTruckTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="requirementShipperId != null">
+                REQUIREMENT_SHIPPER_ID = #{requirementShipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementWorkType != null">
+                REQUIREMENT_WORK_TYPE = #{requirementWorkType,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementWorkContent != null">
+                REQUIREMENT_WORK_CONTENT = #{requirementWorkContent,jdbcType=VARCHAR},
+            </if>
+            <if test="lineId != null">
+                LINE_ID = #{lineId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementWorkEnvironment != null">
+                REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment,jdbcType=VARCHAR},
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                REQUIREMENT_ESTIMATED_DURATION = #{requirementEstimatedDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementOverlimit != null">
+                REQUIREMENT_OVERLIMIT = #{requirementOverlimit,jdbcType=VARCHAR},
+            </if>
+            <if test="requiremntUnitId != null">
+                REQUIREMNT_UNIT_ID = #{requiremntUnitId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementStatus != null">
+                REQUIREMENT_STATUS = #{requirementStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where REQUIREMENT_ID = #{requirementId,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 AMSTRUCK_INWARD_REQUIREMENT
+        (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)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.requirementId,jdbcType=DECIMAL},
+        #{item.purchaseOrderId,jdbcType=DECIMAL}, #{item.requirementNumber,jdbcType=VARCHAR},
+        #{item.requirementType,jdbcType=VARCHAR}, #{item.capacityTypeId,jdbcType=DECIMAL},
+        #{item.requirementTruckTime,jdbcType=TIMESTAMP}, #{item.requirementShipperId,jdbcType=DECIMAL},
+        #{item.requirementWorkType,jdbcType=DECIMAL}, #{item.requirementWorkContent,jdbcType=VARCHAR},
+        #{item.lineId,jdbcType=DECIMAL}, #{item.requirementWorkEnvironment,jdbcType=VARCHAR},
+        #{item.requirementEstimatedDuration,jdbcType=DECIMAL}, #{item.requirementOverlimit,jdbcType=VARCHAR},
+        #{item.requiremntUnitId,jdbcType=DECIMAL}, #{item.requirementStatus,jdbcType=DECIMAL},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update AMSTRUCK_INWARD_REQUIREMENT
+        set
+        REQUIREMENT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementId,jdbcType=DECIMAL}
+        </foreach>
+        ,PURCHASE_ORDER_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
+        </foreach>
+        ,REQUIREMENT_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,REQUIREMENT_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementType,jdbcType=VARCHAR}
+        </foreach>
+        ,CAPACITY_TYPE_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.capacityTypeId,jdbcType=DECIMAL}
+        </foreach>
+        ,REQUIREMENT_TRUCK_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementTruckTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,REQUIREMENT_SHIPPER_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementShipperId,jdbcType=DECIMAL}
+        </foreach>
+        ,REQUIREMENT_WORK_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkType,jdbcType=DECIMAL}
+        </foreach>
+        ,REQUIREMENT_WORK_CONTENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkContent,jdbcType=VARCHAR}
+        </foreach>
+        ,LINE_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
+        </foreach>
+        ,REQUIREMENT_WORK_ENVIRONMENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkEnvironment,jdbcType=VARCHAR}
+        </foreach>
+        ,REQUIREMENT_ESTIMATED_DURATION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementEstimatedDuration,jdbcType=DECIMAL}
+        </foreach>
+        ,REQUIREMENT_OVERLIMIT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementOverlimit,jdbcType=VARCHAR}
+        </foreach>
+        ,REQUIREMNT_UNIT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requiremntUnitId,jdbcType=DECIMAL}
+        </foreach>
+        ,REQUIREMENT_STATUS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where REQUIREMENT_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.requirementId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from AMSTRUCK_INWARD_REQUIREMENT
+        where REQUIREMENT_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!-- 展示用车需求 -->
+    <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM
+        (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
+        RM.MATERIAL_NAME AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        AIR.REQUIREMENT_TYPE AS "requirementType",
+        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
+        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        AIR.REQUIREMENT_ID AS "requirementId",
+        ARM.MATERIAL_COUNT AS "materialNumber",
+        RW.WAREHOUSE_NAME AS "wareHouseName"
+        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY_TYPE RCT ON AIR.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
+        AND AIR.DELETED = 0)
+        <where>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialNumber != null">
+                and
+                <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
+                    "materialNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementNumber != null">
+                and
+                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
+                    "requirementNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementType != null">
+                and
+                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
+                    "requirementType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityTypeName != null">
+                and
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementTruckTime != null">
+                and
+                <foreach collection="requirementTruckTime" item="item" open="(" separator="or" close=")">
+                    "requirementTruckTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkType != null">
+                and
+                <foreach collection="requirementWorkType" item="item" open="(" separator="or" close=")">
+                    "requirementWorkType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkContent != null">
+                and
+                <foreach collection="requirementWorkContent" item="item" open="(" separator="or" close=")">
+                    "requirementWorkContent" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkEnvironment != null">
+                and
+                <foreach collection="requirementWorkEnvironment" item="item" open="(" separator="or" close=")">
+                    "requirementWorkEnvironment" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                and
+                <foreach collection="requirementEstimatedDuration" item="item" open="(" separator="or" close=")">
+                    "requirementEstimatedDuration" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementOverlimit != null">
+                and
+                <foreach collection="requirementOverlimit" item="item" open="(" separator="or" close=")">
+                    "requirementOverlimit" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="wareHouseName != null">
+                and
+                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertTime != null">
+                and
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertUsername != null">
+                and
+                <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+                    "insertUsername" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <!-- 展示用车需求 -->
+    <select id="getFinishTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM
+        (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
+        RM.MATERIAL_NAME AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        AIR.REQUIREMENT_TYPE AS "requirementType",
+        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
+        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        AIR.REQUIREMENT_ID AS "requirementId",
+        ARM.MATERIAL_COUNT AS "materialNumber",
+        AIR.UPDATE_TIME AS "updateTime",
+        AIR.UPDATE_USERNAME AS "updateUserName",
+        RW.WAREHOUSE_NAME AS "wareHouseName"
+        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY_TYPE RCT ON AIR.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
+        AND AIR.DELETED = 0)
+        <where>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialNumber != null">
+                and
+                <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
+                    "materialNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementNumber != null">
+                and
+                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
+                    "requirementNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementType != null">
+                and
+                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
+                    "requirementType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityTypeName != null">
+                and
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementTruckTime != null">
+                and
+                <foreach collection="requirementTruckTime" item="item" open="(" separator="or" close=")">
+                    "requirementTruckTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkType != null">
+                and
+                <foreach collection="requirementWorkType" item="item" open="(" separator="or" close=")">
+                    "requirementWorkType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkContent != null">
+                and
+                <foreach collection="requirementWorkContent" item="item" open="(" separator="or" close=")">
+                    "requirementWorkContent" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkEnvironment != null">
+                and
+                <foreach collection="requirementWorkEnvironment" item="item" open="(" separator="or" close=")">
+                    "requirementWorkEnvironment" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementEstimatedDuration != null">
+                and
+                <foreach collection="requirementEstimatedDuration" item="item" open="(" separator="or" close=")">
+                    "requirementEstimatedDuration" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementOverlimit != null">
+                and
+                <foreach collection="requirementOverlimit" item="item" open="(" separator="or" close=")">
+                    "requirementOverlimit" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertTime != null">
+                and
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertUsername != null">
+                and
+                <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+                    "insertUsername" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="updateTime != null">
+                and
+                <foreach collection="updateTime" item="item" open="(" separator="or" close=")">
+                    "updateTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="updateUsername != null">
+                and
+                <foreach collection="updateUsername" item="item" open="(" separator="or" close=")">
+                    "updateUsername" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="wareHouseName != null">
+                and
+                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </sql>
+
+    <select id="getMaterialNumber" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ARM.MATERIAL_COUNT AS "materialNumber"
+        FROM AMSTRUCK_REQUIREMENT_MATERIAL ARM
+    </select>
+
+    <select id="selectRequirement" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+               APO.PURCHASE_ORDER_ID              AS "purchaseOrderId",
+               RM.MATERIAL_NAME                   AS "materialName",
+               DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+               RW.WAREHOUSE_NAME                  AS "wareHouseName",
+               AIR.REQUIREMNT_UNIT_ID             AS "requiremntUnitId",
+               AIR.REQUIREMENT_TYPE               AS "requirementType",
+               AIR.CAPACITY_TYPE_ID               AS "capacityTypeId",
+               AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+               AIR.REQUIREMENT_SHIPPER_ID         AS "requirementShipperId",
+               AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+               AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+               AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+               AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+               AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit"
+        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON APO.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = DB.MATERIAL_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        WHERE AIR.REQUIREMENT_ID = #{requirementId}
+    </select>
+
+    <!-- 查询批次和采购订单信息 -->
+    <select id="getPurchaseIdByBatch" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT * FROM(
+        SELECT DISTINCT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
+        APO.PURCHASE_ORDER_ID AS "purchaseOrderId",
+        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
+        RM.MATERIAL_NAME AS "materialName",
+        DB.INSERT_TIME AS "insertTime"
+        FROM (SELECT * FROM AMS_PURCHASE_ORDER APO
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        WHERE AIR.PURCHASE_ORDER_ID IS NULL) APOIR
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APOIR.BATCH_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.BATCH_ID = DB.BATCH_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = DB.MATERIAL_ID)
+        <where>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <select id="getCapacityType" resultType="java.util.Map">
+        SELECT RCT.CAPACITY_TYPE_ID   AS "id",
+               RCT.CAPACITY_TYPE_ID   AS "value",
+               RCT.CAPACITY_TYPE_NAME AS "label"
+        FROM RMS_CAPACITY_TYPE RCT
+    </select>
+
+    <select id="getShipperUser" resultType="java.util.Map">
+        SELECT RS.SHIPPER_ID   AS "id",
+               RS.SHIPPER_ID   AS "value",
+               RS.SHIPPER_NAME AS "label"
+        FROM RMS_SHIPPER RS
+    </select>
+
+    <!-- 仓库模代框 -->
+    <select id="getWareHouse" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT RW.WAREHOUSE_ID   AS "wareHouseId",
+               RW.WAREHOUSE_NAME AS "wareHouseName"
+        FROM RMS_WAREHOUSE RW
+    </select>
 </mapper>