修改销售订单

pom.xml

@@ -111,8 +111,9 @@
                     <!--包名-->
                     <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>AMSTRUCK_RAIL_DAYPLAN</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;-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ColumnDataFeign;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +42,8 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
     ColumnDataFeign columnDataFeign;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")
@@ -65,14 +69,18 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
 
     @ApiOperation(value="展示pc端司机已经抢到的订单")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId()", value = "表头", required = false, dataType = "Interger")
+            @ApiImplicitParam(name = "apiId(233)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/selectDispatchSaleOrderList")
     public RESTfulResult selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
-                                              Integer pageSize){
-
+                                              Integer pageSize,
+                                              Integer carrierId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("carrierId",new BigDecimal(carrierId));
         List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
@@ -80,4 +88,46 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiOperation(value="查询PC端公开抢单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(242)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getPCDispatchSaleOrderList")
+    public RESTfulResult getPCDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer dispatchType,
+                                                    String con){
+        if (con != null) {
+            if(!"undefined".equals(con)){
+                String index="get_pc_dispatch";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        mapValue.put("dispatchType",dispatchType);
+        List<Map<String, Object>> dispatchSaleOrderList = null;
+        if (mapValue.size() == 1) {
+            //将查询结果存入索引中
+            dispatchSaleOrderList =  amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
+            Map<String, Object> map1 = new HashMap<>();
+            //添加索引
+            map1.put("index","get_pc_dispatch");
+            //添加id
+            map1.put("indexId","dispatchId");
+            dispatchSaleOrderList.add(map1);
+            //新建索引
+            esFeign.insertIndex(dispatchSaleOrderList);
+            //删除
+            dispatchSaleOrderList.remove(dispatchSaleOrderList.size()-1);
+        }
+        if (dispatchSaleOrderList == null) {
+            dispatchSaleOrderList = amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);
+        return success(pageList);
+    }
+
 }

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

@@ -51,4 +51,18 @@ public class AmsPurchaseOrderController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
+
+    @ApiModelProperty(value = "APP展示采购订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "81", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getAppPurchaseOrderList")
+    public RESTfulResult getAppPurchaseOrderList(Integer carrierId) {
+
+        List<Map<String, Object>> list = amsPurchaseOrderService.getAppPurchaseOrderList(carrierId);
+        return success(list);
+
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.mapper.AmsRailOffsetDayplanMapper;
 import com.steerinfo.dil.model.AmsRailOffsetDayplan;
 import com.steerinfo.dil.service.impl.AmsRailOffsetDayplanServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -24,28 +25,39 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
     AmsRailOffsetDayplanServiceImpl amsRailOffsetDayplanService;
     @Autowired
     ColumnDataUtil columnDataUtil;
-    /**
-     *新增钢材发往异地库计划
-     */
+    @Autowired
+    AmsRailOffsetDayplanMapper amsRailOffsetDayplanMapper;
+
+
+    @ApiModelProperty(value = "新增钢材发往异地库计划")
     @PostMapping("/addRailOffsetDayplan")
     public RESTfulResult addRailOffsetDayplan(@RequestBody AmsRailOffsetDayplan amsRailOffsetDayplan) {
-        if(amsRailOffsetDayplan==null){
-            return failed();
-        }
-        amsRailOffsetDayplanService.insert(amsRailOffsetDayplan);
-        return success();
+        int i = amsRailOffsetDayplanService.insert(amsRailOffsetDayplan);
+        return success(i);
     }
-    /**
-     * 删除钢材发往异地库计划
-     */
+
+    @ApiModelProperty(value = "通过主键Id查询发运异地库数据")
+    @PostMapping("/getRailOffseDayMes")
+    public RESTfulResult getRailOffseDayMes(Integer dayplanId) {
+        List<Map<String, Object>> mes = amsRailOffsetDayplanMapper.getRailOffseDayMes(dayplanId);
+        return success(mes);
+    }
+
+    @ApiModelProperty(value = "通过发运计划主键查询关联所有物资信息")
+    @PostMapping("/getMaterialMesByDayPlanId")
+    public RESTfulResult getMaterialMesByDayPlanId(Integer dayplanId) {
+        List<Map<String, Object>> mes = amsRailOffsetDayplanMapper.getMaterialMesByDayPlanId(dayplanId);
+        return success(mes);
+    }
+
+    @ApiModelProperty(value = "删除钢材发往异地库计划")
     @PostMapping("/deleteRailOffsetDayplan/{dayPlanId}")
     public RESTfulResult deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId) {
         amsRailOffsetDayplanService.delete(dayPlanId);
         return success("删除成功");
     }
-    /**
-     * 修改钢材发往异地库计划
-     */
+
+    @ApiModelProperty(value = "修改钢材发往异地库计划")
     @PostMapping("/updateRailOffsetDayplan")
     public RESTfulResult updateRailOffsetDayplan(@RequestBody AmsRailOffsetDayplan amsRailOffsetDayplan) {
         if(amsRailOffsetDayplan.getDayplanId()==null){

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

@@ -397,8 +397,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         for (Map<String,Object> m:mapValue
         ) {
-         //Integer id=amsSaleOrderMaterialService.selectByCxh(m);
-            Integer id = Integer.parseInt(m.get("orderMaterialId").toString()) ;
+            Integer id = Integer.parseInt(m.get("saleOrderMaterialId").toString()) ;
             System.out.println(id);
             //通过主键Id获取地址id
             Integer a=amsSaleOrderMaterialService.selectById(new BigDecimal(id));

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/controller/AmstruckPurplanController.java

@@ -82,7 +82,6 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         if(mapValue.size() == 1){
             //将查询结果存入索引中
             allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-            DataChange.changeDateToDayDate(allPurPlan, "planTruckTime", "planIncomingTime");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index","get_pur_plan_list");
@@ -100,7 +99,6 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> purPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        DataChange.changeDateToDayDate(purPlan, "planTruckTime", "planIncomingTime");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPurPlan,purPlan);
         return success(pageList);
     }
@@ -212,7 +210,6 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         if(mapValue.size() == count){
             //将查询结果存入索引中
             allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-            DataChange.changeDateToDayDate(allPlan, "planTruckTime", "planIncomingTime");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index","get_decomposed_list");
@@ -230,11 +227,7 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> plan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-        DataChange.changeDateToDayDate(plan, "planTruckTime", "planIncomingTime");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPlan,plan);
         return success(pageList);
     }
-
-
-
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.mapper.AmstruckRailDayplanMapper;
 import com.steerinfo.dil.model.AmstruckRailDayplan;
 import com.steerinfo.dil.service.IAmstruckRailDayplanService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -41,6 +42,8 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
     IAmstruckRailDayplanService amstruckRailDayplanService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    AmstruckRailDayplanMapper amstruckRailDayplanMapper;
 
     @ApiOperation(value="查询所有到站信息")
     @ApiImplicitParams({
@@ -52,6 +55,33 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
         return success(arriveName);
     }
 
+    /**
+     *通过发运计划Id查询信息
+     */
+    @PostMapping("/getDayPlanByDayPlanId/{dayplanId}")
+    public RESTfulResult getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId) {
+        List<Map<String, Object>> mes = amstruckRailDayplanService.getDayPlanByDayPlanId(dayplanId);
+        return success(mes);
+    }
+
+    /**
+     * 查询所有的承运商
+     */
+    @GetMapping("/getCarrierMes")
+    public RESTfulResult getCarrierMes() {
+        List<Map<String, Object>> carrierMes = amstruckRailDayplanMapper.getCarrierMes();
+        return success(carrierMes);
+    }
+
+    /**
+     * 修改日计划
+     */
+    @PostMapping("/updateDayPlan")
+    public RESTfulResult updateDayPlan(@RequestBody(required = false) AmstruckRailDayplan amstruckRailDayplan) {
+        int i = amstruckRailDayplanMapper.updateByPrimaryKeySelective(amstruckRailDayplan);
+        return success(i);
+    }
+
     /**
      *新增日计划
      */
@@ -94,7 +124,9 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
     public RESTfulResult getTruckRailDayPlan(@RequestBody(required = false) Map<String,Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                             Integer status) {
+        mapValue.put("status", status);
         List<Map<String, Object>> list = amstruckRailDayplanService.getTruckRailDayPlan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
@@ -115,7 +147,9 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
     public RESTfulResult getSzTruckRailDayPlan(@RequestBody(required = false) Map<String,Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               Integer status) {
+        mapValue.put("status", status);
         List<Map<String, Object>> list = amstruckRailDayplanService.getSzTruckRailDayPlan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据

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

@@ -31,4 +31,10 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
 
     //pc端，展示已经接收到了承运商的订单
     List<Map<String,Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> map);
+
+    // 查询PC端公开抢单
+    List<Map<String, Object>> getPCDispatchSaleOrderList(Map<String, Object> mapValue);
+
+    // 空与非空
+    List<BigDecimal> getNullOrNotNull(BigDecimal dispatchId);
 }

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

@@ -27,4 +27,9 @@ public interface AmsPurchaseOrderMapper extends IBaseMapper<AmsPurchaseOrder, Bi
 
     @Select("select seq_AMS_PURCHASE.nextval from dual")
     BigDecimal selectPurchaseId();
+
+    /*
+    App端查询采购订单
+     */
+    List<Map<String, Object>> getAppPurchaseOrderList(Integer carrierId);
 }

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

@@ -12,15 +12,16 @@ import java.util.Map;
 
 @Mapper
 public interface AmsRailOffsetDayplanMapper extends IBaseMapper<AmsRailOffsetDayplan, BigDecimal> {
-    /**
-     * 得到最大id
-     * @return
-     */
-    Integer selectMaxId();
+
     @Select("select seq_AMS_OTHER.nextval from dual")
-    Integer selectOtherId();
+    Integer selectMaxId();
+
     //展示钢材发往异地库日计划
     List<Map<String, Object>> getRailOffsetDayplan(Map<String, Object> mapValue);
 
+    //通过主键查询发运钢材到异地库计划
+    List<Map<String, Object>> getRailOffseDayMes(Integer dayplanId);
 
+    //通过发运计划主键查询关联所有物资信息
+    List<Map<String, Object>> getMaterialMesByDayPlanId(Integer dayplanId);
 }

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

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsRailOffsetMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface AmsRailOffsetMaterialMapper extends IBaseMapper<AmsRailOffsetMaterial, BigDecimal> {
+
+    //获取序列号主键
+    @Select("select seq_rail_offset_material.nextval from dual")
+    BigDecimal selectMaxId();
+}

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

@@ -39,6 +39,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     //获取销售公司已审核的订单
     List<Map<String,Object>> getSaleOrderListBySaleCompany(Map<String,Object> map);
 
+    //通过地址Id查询承运商ID
     List<Integer>  getCarrier(Integer param);
 
     //根据销售订单id查找信息

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/mapper/AmstruckRailDayplanMapper.java

@@ -33,4 +33,10 @@ public interface AmstruckRailDayplanMapper extends IBaseMapper<AmstruckRailDaypl
 
     //查询所有到站信息
     List<Map<String, Object>> getArriveName();
+
+    //通过发运计划Id查询修改信息
+    List<Map<String, Object>> getDayPlanByDayPlanId(Integer dayplanId);
+
+    //查询所有承运商
+    List<Map<String, Object>> getCarrierMes();
 }

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

@@ -1,19 +1,22 @@
 package com.steerinfo.dil.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @ApiModel(value="发运钢材到异地库日计划")
-public class AmsRailOffsetDayplan implements IBasePO<Integer> {
+public class AmsRailOffsetDayplan implements IBasePO<BigDecimal> {
     /**
      * 发运计划ID(DAYPLAN_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="发运计划ID",required=true)
-    private Integer dayplanId;
+    private BigDecimal dayplanId;
 
     /**
      * 计划号(DAYPLAN_NO,VARCHAR,20)
@@ -31,7 +34,7 @@ public class AmsRailOffsetDayplan implements IBasePO<Integer> {
      * 发货单位ID(SHIPPER_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="发货单位ID",required=false)
-    private Integer shipperId;
+    private BigDecimal shipperId;
 
     /**
      * 发货日期(DAYPLAN_DELIVERY_DATE,TIMESTAMP,7)
@@ -55,37 +58,37 @@ public class AmsRailOffsetDayplan implements IBasePO<Integer> {
      * 自有汽车数(DAYPLAN_OWN_CARS_AMOUT,DECIMAL,38)
      */
     @ApiModelProperty(value="自有汽车数",required=false)
-    private Integer dayplanOwnCarsAmout;
+    private BigDecimal dayplanOwnCarsAmout;
 
     /**
      * 专用线ID(DAYPLAN_DEDICATED_LINE_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="专用线ID",required=false)
-    private Integer dayplanDedicatedLineId;
+    private BigDecimal dayplanDedicatedLineId;
 
     /**
      * 到站ID(DAYPLAN_TO_THE_STATION_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="到站ID",required=false)
-    private Integer dayplanToTheStationId;
+    private BigDecimal dayplanToTheStationId;
 
     /**
      * 移库单位ID(TRANSFER_UNIT_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="移库单位ID",required=false)
-    private Integer transferUnitId;
+    private BigDecimal transferUnitId;
 
     /**
      * 车皮数(DAYPLAN_WAGON_NUMBER,DECIMAL,38)
      */
     @ApiModelProperty(value="车皮数",required=false)
-    private Integer dayplanWagonNumber;
+    private BigDecimal dayplanWagonNumber;
 
     /**
      * 收货单位(RECEIVING_UNIT_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="收货单位",required=false)
-    private Integer receivingUnitId;
+    private BigDecimal receivingUnitId;
 
     /**
      * 收货人(DAYPLAN_CONSIGNEE_NAME,VARCHAR,20)
@@ -103,7 +106,7 @@ public class AmsRailOffsetDayplan implements IBasePO<Integer> {
      * 接收状态（0;未接收，1：已接收）(DAYPLAN_RECEIVE_STATUS,DECIMAL,38)
      */
     @ApiModelProperty(value="接收状态（0;未接收，1：已接收）",required=false)
-    private Integer dayplanReceiveStatus;
+    private BigDecimal dayplanReceiveStatus;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -135,23 +138,38 @@ public class AmsRailOffsetDayplan implements IBasePO<Integer> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    
+    public List<Map<String, Object>> getMapList() {
+        return mapList;
+    }
+
+    public void setMapList(List<Map<String, Object>> mapList) {
+        this.mapList = mapList;
+    }
+
+    /**
+     * 物资信息列表
+     */
+    @TableField(exist = false)
+    private List<Map<String, Object>> mapList;
+    
     private static final long serialVersionUID = 1L;
 
     @Override
-    public Integer getId() {
+    public BigDecimal getId() {
         return this.dayplanId;
     }
 
     @Override
-    public void setId(Integer dayplanId) {
+    public void setId(BigDecimal dayplanId) {
         this.dayplanId = dayplanId;
     }
 
-    public Integer getDayplanId() {
+    public BigDecimal getDayplanId() {
         return dayplanId;
     }
 
-    public void setDayplanId(Integer dayplanId) {
+    public void setDayplanId(BigDecimal dayplanId) {
         this.dayplanId = dayplanId;
     }
 
@@ -171,11 +189,11 @@ public class AmsRailOffsetDayplan implements IBasePO<Integer> {
         this.dayplanDate = dayplanDate;
     }
 
-    public Integer getShipperId() {
+    public BigDecimal getShipperId() {
         return shipperId;
     }
 
-    public void setShipperId(Integer shipperId) {
+    public void setShipperId(BigDecimal shipperId) {
         this.shipperId = shipperId;
     }
 
@@ -187,51 +205,51 @@ public class AmsRailOffsetDayplan implements IBasePO<Integer> {
         this.dayplanDeliveryDate = dayplanDeliveryDate;
     }
 
-    public Integer getDayplanOwnCarsAmout() {
+    public BigDecimal getDayplanOwnCarsAmout() {
         return dayplanOwnCarsAmout;
     }
 
-    public void setDayplanOwnCarsAmout(Integer dayplanOwnCarsAmout) {
+    public void setDayplanOwnCarsAmout(BigDecimal dayplanOwnCarsAmout) {
         this.dayplanOwnCarsAmout = dayplanOwnCarsAmout;
     }
 
-    public Integer getDayplanDedicatedLineId() {
+    public BigDecimal getDayplanDedicatedLineId() {
         return dayplanDedicatedLineId;
     }
 
-    public void setDayplanDedicatedLineId(Integer dayplanDedicatedLineId) {
+    public void setDayplanDedicatedLineId(BigDecimal dayplanDedicatedLineId) {
         this.dayplanDedicatedLineId = dayplanDedicatedLineId;
     }
 
-    public Integer getDayplanToTheStationId() {
+    public BigDecimal getDayplanToTheStationId() {
         return dayplanToTheStationId;
     }
 
-    public void setDayplanToTheStationId(Integer dayplanToTheStationId) {
+    public void setDayplanToTheStationId(BigDecimal dayplanToTheStationId) {
         this.dayplanToTheStationId = dayplanToTheStationId;
     }
 
-    public Integer getTransferUnitId() {
+    public BigDecimal getTransferUnitId() {
         return transferUnitId;
     }
 
-    public void setTransferUnitId(Integer transferUnitId) {
+    public void setTransferUnitId(BigDecimal transferUnitId) {
         this.transferUnitId = transferUnitId;
     }
 
-    public Integer getDayplanWagonNumber() {
+    public BigDecimal getDayplanWagonNumber() {
         return dayplanWagonNumber;
     }
 
-    public void setDayplanWagonNumber(Integer dayplanWagonNumber) {
+    public void setDayplanWagonNumber(BigDecimal dayplanWagonNumber) {
         this.dayplanWagonNumber = dayplanWagonNumber;
     }
 
-    public Integer getReceivingUnitId() {
+    public BigDecimal getReceivingUnitId() {
         return receivingUnitId;
     }
 
-    public void setReceivingUnitId(Integer receivingUnitId) {
+    public void setReceivingUnitId(BigDecimal receivingUnitId) {
         this.receivingUnitId = receivingUnitId;
     }
 
@@ -251,11 +269,11 @@ public class AmsRailOffsetDayplan implements IBasePO<Integer> {
         this.dayplanConsigneeTel = dayplanConsigneeTel == null ? null : dayplanConsigneeTel.trim();
     }
 
-    public Integer getDayplanReceiveStatus() {
+    public BigDecimal getDayplanReceiveStatus() {
         return dayplanReceiveStatus;
     }
 
-    public void setDayplanReceiveStatus(Integer dayplanReceiveStatus) {
+    public void setDayplanReceiveStatus(BigDecimal dayplanReceiveStatus) {
         this.dayplanReceiveStatus = dayplanReceiveStatus;
     }
 

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

@@ -0,0 +1,184 @@
+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;
+
+@ApiModel(value="发运钢材到异地库物资中间表")
+public class AmsRailOffsetMaterial implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(OFFSET_MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal offsetMaterialId;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 物资件数(OFFSET_MATERIAL_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资件数",required=false)
+    private BigDecimal offsetMaterialNumber;
+
+    /**
+     * 物资理重(OFFSET_MATERIAL_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资理重",required=false)
+    private BigDecimal offsetMaterialWeight;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 发运计划id(DAYPLAN_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="发运计划id",required=false)
+    private BigDecimal dayplanId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.offsetMaterialId;
+    }
+
+    @Override
+    public void setId(BigDecimal offsetMaterialId) {
+        this.offsetMaterialId = offsetMaterialId;
+    }
+
+    public BigDecimal getOffsetMaterialId() {
+        return offsetMaterialId;
+    }
+
+    public void setOffsetMaterialId(BigDecimal offsetMaterialId) {
+        this.offsetMaterialId = offsetMaterialId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getOffsetMaterialNumber() {
+        return offsetMaterialNumber;
+    }
+
+    public void setOffsetMaterialNumber(BigDecimal offsetMaterialNumber) {
+        this.offsetMaterialNumber = offsetMaterialNumber;
+    }
+
+    public BigDecimal getOffsetMaterialWeight() {
+        return offsetMaterialWeight;
+    }
+
+    public void setOffsetMaterialWeight(BigDecimal offsetMaterialWeight) {
+        this.offsetMaterialWeight = offsetMaterialWeight;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDayplanId() {
+        return dayplanId;
+    }
+
+    public void setDayplanId(BigDecimal dayplanId) {
+        this.dayplanId = dayplanId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", offsetMaterialId=").append(offsetMaterialId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", offsetMaterialNumber=").append(offsetMaterialNumber);
+        sb.append(", offsetMaterialWeight=").append(offsetMaterialWeight);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", dayplanId=").append(dayplanId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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/AmstruckRailDayplan.java

@@ -40,10 +40,10 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
     private String dayplanDeliveryPlace;
 
     /**
-     * 收货单位(DAYPLAN_RECEIVE_UNIT,VARCHAR,20)
+     * 收货单位ID(DAYPLAN_RECEIVE_UNIT,DECIMAL,20)
      */
-    @ApiModelProperty(value="收货单位",required=false)
-    private String dayplanReceiveUnit;
+    @ApiModelProperty(value="收货单位ID",required=false)
+    private BigDecimal dayplanReceiveUnit;
 
     /**
      * 发货日期(DAYPLAN_DELIVERY_DATE,TIMESTAMP,7)
@@ -61,25 +61,12 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
      * 物资重量(DAYPLAN_MATERIAL_WEIGHT,DECIMAL,0)
      */
     @ApiModelProperty(value="物资重量",required=false)
-    private Short dayplanMaterialWeight;
+    private BigDecimal dayplanMaterialWeight;
 
     /**
-     * 承运商ID(DAYPLAN_MATERIAL_WEIGHT,DECIMAL,0)
+     * 接收状态（0：未接收/已下发；1：接收）2为未下发  3为逻辑删除(DAYPLAN_RECEIVE_STATUS,DECIMAL,38)
      */
-    @ApiModelProperty(value="承运商ID",required=false)
-    private BigDecimal carrierId;
-
-    public BigDecimal getCarrierId() {
-        return carrierId;
-    }
-
-    public void setCarrierId(BigDecimal carrierId) {
-        this.carrierId = carrierId;
-    }
-    /**
-     * 接收状态（0：未接收；1：接收）(DAYPLAN_RECEIVE_STATUS,DECIMAL,38)
-     */
-    @ApiModelProperty(value="接收状态（0：未接收；1：接收）",required=false)
+    @ApiModelProperty(value="接收状态（0：未接收/已下发；1：接收）2为未下发  3为逻辑删除",required=false)
     private BigDecimal dayplanReceiveStatus;
 
     /**
@@ -112,6 +99,12 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 承运商ID(CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运商ID",required=false)
+    private BigDecimal carrierId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -164,12 +157,12 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
         this.dayplanDeliveryPlace = dayplanDeliveryPlace == null ? null : dayplanDeliveryPlace.trim();
     }
 
-    public String getDayplanReceiveUnit() {
+    public BigDecimal getDayplanReceiveUnit() {
         return dayplanReceiveUnit;
     }
 
-    public void setDayplanReceiveUnit(String dayplanReceiveUnit) {
-        this.dayplanReceiveUnit = dayplanReceiveUnit == null ? null : dayplanReceiveUnit.trim();
+    public void setDayplanReceiveUnit(BigDecimal dayplanReceiveUnit) {
+        this.dayplanReceiveUnit = dayplanReceiveUnit;
     }
 
     public Date getDayplanDeliveryDate() {
@@ -188,11 +181,11 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
         this.materialId = materialId;
     }
 
-    public Short getDayplanMaterialWeight() {
+    public BigDecimal getDayplanMaterialWeight() {
         return dayplanMaterialWeight;
     }
 
-    public void setDayplanMaterialWeight(Short dayplanMaterialWeight) {
+    public void setDayplanMaterialWeight(BigDecimal dayplanMaterialWeight) {
         this.dayplanMaterialWeight = dayplanMaterialWeight;
     }
 
@@ -244,7 +237,13 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
 
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
 
     @Override
     public String toString() {
@@ -267,6 +266,7 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", carrierId=").append(carrierId);
         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/IAmsDispatchSaleOrderService.java

@@ -54,4 +54,11 @@ public interface IAmsDispatchSaleOrderService{
 
     //pc端，展示已经接收到了承运商的订单
     List<Map<String,Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> map);
+
+    /**
+     * 查询PC端公开抢单
+     * @param mapValue
+     * @return
+     */
+    List<Map<String, Object>> getPCDispatchSaleOrderList(Map<String, Object> mapValue);
 }

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

@@ -24,4 +24,6 @@ public interface IAmsPurchaseOrderService {
      * @return
      */
     BigDecimal selectMaxId();
+
+    List<Map<String, Object>> getAppPurchaseOrderList(Integer carrierId);
 }

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/IAmstruckRailDayplanService.java

@@ -38,4 +38,7 @@ public interface IAmstruckRailDayplanService extends IBaseService<AmstruckRailDa
 
     //查询所有到站信息
     List<Map<String, Object>> getArriveName();
+
+    //通过发运计划Id查询修改信息
+    List<Map<String, Object>> getDayPlanByDayPlanId(Integer dayplanId);
 }

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

@@ -167,6 +167,95 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         }
         for (Map<String, Object> map : mapList) {
             BigDecimal dispatchId = (BigDecimal) map.get("dispatchId");
+            List<BigDecimal> orderIdList = amsDispatchSaleOrderMapper.getNullOrNotNull(dispatchId);
+            if (orderIdList != null || orderIdList.size() != 0) {
+                mapList.remove(map);
+            }
+            List<Map<String, Object>> materialMessages = amsDispatchSaleOrderMapper.getMaterialMessages(dispatchId);
+            String allMaterialName = "";
+            String allMaterialNumber = "";
+            String allMaterialTheoreticalWeight = "";
+            String allMaterialSpecificationModel = "";
+            if (materialMessages != null) {
+                for (Map<String, Object> materialMap : materialMessages) {
+                    if (materialMap != null) {
+                        String materialName = (String) materialMap.get("materialName");
+                        allMaterialName += materialName + "/";
+                        String materialTheoreticalWeight = materialMap.get("materialTheoreticalWeight").toString();
+                        if (materialTheoreticalWeight != null) {
+                            allMaterialTheoreticalWeight += materialTheoreticalWeight + "/";
+                        }
+                        String saleOrderMaterialNumber = materialMap.get("saleOrderMaterialNumber").toString();
+                        allMaterialNumber += saleOrderMaterialNumber + "/";
+                        String specificationModel = materialMap.get("specificationModel").toString();
+                        if (specificationModel != null) {
+                            allMaterialSpecificationModel += specificationModel + "/";
+                        }
+                    }
+                }
+                String subMaterialName = null;
+                String subMaterialNumber = null;
+                String subMaterialTheoreticalWeight = null;
+                String subMaterialSpecificationModel = null;
+                if (allMaterialName.length() >= 2) {
+                    subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+                }
+                if (allMaterialName.length() < 2) {
+                    subMaterialName = allMaterialName;
+                }
+                if (allMaterialNumber.length() >= 2) {
+                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+                }
+                if (allMaterialNumber.length() < 2) {
+                    subMaterialNumber = allMaterialNumber;
+                }
+                if (allMaterialTheoreticalWeight.length() >= 2) {
+                    subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
+                }
+                if (allMaterialTheoreticalWeight.length() < 2) {
+                    subMaterialTheoreticalWeight = allMaterialTheoreticalWeight;
+                }
+                if (allMaterialSpecificationModel.length() >= 2) {
+                    subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+                }
+                if (allMaterialSpecificationModel.length() < 2) {
+                    subMaterialSpecificationModel = allMaterialSpecificationModel;
+                }
+                map.put("allMaterialName",subMaterialName);
+                map.put("allMaterialNumber",subMaterialNumber);
+                map.put("allMaterialTheoreticalWeight",subMaterialTheoreticalWeight);
+                map.put("allMaterialSpecificationModel",subMaterialSpecificationModel);
+            }
+//            // 将已经清空的map里面put进一个map和一个list<Map>
+//            map.put("materialMessages",materialMessages);
+//            map.put("saleMap",saleMap);
+            else {
+                map.put("allMaterialName",allMaterialName);
+                map.put("allMaterialNumber",allMaterialNumber);
+                map.put("allMaterialTheoreticalWeight",allMaterialTheoreticalWeight);
+                map.put("allMaterialSpecificationModel",allMaterialSpecificationModel);
+            }
+        }
+        return mapList;
+    }
+
+    /**
+     * 展示pc端司机已经抢到的订单
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
+        List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(mapValue);
+        if (mapList == null) {
+            return null;
+        }
+        for (Map<String, Object> map : mapList) {
+            BigDecimal dispatchId = (BigDecimal) map.get("dispatchId");
+            List<BigDecimal> orderIdList = amsDispatchSaleOrderMapper.getNullOrNotNull(dispatchId);
+            if (orderIdList != null || orderIdList.size() != 0) {
+                mapList.remove(map);
+            }
             List<Map<String, Object>> materialMessages = amsDispatchSaleOrderMapper.getMaterialMessages(dispatchId);
             String allMaterialName = "";
             String allMaterialNumber = "";
@@ -235,8 +324,84 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         return mapList;
     }
 
+    /**
+     * 查询PC端公开抢单
+     * @param mapValue
+     * @return
+     */
     @Override
-    public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> map) {
-        return amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(map);
+    public List<Map<String, Object>> getPCDispatchSaleOrderList(Map<String, Object> mapValue) {
+        List<Map<String, Object>> dispatchSaleOrderList = amsDispatchSaleOrderMapper.getPCDispatchSaleOrderList(mapValue);
+        for (Map<String,Object> map: dispatchSaleOrderList) {
+//            Date dispatchDealTime = (Date) map.get("dispatchDealTime");
+            BigDecimal dispatchId = (BigDecimal) map.get("dispatchId");
+//            String isDeal;
+//            if (dispatchDealTime == null) {
+//                isDeal = "已成交";
+//            }
+//            else {
+//                isDeal = "未成交";
+//            }
+//            map.put("isDeal",isDeal);
+//            // 先把map中的key-value放到新的saleMap里面
+//            Map<String,Object> saleMap = new HashMap<>();
+//            saleMap.putAll(map);
+            // 使用Map清空工具迭代删除map中的所有key-value
+//            MapRemoveUtil.removeMap(map);
+            List<Map<String, Object>> materialMessages = amsDispatchSaleOrderMapper.getMaterialMessages(dispatchId);
+            String allMaterialName = "";
+            String allMaterialNumber = "";
+            String allMaterialTheoreticalWeight = "";
+            String allMaterialSpecificationModel = "";
+            for (Map<String,Object> materialMap : materialMessages) {
+                if (materialMap != null) {
+                    String materialName = (String) materialMap.get("materialName");
+                    allMaterialName += materialName + "/";
+                    String materialTheoreticalWeight = materialMap.get("materialTheoreticalWeight").toString();
+                    if (materialTheoreticalWeight != null) {
+                        allMaterialTheoreticalWeight += materialTheoreticalWeight + "/";
+                    }
+                    String saleOrderMaterialNumber = materialMap.get("saleOrderMaterialNumber").toString();
+                    allMaterialNumber += saleOrderMaterialNumber + "/";
+                    String specificationModel = materialMap.get("specificationModel").toString();
+                    if (specificationModel != null) {
+                        allMaterialSpecificationModel += specificationModel + "/";
+                    }
+                }
+            }
+            String subMaterialName = null;
+            String subMaterialNumber = null;
+            String subMaterialTheoreticalWeight = null;
+            String subMaterialSpecificationModel = null;
+            if (allMaterialName.length() >= 2) {
+                subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+            }
+            if (allMaterialName.length() < 2) {
+                subMaterialName = allMaterialName;
+            }
+            if (allMaterialNumber.length() >= 2) {
+                subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+            }
+            if (allMaterialNumber.length() < 2) {
+                subMaterialNumber = allMaterialNumber;
+            }
+            if (allMaterialTheoreticalWeight.length() >= 2) {
+                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
+            }
+            if (allMaterialTheoreticalWeight.length() < 2) {
+                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight;
+            }
+            if (allMaterialSpecificationModel.length() >= 2) {
+                subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+            }
+            if (allMaterialSpecificationModel.length() < 2) {
+                subMaterialSpecificationModel = allMaterialSpecificationModel;
+            }
+            map.put("allMaterialName",subMaterialName);
+            map.put("allMaterialNumber",subMaterialNumber);
+            map.put("allMaterialTheoreticalWeight",subMaterialTheoreticalWeight);
+            map.put("allMaterialSpecificationModel",subMaterialSpecificationModel);
+        }
+        return dispatchSaleOrderList;
     }
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsPurchaseOrderMapper;
 import com.steerinfo.dil.service.IAmsPurchaseOrderService;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,4 +40,9 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
     public BigDecimal selectMaxId() {
         return amsPurchaseOrderMapper.selectPurchaseId();
     }
+
+    @Override
+    public List<Map<String, Object>> getAppPurchaseOrderList(Integer carrierId) {
+        return amsPurchaseOrderMapper.getAppPurchaseOrderList(carrierId);
+    }
 }

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

@@ -2,8 +2,11 @@ package com.steerinfo.dil.service.impl;
 
 
 import com.steerinfo.dil.mapper.AmsRailOffsetDayplanMapper;
+import com.steerinfo.dil.mapper.AmsRailOffsetMaterialMapper;
 import com.steerinfo.dil.model.AmsRailOffsetDayplan;
+import com.steerinfo.dil.model.AmsRailOffsetMaterial;
 import com.steerinfo.dil.service.IAmsRailOffsetDayplanService;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,9 @@ public class AmsRailOffsetDayplanServiceImpl extends BaseServiceImpl<AmsRailOffs
     @Autowired
     private AmsRailOffsetDayplanMapper amsRailOffsetDayplanMapper;
 
+    @Autowired
+    private AmsRailOffsetMaterialMapper amsRailOffsetMaterialMapper;
+
     @Override
     protected IBaseMapper<AmsRailOffsetDayplan, BigDecimal> getMapper() {
         return amsRailOffsetDayplanMapper;
@@ -44,23 +50,43 @@ public class AmsRailOffsetDayplanServiceImpl extends BaseServiceImpl<AmsRailOffs
      */
     @Override
     public Integer selectMaxId() {
-
-        return amsRailOffsetDayplanMapper.selectOtherId();
+        return amsRailOffsetDayplanMapper.selectMaxId();
     }
 
     public List<Map<String, Object>> getRailOffsetDayplan(Map<String, Object> mapValue) {
         return amsRailOffsetDayplanMapper.getRailOffsetDayplan(mapValue);
     }
+
+    /**
+     * 新增发运钢材到异地库计划
+     * @param amsRailOffsetDayplan
+     * @return
+     */
     @Override
     public int insert(AmsRailOffsetDayplan amsRailOffsetDayplan) {
-        amsRailOffsetDayplan.setDayplanId(selectMaxId());
+        Integer id = selectMaxId();
+        amsRailOffsetDayplan.setDayplanId(new BigDecimal(id));
+        //遍历物资列表添加所有发运计划物资中间表
+        List<Map<String, Object>> mapList = amsRailOffsetDayplan.getMapList();
+        for (Map<String, Object> map : mapList) {
+            AmsRailOffsetMaterial amsRailOffsetMaterial = new AmsRailOffsetMaterial();
+            amsRailOffsetMaterial.setId(amsRailOffsetMaterialMapper.selectMaxId());
+            //设置发运计划ID
+            amsRailOffsetMaterial.setDayplanId(new BigDecimal(id));
+            amsRailOffsetMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+            amsRailOffsetMaterial.setOffsetMaterialWeight(DataChange.dataToBigDecimal(map.get("offsetMaterialWeight")));
+            amsRailOffsetMaterial.setOffsetMaterialNumber(DataChange.dataToBigDecimal(map.get("offsetMaterialNumber")));
+            amsRailOffsetMaterial.setInsertTime(new Date());
+            amsRailOffsetMaterial.setInsertUsername("admin");
+            amsRailOffsetMaterialMapper.updateByPrimaryKeySelective(amsRailOffsetMaterial);
+        }
         amsRailOffsetDayplan.setInsertTime(new Date());
-        amsRailOffsetDayplan.setUpdateTime(new Date());
         amsRailOffsetDayplan.setInsertUsername("admin");
-        amsRailOffsetDayplan.setUpdateUsername("admin");
         return amsRailOffsetDayplanMapper.insertSelective(amsRailOffsetDayplan);
     }
 
+
+
     public int update(AmsRailOffsetDayplan amsRailOffsetDayplan) {
         return amsRailOffsetDayplanMapper.updateByPrimaryKey(amsRailOffsetDayplan);
     }

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/java/com/steerinfo/dil/service/impl/AmstruckRailDayplanServiceImpl.java

@@ -4,6 +4,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.AmstruckRailDayplanMapper;
 import com.steerinfo.dil.model.AmstruckRailDayplan;
 import com.steerinfo.dil.service.IAmstruckRailDayplanService;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +55,13 @@ public class AmstruckRailDayplanServiceImpl extends BaseServiceImpl<AmstruckRail
     }
     @Override
     public int insert(AmstruckRailDayplan amstruckRailDayplan) {
-        amstruckRailDayplan.setDayplanId(selectMaxId());
+        BigDecimal maxId = selectMaxId();
+        amstruckRailDayplan.setDayplanId(maxId);
+        //生成发运计划号
+        String dayPlanNo = DataChange.generateEightDigitsNumber("FYJH", maxId.intValue());
+        amstruckRailDayplan.setDayplanNo(dayPlanNo);
+        //2为未下发
+        amstruckRailDayplan.setDayplanReceiveStatus(new BigDecimal(2));
         amstruckRailDayplan.setInsertTime(new Date());
         amstruckRailDayplan.setUpdateTime(new Date());
         amstruckRailDayplan.setInsertUsername("admin");
@@ -80,4 +87,14 @@ public class AmstruckRailDayplanServiceImpl extends BaseServiceImpl<AmstruckRail
     public List<Map<String, Object>> getArriveName() {
         return amstruckRailDayplanMapper.getArriveName();
     }
+
+    /**
+     * 通过发运计划Id查询信息
+     * @param dayplanId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getDayPlanByDayPlanId(Integer dayplanId) {
+        return amstruckRailDayplanMapper.getDayPlanByDayPlanId(dayplanId);
+    }
 }

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

@@ -467,32 +467,31 @@
     <!-- 查询app端已抢的销售订单 -->
     <select id="getLockDispatchSaleOrderList" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT ADSO.DISPATCH_ID                  AS "dispatchId",
-               ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
+               aaaa.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
                ASO.SALE_NUMBER                   AS "saleNumber",
                ADSO.DISPATCH_DEAL_TIME           AS "dispatchDealTime",
                RSH.SHIPPER_NAME                  AS "shipperName",
                RC.CONSIGNEE_COMPANY_NAME         AS "consigneeCompanyName",
                RRA.ADDRESS_DELIVERY_ADDRESS      AS "addressDeliveryAddress",
-               ASOM.SALE_ORDER_CONSIGNEE         AS "saleOrderConsignee",
-               ASOM.SALE_ORDER_CONSIGNEE_TEL     AS "saleOrderConsigneeTel",
+               aaaa.SALE_ORDER_CONSIGNEE         AS "saleOrderConsignee",
+               aaaa.SALE_ORDER_CONSIGNEE_TEL     AS "saleOrderConsigneeTel",
                RCA.CARRIER_NAME                  AS "carrierName"
+
         FROM AMS_DISPATCH_SALE_ORDER ADSO
-                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-                 LEFT JOIN AMS_SALE_ORDER ASO
-                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                 LEFT JOIN RMS_SHIPPER RSH
-                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
-                 LEFT JOIN RMS_CONSIGNEE RC
-                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
-                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
-                           ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
-                 LEFT JOIN RMS_CARRIER RCA
-                           ON RCA.CARRIER_ID = ADSO.CARRIER_ID
+                 LEFT JOIN (SELECT *
+                            FROM AMS_SALE_ORDER_MATERIAL asom
+                                     LEFT JOIN OMSTRUCK_ORDER oo ON asom.SALE_ORDER_MATERIAL_ID = oo.ORDER_PLAN_ID
+                            WHERE oo.ORDER_PLAN_ID IS NULL) aaaa
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = aaaa.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = aaaa.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON aaaa.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+                 LEFT JOIN RMS_CARRIER RCA ON RCA.CARRIER_ID = ADSO.CARRIER_ID
         WHERE ADSO.DISPATCH_STATUS = 0
           AND ADSO.CARRIER_ID = #{carrierId}
     </select>
-    <!-- pc端公开抢单界面显示   -->
+    <!-- 展示已经接收到了承运商的订单   -->
     <select id="getLockDispatchSaleOrderListForPc" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT ADSO.DISPATCH_ID                  AS "dispatchId",
                ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
@@ -518,6 +517,104 @@
                  LEFT JOIN RMS_CARRIER RCA
                            ON RCA.CARRIER_ID = ADSO.CARRIER_ID
         WHERE ADSO.DISPATCH_STATUS = 0
-          and ADSO.DISPATCH_TYPE = 1
+          AND ADSO.CARRIER_ID = #{carrierId}
     </select>
+
+    <select id="getNullOrNotNull" parameterType="DECIMAL" resultType="java.util.List">
+        SELECT OO.ORDER_ID AS "orderId"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
+    <!-- 查询PC端公开抢单 -->
+    <select id="getPCDispatchSaleOrderList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT ADSO.DISPATCH_ID AS "dispatchId",
+        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
+        ASO.SALE_NUMBER AS "saleNumber",
+        ADSO.DISPATCH_DEAL_TIME AS "dispatchDealTime",
+        RSH.SHIPPER_NAME AS "shipperName",
+        RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+        RRA.ADDRESS_DELIVERY_ADDRESS AS "addressDeliveryAddress",
+        ASOM.SALE_ORDER_CONSIGNEE AS "saleOrderConsignee",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
+        ADSO.INSERT_TIME AS "insertTime"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RSH
+        ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC
+        ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+        WHERE ADSO.DISPATCH_TYPE = #{dispatchType}
+        AND ADSO.DISPATCH_STATUS = 1
+        )
+        <where>
+            <if test="saleOrderMaterialTruckNo != null">
+                and
+                <foreach collection="saleOrderMaterialTruckNo" item="item" open="(" separator="or" close=")">
+                    "saleOrderMaterialTruckNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                and
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" 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="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="addressDeliveryAddress != null">
+                and
+                <foreach collection="addressDeliveryAddress" item="item" open="(" separator="or" close=")">
+                    "addressDeliveryAddress" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleOrderConsignee != null">
+                and
+                <foreach collection="saleOrderConsignee" item="item" open="(" separator="or" close=")">
+                    "saleOrderConsignee" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleOrderConsigneeTel != null">
+                and
+                <foreach collection="saleOrderConsigneeTel" item="item" open="(" separator="or" close=")">
+                    "saleOrderConsigneeTel" 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>
+
 </mapper>

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

@@ -589,4 +589,7 @@
     </where>
      <include refid="orderByInsertTime"></include>
   </select>
+  <select id="getAppPurchaseOrderList" resultType="java.util.Map">
+    select * from AMS_PURCHASE_ORDER APO
+  </select>
 </mapper>

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

@@ -150,11 +150,6 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <!-- 得到最大id -->
-    <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(DAYPLAN_ID)
-        FROM ams_rail_offset_dayplan
-    </select>
 
     <!-- 展示钢材发往异地库日计划 -->
     <select id="getRailOffsetDayplan" parameterType="java.util.Map" resultType="java.util.Map">
@@ -178,4 +173,31 @@ left join rmstrain_arrival_send ras on t.dayplan_to_the_station_id=ras.arrival_i
 left join rms_consignee rc on t.receiving_unit_id =rc.consignee_id
 where t.dayplan_receive_status=0
     </select>
+
+<!--  通过主键Id查询发运钢材到异地库计划数据用于修改  -->
+    <select id="getRailOffseDayMes" parameterType="int" resultType="java.util.Map">
+        select
+               AROD.DAYPLAN_NO "dayplanNo",
+               AROD.CARRIER_ID "carrierId",
+               AROD.SHIPPER_ID "shipperId",
+               AROD.DAYPLAN_DATE "dayplanDate",
+               AROD.DAYPLAN_DELIVERY_DATE "dayplanDeliveryDate",
+               AROD.DAYPLAN_OWN_CARS_AMOUT "dayplanOwnCarsAmout",
+               AROD.DAYPLAN_TO_THE_STATION_ID "dayplanToTheStationId",
+               AROD.DAYPLAN_WAGON_NUMBER "dayplanWagonNumber",
+               AROD.RECEIVING_UNIT_ID "receivingUnitId",
+               AROD.DAYPLAN_CONSIGNEE_NAME "dayplanConsigneeName",
+               AROD.DAYPLAN_CONSIGNEE_TEL "dayplanConsigneeTel"
+        from AMS_RAIL_OFFSET_DAYPLAN AROD
+        where AROD.DAYPLAN_ID = #{dayplanId}
+    </select>
+
+<!--   通过发运计划主键查询关联所有物资信息 -->
+    <select id="getMaterialMesByDayPlanId"  parameterType="int" resultType="java.util.Map">
+        select OFFSET_MATERIAL_ID "offsetMaterialId",
+               OFFSET_MATERIAL_NUMBER "offsetMaterialNumber",
+               OFFSET_MATERIAL_WEIGHT "offsetMaterialWeight"
+        from AMS_RAIL_OFFSET_MATERIAL AROM
+        where DAYPLAN_ID = #{dayplanId}
+    </select>
 </mapper>

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

@@ -0,0 +1,346 @@
+<?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.AmsRailOffsetMaterialMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsRailOffsetMaterial">
+    <id column="OFFSET_MATERIAL_ID" jdbcType="DECIMAL" property="offsetMaterialId" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+    <result column="OFFSET_MATERIAL_NUMBER" jdbcType="DECIMAL" property="offsetMaterialNumber" />
+    <result column="OFFSET_MATERIAL_WEIGHT" jdbcType="DECIMAL" property="offsetMaterialWeight" />
+    <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="DAYPLAN_ID" jdbcType="DECIMAL" property="dayplanId" />
+  </resultMap>
+  <sql id="columns">
+    OFFSET_MATERIAL_ID, MATERIAL_ID, OFFSET_MATERIAL_NUMBER, OFFSET_MATERIAL_WEIGHT, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    DAYPLAN_ID
+  </sql>
+  <sql id="columns_alias">
+    t.OFFSET_MATERIAL_ID, t.MATERIAL_ID, t.OFFSET_MATERIAL_NUMBER, t.OFFSET_MATERIAL_WEIGHT, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.DAYPLAN_ID
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM AMS_RAIL_OFFSET_MATERIAL
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM AMS_RAIL_OFFSET_MATERIAL t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="offsetMaterialId != null">
+        and OFFSET_MATERIAL_ID = #{offsetMaterialId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="offsetMaterialNumber != null">
+        and OFFSET_MATERIAL_NUMBER = #{offsetMaterialNumber}
+      </if>
+      <if test="offsetMaterialWeight != null">
+        and OFFSET_MATERIAL_WEIGHT = #{offsetMaterialWeight}
+      </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="dayplanId != null">
+        and DAYPLAN_ID = #{dayplanId}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="offsetMaterialId != null">
+        and OFFSET_MATERIAL_ID = #{offsetMaterialId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="offsetMaterialNumber != null">
+        and OFFSET_MATERIAL_NUMBER = #{offsetMaterialNumber}
+      </if>
+      <if test="offsetMaterialWeight != null">
+        and OFFSET_MATERIAL_WEIGHT = #{offsetMaterialWeight}
+      </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="dayplanId != null">
+        and DAYPLAN_ID = #{dayplanId}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from AMS_RAIL_OFFSET_MATERIAL
+    where OFFSET_MATERIAL_ID = #{offsetMaterialId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMS_RAIL_OFFSET_MATERIAL
+    where 1!=1 
+      <if test="materialId != null">
+        or MATERIAL_ID = #{materialId}
+      </if>
+      <if test="offsetMaterialNumber != null">
+        or OFFSET_MATERIAL_NUMBER = #{offsetMaterialNumber}
+      </if>
+      <if test="offsetMaterialWeight != null">
+        or OFFSET_MATERIAL_WEIGHT = #{offsetMaterialWeight}
+      </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="dayplanId != null">
+        or DAYPLAN_ID = #{dayplanId}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsRailOffsetMaterial">
+    insert into AMS_RAIL_OFFSET_MATERIAL (OFFSET_MATERIAL_ID, MATERIAL_ID, OFFSET_MATERIAL_NUMBER, 
+      OFFSET_MATERIAL_WEIGHT, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DAYPLAN_ID)
+    values (#{offsetMaterialId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{offsetMaterialNumber,jdbcType=DECIMAL}, 
+      #{offsetMaterialWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{dayplanId,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsRailOffsetMaterial">
+    insert into AMS_RAIL_OFFSET_MATERIAL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="offsetMaterialId != null">
+        OFFSET_MATERIAL_ID,
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID,
+      </if>
+      <if test="offsetMaterialNumber != null">
+        OFFSET_MATERIAL_NUMBER,
+      </if>
+      <if test="offsetMaterialWeight != null">
+        OFFSET_MATERIAL_WEIGHT,
+      </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="dayplanId != null">
+        DAYPLAN_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="offsetMaterialId != null">
+        #{offsetMaterialId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialId != null">
+        #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="offsetMaterialNumber != null">
+        #{offsetMaterialNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="offsetMaterialWeight != null">
+        #{offsetMaterialWeight,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="dayplanId != null">
+        #{dayplanId,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsRailOffsetMaterial">
+    update AMS_RAIL_OFFSET_MATERIAL
+    set MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      OFFSET_MATERIAL_NUMBER = #{offsetMaterialNumber,jdbcType=DECIMAL},
+      OFFSET_MATERIAL_WEIGHT = #{offsetMaterialWeight,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},
+      DAYPLAN_ID = #{dayplanId,jdbcType=DECIMAL}
+    where OFFSET_MATERIAL_ID = #{offsetMaterialId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsRailOffsetMaterial">
+    update AMS_RAIL_OFFSET_MATERIAL
+    <set>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="offsetMaterialNumber != null">
+        OFFSET_MATERIAL_NUMBER = #{offsetMaterialNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="offsetMaterialWeight != null">
+        OFFSET_MATERIAL_WEIGHT = #{offsetMaterialWeight,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="dayplanId != null">
+        DAYPLAN_ID = #{dayplanId,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where OFFSET_MATERIAL_ID = #{offsetMaterialId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where OFFSET_MATERIAL_ID = #{offsetMaterialId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMS_RAIL_OFFSET_MATERIAL 
+      (OFFSET_MATERIAL_ID, 
+      MATERIAL_ID, OFFSET_MATERIAL_NUMBER, 
+      OFFSET_MATERIAL_WEIGHT, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DAYPLAN_ID)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.offsetMaterialId,jdbcType=DECIMAL}, 
+      #{item.materialId,jdbcType=DECIMAL}, #{item.offsetMaterialNumber,jdbcType=DECIMAL}, 
+      #{item.offsetMaterialWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.dayplanId,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update AMS_RAIL_OFFSET_MATERIAL
+     set
+       OFFSET_MATERIAL_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.offsetMaterialId,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+       </foreach>
+       ,OFFSET_MATERIAL_NUMBER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.offsetMaterialNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,OFFSET_MATERIAL_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.offsetMaterialWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DAYPLAN_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case OFFSET_MATERIAL_ID" close="end">
+          when #{item.offsetMaterialId,jdbcType=DECIMAL} then #{item.dayplanId,jdbcType=DECIMAL}
+       </foreach>
+     where OFFSET_MATERIAL_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.offsetMaterialId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMS_RAIL_OFFSET_MATERIAL
+    where OFFSET_MATERIAL_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

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

@@ -999,6 +999,7 @@
       CONSIGNEE_ID "value",
       CONSIGNEE_COMPANY_NAME "label"
     from RMS_CONSIGNEE
+    where rownum < 20
   </select>
 
 <!--  <select id="selectMaxId"  resultType="java.math.BigDecimal">-->
@@ -1158,24 +1159,55 @@
   </select>
   <!-- 展示所有销售公司已审核的销售订单 -->
   <select id="getSaleOrderList" parameterType="java.util.Map" resultType="java.util.Map">
-    select
-      adso.DISPATCH_ID "dispatchId",
-      asom.SALE_ORDER_MATERIAL_ID "orderMaterialId",
-      asom.sale_order_id as "saleOrderId",
-      aso.SALE_NUMBER "saleNumber",
-      asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
-      asom.sale_order_material_id,
-      rra.address_delivery_address as "addressDeliveryAddress",
-      asom.sale_date_of_receipt as "saleDateOfReceipt",
-      asom.sale_order_consignee as "saleOrderConsignee",
-      asom.sale_order_consignee_tel as "saleOrderConsigneeTel"
-    from ams_sale_order aso
-           join ams_sale_order_material asom
-               on aso.sale_order_id =asom.sale_order_id
-            left join AMS_DISPATCH_SALE_ORDER adso
-                on adso.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
-           left join rms_receive_address rra on asom.sale_shipping_address_id=rra.address_id
-    where aso.sale_order_status in (2, 4) and adso.DISPATCH_STATUS = #{status} and adso.DISPATCH_TYPE=0
+    select ADSO.DISPATCH_ID                                 "dispatchId",
+           ASOM.SALE_ORDER_ID                               "saleOrderId",
+           ASOM.SALE_ORDER_MATERIAL_ID                      "saleOrderMaterialId",
+           ASO.SALE_NUMBER                                  "saleNumber",
+           ASOM.SALE_ORDER_MATERIAL_TRUCK_NO                "saleOrderMaterialTruckNo",
+           CONCAT(CONCAT(CONCAT(ADDRESS_PROVINCE, ADDRESS_DISTRICT), ADDRESS_TOWN),
+                  ADDRESS_DELIVERY_ADDRESS)                 "addressDeliveryAddress",
+           TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'yyyy-mm-dd') "saleDateOfReceipt",
+           ASOM.SALE_ORDER_CONSIGNEE                        "saleOrderConsignee",
+           ASOM.SALE_ORDER_CONSIGNEE_TEL                    "saleOrderConsigneeTel",
+           RS.SHIPPER_NAME                                  "shipperName",
+           RC.CONSIGNEE_COMPANY_NAME                        "consigneeCompanyName",
+           ASO.SALE_ORDER_ISSELF_MENTION                    "saleOrderIsselfMention",
+           ADSO.DISPATCH_TIME                               "dispatchTime",
+           (
+             SELECT *
+             FROM (
+                    SELECT RM.MATERIAL_NAME
+                    FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+                    WHERE ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                    ORDER BY ASTM.TRUCKNO_MATERIAL_ID
+                  )
+             WHERE ROWNUM = 1
+           ) "materialName",
+           (
+             SELECT *
+             FROM (
+                    SELECT ASTM.MATERIAL_THEORETICAL_WEIGHT
+                    FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
+                    WHERE ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                    ORDER BY ASTM.TRUCKNO_MATERIAL_ID
+                  )
+             WHERE ROWNUM = 1
+             ) "weight"
+    FROM AMS_SALE_ORDER ASO
+           JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+           LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                     ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+           LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                     ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+           LEFT JOIN RMS_SHIPPER RS
+                     ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+           LEFT JOIN RMS_CONSIGNEE RC
+                     ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+    WHERE ASO.SALE_ORDER_STATUS IN (2, 4)
+      AND ADSO.DISPATCH_STATUS = #{status}
+      AND ADSO.DISPATCH_TYPE = 0
   </select>
 <!-- 销售公司查询已审核的销售订单 -->
   <select id="getSaleOrderListBySaleCompany" parameterType="java.util.Map" resultType="java.util.Map">
@@ -1318,12 +1350,7 @@
     select rc.carrier_id from rms_receive_address rra join rms_carrier rc on rra.address_town = rc.carrier_bid_area
     WHERE rra.address_id = #{param}
   </select>
- <!-- 获取到站id -->
-<!--  <select id="selectReciveId" resultType="java.util.LinkedHashMap">-->
-<!--    select -->
-<!--    from-->
-<!--    where-->
-<!--  </select>-->
+
 
   <select id="selectInfoBySaleOrderId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
     select distinct  ASO.SHIPPER_ID "shipperId",
@@ -1383,4 +1410,5 @@
     on ASOM.SALE_ORDER_MATERIAL_ID=ASTM.SALE_ORDER_MATERIAL_ID
     where  ASO.SALE_ORDER_ID=#{saleOrderId}
   </select>
+
 </mapper>

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>

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

@@ -493,8 +493,8 @@
             AP.PLAN_NO "planNo",
             RC.CARRIER_NAME "carrierName",
             AP.MATERIAL_TOTAL_WEIGHT "materialTotalWeight",
-            AP.PLAN_TRUCK_TIME "planTruckTime",
-            AP.PLAN_INCOMING_TIME "planIncomingTime"
+            to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd') "planTruckTime",
+            to_char(AP.PLAN_INCOMING_TIME. 'yyyy-mm-dd') "planIncomingTime"
         from AMSTRUCK_PURPLAN AP
         left join AMS_PURCHASE_ORDER APO
         on AP.BATCH_ID = APO.BATCH_ID

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

@@ -415,9 +415,9 @@
         AP.MATERIAL_TOTAL_WEIGHT "materialTotalWeight",
         APM.MATERIAL_ALLOCATED_WEIGHT "materialAllocatedWeight",
         APM.MATERIAL_UNALLOCATED_WEIGHT "materialUnallocatedWeight",
-        AP.PLAN_TRUCK_TIME "planTruckTime",
+        to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd') "planTruckTime",
         RM.MATERIAL_ID "materialId",
-        AP.PLAN_INCOMING_TIME "planIncomingTime",
+        to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
         AP.PLAN_ID "planId",
         AP.INSERT_TIME "insertTime"
         from AMSTRUCK_PURPLAN AP

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

@@ -7,7 +7,7 @@
     <result column="DAYPLAN_TRUCK_NUMBER" jdbcType="DECIMAL" property="dayplanTruckNumber" />
     <result column="SHIPMENT_UNIT_ID" jdbcType="DECIMAL" property="shipmentUnitId" />
     <result column="DAYPLAN_DELIVERY_PLACE" jdbcType="VARCHAR" property="dayplanDeliveryPlace" />
-    <result column="DAYPLAN_RECEIVE_UNIT" jdbcType="VARCHAR" property="dayplanReceiveUnit" />
+    <result column="DAYPLAN_RECEIVE_UNIT" jdbcType="DECIMAL" property="dayplanReceiveUnit" />
     <result column="DAYPLAN_DELIVERY_DATE" jdbcType="TIMESTAMP" property="dayplanDeliveryDate" />
     <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
     <result column="DAYPLAN_MATERIAL_WEIGHT" jdbcType="DECIMAL" property="dayplanMaterialWeight" />
@@ -17,18 +17,19 @@
     <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="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
   </resultMap>
   <sql id="columns">
     DAYPLAN_ID, DAYPLAN_NO, DAYPLAN_TRUCK_NUMBER, SHIPMENT_UNIT_ID, DAYPLAN_DELIVERY_PLACE, 
     DAYPLAN_RECEIVE_UNIT, DAYPLAN_DELIVERY_DATE, MATERIAL_ID, DAYPLAN_MATERIAL_WEIGHT, 
     DAYPLAN_RECEIVE_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK
+    INSERT_UPDATE_REMARK, CARRIER_ID
   </sql>
   <sql id="columns_alias">
     t.DAYPLAN_ID, t.DAYPLAN_NO, t.DAYPLAN_TRUCK_NUMBER, t.SHIPMENT_UNIT_ID, t.DAYPLAN_DELIVERY_PLACE, 
     t.DAYPLAN_RECEIVE_UNIT, t.DAYPLAN_DELIVERY_DATE, t.MATERIAL_ID, t.DAYPLAN_MATERIAL_WEIGHT, 
     t.DAYPLAN_RECEIVE_STATUS, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK
+    t.INSERT_UPDATE_REMARK, t.CARRIER_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM AMSTRUCK_RAIL_DAYPLAN
@@ -37,7 +38,7 @@
     SELECT <include refid="columns_alias"/> FROM AMSTRUCK_RAIL_DAYPLAN t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="dayplanId != null">
         and DAYPLAN_ID = #{dayplanId}
       </if>
@@ -53,7 +54,7 @@
       <if test="dayplanDeliveryPlace != null and dayplanDeliveryPlace != ''">
         and DAYPLAN_DELIVERY_PLACE = #{dayplanDeliveryPlace}
       </if>
-      <if test="dayplanReceiveUnit != null and dayplanReceiveUnit != ''">
+      <if test="dayplanReceiveUnit != null">
         and DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit}
       </if>
       <if test="dayplanDeliveryDate != null">
@@ -83,10 +84,13 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="dayplanId != null">
         and DAYPLAN_ID = #{dayplanId}
       </if>
@@ -102,8 +106,8 @@
       <if test="dayplanDeliveryPlace != null and dayplanDeliveryPlace != ''">
         and DAYPLAN_DELIVERY_PLACE LIKE '%${dayplanDeliveryPlace}%'
       </if>
-      <if test="dayplanReceiveUnit != null and dayplanReceiveUnit != ''">
-        and DAYPLAN_RECEIVE_UNIT LIKE '%${dayplanReceiveUnit}%'
+      <if test="dayplanReceiveUnit != null">
+        and DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit}
       </if>
       <if test="dayplanDeliveryDate != null">
         and TO_CHAR(DAYPLAN_DELIVERY_DATE,'yyyy-MM-dd') = #{dayplanDeliveryDate}
@@ -132,6 +136,9 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -140,63 +147,66 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMSTRUCK_RAIL_DAYPLAN
-    where 1!=1 
-      <if test="dayplanNo != null and dayplanNo != ''">
-        or DAYPLAN_NO = #{dayplanNo}
-      </if>
-      <if test="dayplanTruckNumber != null">
-        or DAYPLAN_TRUCK_NUMBER = #{dayplanTruckNumber}
-      </if>
-      <if test="shipmentUnitId != null">
-        or SHIPMENT_UNIT_ID = #{shipmentUnitId}
-      </if>
-      <if test="dayplanDeliveryPlace != null and dayplanDeliveryPlace != ''">
-        or DAYPLAN_DELIVERY_PLACE = #{dayplanDeliveryPlace}
-      </if>
-      <if test="dayplanReceiveUnit != null and dayplanReceiveUnit != ''">
-        or DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit}
-      </if>
-      <if test="dayplanDeliveryDate != null">
-        or TO_CHAR(DAYPLAN_DELIVERY_DATE,'yyyy-MM-dd') = '#{dayplanDeliveryDate}'
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
-      <if test="dayplanMaterialWeight != null">
-        or DAYPLAN_MATERIAL_WEIGHT = #{dayplanMaterialWeight}
-      </if>
-      <if test="dayplanReceiveStatus != null">
-        or DAYPLAN_RECEIVE_STATUS = #{dayplanReceiveStatus}
-      </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>
+    where 1!=1
+    <if test="dayplanNo != null and dayplanNo != ''">
+      or DAYPLAN_NO = #{dayplanNo}
+    </if>
+    <if test="dayplanTruckNumber != null">
+      or DAYPLAN_TRUCK_NUMBER = #{dayplanTruckNumber}
+    </if>
+    <if test="shipmentUnitId != null">
+      or SHIPMENT_UNIT_ID = #{shipmentUnitId}
+    </if>
+    <if test="dayplanDeliveryPlace != null and dayplanDeliveryPlace != ''">
+      or DAYPLAN_DELIVERY_PLACE = #{dayplanDeliveryPlace}
+    </if>
+    <if test="dayplanReceiveUnit != null">
+      or DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit}
+    </if>
+    <if test="dayplanDeliveryDate != null">
+      or TO_CHAR(DAYPLAN_DELIVERY_DATE,'yyyy-MM-dd') = '#{dayplanDeliveryDate}'
+    </if>
+    <if test="materialId != null">
+      or MATERIAL_ID = #{materialId}
+    </if>
+    <if test="dayplanMaterialWeight != null">
+      or DAYPLAN_MATERIAL_WEIGHT = #{dayplanMaterialWeight}
+    </if>
+    <if test="dayplanReceiveStatus != null">
+      or DAYPLAN_RECEIVE_STATUS = #{dayplanReceiveStatus}
+    </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="carrierId != null">
+      or CARRIER_ID = #{carrierId}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckRailDayplan">
-    insert into AMSTRUCK_RAIL_DAYPLAN (DAYPLAN_ID, DAYPLAN_NO, DAYPLAN_TRUCK_NUMBER, 
-      SHIPMENT_UNIT_ID, DAYPLAN_DELIVERY_PLACE, DAYPLAN_RECEIVE_UNIT, 
-      DAYPLAN_DELIVERY_DATE, MATERIAL_ID, DAYPLAN_MATERIAL_WEIGHT, 
-      DAYPLAN_RECEIVE_STATUS, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    values (#{dayplanId,jdbcType=DECIMAL}, #{dayplanNo,jdbcType=VARCHAR}, #{dayplanTruckNumber,jdbcType=DECIMAL}, 
-      #{shipmentUnitId,jdbcType=DECIMAL}, #{dayplanDeliveryPlace,jdbcType=VARCHAR}, #{dayplanReceiveUnit,jdbcType=VARCHAR}, 
-      #{dayplanDeliveryDate,jdbcType=TIMESTAMP}, #{materialId,jdbcType=DECIMAL}, #{dayplanMaterialWeight,jdbcType=DECIMAL}, 
-      #{dayplanReceiveStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}
-      )
+    insert into AMSTRUCK_RAIL_DAYPLAN (DAYPLAN_ID, DAYPLAN_NO, DAYPLAN_TRUCK_NUMBER,
+                                       SHIPMENT_UNIT_ID, DAYPLAN_DELIVERY_PLACE, DAYPLAN_RECEIVE_UNIT,
+                                       DAYPLAN_DELIVERY_DATE, MATERIAL_ID, DAYPLAN_MATERIAL_WEIGHT,
+                                       DAYPLAN_RECEIVE_STATUS, INSERT_USERNAME, INSERT_TIME,
+                                       UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                       CARRIER_ID)
+    values (#{dayplanId,jdbcType=DECIMAL}, #{dayplanNo,jdbcType=VARCHAR}, #{dayplanTruckNumber,jdbcType=DECIMAL},
+            #{shipmentUnitId,jdbcType=DECIMAL}, #{dayplanDeliveryPlace,jdbcType=VARCHAR}, #{dayplanReceiveUnit,jdbcType=DECIMAL},
+            #{dayplanDeliveryDate,jdbcType=TIMESTAMP}, #{materialId,jdbcType=DECIMAL}, #{dayplanMaterialWeight,jdbcType=DECIMAL},
+            #{dayplanReceiveStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+            #{carrierId,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckRailDayplan">
     insert into AMSTRUCK_RAIL_DAYPLAN
@@ -246,6 +256,9 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
+      <if test="carrierId != null">
+        CARRIER_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="dayplanId != null">
@@ -264,7 +277,7 @@
         #{dayplanDeliveryPlace,jdbcType=VARCHAR},
       </if>
       <if test="dayplanReceiveUnit != null">
-        #{dayplanReceiveUnit,jdbcType=VARCHAR},
+        #{dayplanReceiveUnit,jdbcType=DECIMAL},
       </if>
       <if test="dayplanDeliveryDate != null">
         #{dayplanDeliveryDate,jdbcType=TIMESTAMP},
@@ -293,24 +306,28 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="carrierId != null">
+        #{carrierId,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckRailDayplan">
     update AMSTRUCK_RAIL_DAYPLAN
     set DAYPLAN_NO = #{dayplanNo,jdbcType=VARCHAR},
-      DAYPLAN_TRUCK_NUMBER = #{dayplanTruckNumber,jdbcType=DECIMAL},
-      SHIPMENT_UNIT_ID = #{shipmentUnitId,jdbcType=DECIMAL},
-      DAYPLAN_DELIVERY_PLACE = #{dayplanDeliveryPlace,jdbcType=VARCHAR},
-      DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit,jdbcType=VARCHAR},
-      DAYPLAN_DELIVERY_DATE = #{dayplanDeliveryDate,jdbcType=TIMESTAMP},
-      MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      DAYPLAN_MATERIAL_WEIGHT = #{dayplanMaterialWeight,jdbcType=DECIMAL},
-      DAYPLAN_RECEIVE_STATUS = #{dayplanReceiveStatus,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}
+        DAYPLAN_TRUCK_NUMBER = #{dayplanTruckNumber,jdbcType=DECIMAL},
+        SHIPMENT_UNIT_ID = #{shipmentUnitId,jdbcType=DECIMAL},
+        DAYPLAN_DELIVERY_PLACE = #{dayplanDeliveryPlace,jdbcType=VARCHAR},
+        DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit,jdbcType=DECIMAL},
+        DAYPLAN_DELIVERY_DATE = #{dayplanDeliveryDate,jdbcType=TIMESTAMP},
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+        DAYPLAN_MATERIAL_WEIGHT = #{dayplanMaterialWeight,jdbcType=DECIMAL},
+        DAYPLAN_RECEIVE_STATUS = #{dayplanReceiveStatus,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},
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
     where DAYPLAN_ID = #{dayplanId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckRailDayplan">
@@ -329,7 +346,7 @@
         DAYPLAN_DELIVERY_PLACE = #{dayplanDeliveryPlace,jdbcType=VARCHAR},
       </if>
       <if test="dayplanReceiveUnit != null">
-        DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit,jdbcType=VARCHAR},
+        DAYPLAN_RECEIVE_UNIT = #{dayplanReceiveUnit,jdbcType=DECIMAL},
       </if>
       <if test="dayplanDeliveryDate != null">
         DAYPLAN_DELIVERY_DATE = #{dayplanDeliveryDate,jdbcType=TIMESTAMP},
@@ -358,6 +375,9 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="carrierId != null">
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+      </if>
     </set>
     where DAYPLAN_ID = #{dayplanId,jdbcType=DECIMAL}
   </update>
@@ -374,100 +394,104 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into AMSTRUCK_RAIL_DAYPLAN 
-      (DAYPLAN_ID, 
-      DAYPLAN_NO, DAYPLAN_TRUCK_NUMBER, 
-      SHIPMENT_UNIT_ID, DAYPLAN_DELIVERY_PLACE, 
-      DAYPLAN_RECEIVE_UNIT, DAYPLAN_DELIVERY_DATE, 
-      MATERIAL_ID, DAYPLAN_MATERIAL_WEIGHT, 
-      DAYPLAN_RECEIVE_STATUS, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.dayplanId,jdbcType=DECIMAL}, 
-      #{item.dayplanNo,jdbcType=VARCHAR}, #{item.dayplanTruckNumber,jdbcType=DECIMAL}, 
-      #{item.shipmentUnitId,jdbcType=DECIMAL}, #{item.dayplanDeliveryPlace,jdbcType=VARCHAR}, 
-      #{item.dayplanReceiveUnit,jdbcType=VARCHAR}, #{item.dayplanDeliveryDate,jdbcType=TIMESTAMP}, 
-      #{item.materialId,jdbcType=DECIMAL}, #{item.dayplanMaterialWeight,jdbcType=DECIMAL}, 
-      #{item.dayplanReceiveStatus,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 into AMSTRUCK_RAIL_DAYPLAN
+    (DAYPLAN_ID,
+    DAYPLAN_NO, DAYPLAN_TRUCK_NUMBER,
+    SHIPMENT_UNIT_ID, DAYPLAN_DELIVERY_PLACE,
+    DAYPLAN_RECEIVE_UNIT, DAYPLAN_DELIVERY_DATE,
+    MATERIAL_ID, DAYPLAN_MATERIAL_WEIGHT,
+    DAYPLAN_RECEIVE_STATUS, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    CARRIER_ID)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.dayplanId,jdbcType=DECIMAL},
+    #{item.dayplanNo,jdbcType=VARCHAR}, #{item.dayplanTruckNumber,jdbcType=DECIMAL},
+    #{item.shipmentUnitId,jdbcType=DECIMAL}, #{item.dayplanDeliveryPlace,jdbcType=VARCHAR},
+    #{item.dayplanReceiveUnit,jdbcType=DECIMAL}, #{item.dayplanDeliveryDate,jdbcType=TIMESTAMP},
+    #{item.materialId,jdbcType=DECIMAL}, #{item.dayplanMaterialWeight,jdbcType=DECIMAL},
+    #{item.dayplanReceiveStatus,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.carrierId,jdbcType=DECIMAL} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMSTRUCK_RAIL_DAYPLAN
-     set
-       DAYPLAN_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanId,jdbcType=DECIMAL}
-       </foreach>
-       ,DAYPLAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanNo,jdbcType=VARCHAR}
-       </foreach>
-       ,DAYPLAN_TRUCK_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanTruckNumber,jdbcType=DECIMAL}
-       </foreach>
-       ,SHIPMENT_UNIT_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.shipmentUnitId,jdbcType=DECIMAL}
-       </foreach>
-       ,DAYPLAN_DELIVERY_PLACE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanDeliveryPlace,jdbcType=VARCHAR}
-       </foreach>
-       ,DAYPLAN_RECEIVE_UNIT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanReceiveUnit,jdbcType=VARCHAR}
-       </foreach>
-       ,DAYPLAN_DELIVERY_DATE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanDeliveryDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,DAYPLAN_MATERIAL_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanMaterialWeight,jdbcType=DECIMAL}
-       </foreach>
-       ,DAYPLAN_RECEIVE_STATUS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanReceiveStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
-          when #{item.dayplanId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where DAYPLAN_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.dayplanId,jdbcType=DECIMAL}
-     </foreach> 
+    update AMSTRUCK_RAIL_DAYPLAN
+    set
+    DAYPLAN_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanId,jdbcType=DECIMAL}
+    </foreach>
+    ,DAYPLAN_NO=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanNo,jdbcType=VARCHAR}
+    </foreach>
+    ,DAYPLAN_TRUCK_NUMBER=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanTruckNumber,jdbcType=DECIMAL}
+    </foreach>
+    ,SHIPMENT_UNIT_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.shipmentUnitId,jdbcType=DECIMAL}
+    </foreach>
+    ,DAYPLAN_DELIVERY_PLACE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanDeliveryPlace,jdbcType=VARCHAR}
+    </foreach>
+    ,DAYPLAN_RECEIVE_UNIT=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanReceiveUnit,jdbcType=DECIMAL}
+    </foreach>
+    ,DAYPLAN_DELIVERY_DATE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanDeliveryDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,MATERIAL_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+    </foreach>
+    ,DAYPLAN_MATERIAL_WEIGHT=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanMaterialWeight,jdbcType=DECIMAL}
+    </foreach>
+    ,DAYPLAN_RECEIVE_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.dayplanReceiveStatus,jdbcType=DECIMAL}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,CARRIER_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case DAYPLAN_ID" close="end">
+      when #{item.dayplanId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+    </foreach>
+    where DAYPLAN_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.dayplanId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMSTRUCK_RAIL_DAYPLAN
-    where DAYPLAN_ID in 
+    where DAYPLAN_ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -476,34 +500,187 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <!-- 展示汽车发运焦炭/水渣日计划 -->
   <select id="getTruckRailDayPlan" parameterType="java.util.Map" resultType="java.util.Map">
-       select
-              t.DAYPLAN_ID "dayPlanId",
-              t.dayplan_no as "dayplanNo",
-       t.dayplan_truck_number as "dayplanTruckNumber",
-       t.shipment_unit_id as "shipmentUnitId",
-       t.dayplan_delivery_place as "dayplanDeliveryPlace",
-       t.dayplan_receive_unit as "dayplanReceiveUnit",
-       t.dayplan_delivery_date as "dayplanDeliveryDate",
-       rm.material_name as "materialName",
-       t.dayplan_material_weight as "dayplanMaterialWeight"
-from amstruck_rail_dayplan t
-left join rms_material rm on t.material_id=rm.material_id
-where t.dayplan_receive_status=0 and  t.material_id=495
+    select *
+    from (
+    select t.DAYPLAN_ID "dayPlanId",
+    t.dayplan_no as "dayplanNo",
+    t.dayplan_truck_number as "dayplanTruckNumber",
+    rs.SHIPPER_NAME "shipperName",
+    rc.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+    to_char(t.dayplan_delivery_date, 'yyyy-mm-dd') as "dayplanDeliveryDate",
+    rm.material_name as "materialName",
+    t.dayplan_material_weight as "dayplanMaterialWeight",
+    t.INSERT_UPDATE_REMARK "insertUpdateRemark",
+    RC2.CARRIER_NAME "carrierName",
+           t.INSERT_TIME "insertTime"
+    from amstruck_rail_dayplan t
+    left join rms_material rm on t.material_id = rm.material_id
+    left join RMS_SHIPPER rs on rs.SHIPPER_ID = t.SHIPMENT_UNIT_ID
+    left join RMS_CONSIGNEE RC on RC.CONSIGNEE_ID = t.DAYPLAN_RECEIVE_UNIT
+    left join RMS_CARRIER RC2 on RC2.CARRIER_ID = t.CARRIER_ID
+
+    <where>
+      t.material_id = 1
+      <if test="status != null">
+        and  t.dayplan_receive_status  = #{status}
+      </if>
+    </where>
+    )
+    <where>
+      <if test="dayplanNo != null">
+        <foreach collection="dayplanNo" item="item" open="(" separator="or" close=")">
+          "dayplanNo" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="dayplanTruckNumber != null">
+        and
+        <foreach collection="dayplanTruckNumber" item="item" open="(" separator="or" close=")">
+          "dayplanTruckNumber" 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="consigneeCompanyName != null">
+        and
+        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+          "consigneeCompanyName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="dayplanDeliveryDate != null">
+        and
+        <foreach collection="dayplanDeliveryDate" item="item" open="(" separator="or" close=")">
+          "dayplanDeliveryDate" 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="dayplanMaterialWeight != null">
+        and
+        <foreach collection="dayplanMaterialWeight" item="item" open="(" separator="or" close=")">
+          "dayplanMaterialWeight" 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="insertUpdateRemark != null">
+        and
+        <foreach collection="insertUpdateRemark" item="item" open="(" separator="or" close=")">
+          "insertUpdateRemark" 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="getSzTruckRailDayPlan" parameterType="java.util.Map" resultType="java.util.Map">
-       select
-         t.DAYPLAN_ID "dayPlanId",t.dayplan_no as "dayplanNo",
-       t.dayplan_truck_number as "dayplanTruckNumber",
-       t.shipment_unit_id as "shipmentUnitId",
-       t.dayplan_delivery_place as "dayplanDeliveryPlace",
-       t.dayplan_receive_unit as "dayplanReceiveUnit",
-       t.dayplan_delivery_date as "dayplanDeliveryDate",
-       rm.material_name as "materialName",
-       t.dayplan_material_weight as "dayplanMaterialWeight"
-from amstruck_rail_dayplan t
-left join rms_material rm on t.material_id=rm.material_id
-where t.dayplan_receive_status=0 and  t.material_id=496
+    select
+    *
+    from(
+    select t.DAYPLAN_ID "dayPlanId",
+    t.dayplan_no as "dayplanNo",
+    t.dayplan_truck_number as "dayplanTruckNumber",
+    rs.SHIPPER_NAME "shipperName",
+    rc.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+    to_char(t.dayplan_delivery_date, 'yyyy-mm-dd') as "dayplanDeliveryDate",
+    rm.material_name as "materialName",
+    t.dayplan_material_weight as "dayplanMaterialWeight",
+    t.INSERT_UPDATE_REMARK "insertUpdateRemark",
+    RC2.CARRIER_NAME "carrierName",
+    t.INSERT_TIME "insertTime"
+    from amstruck_rail_dayplan t
+    left join rms_material rm on t.material_id = rm.material_id
+    left join RMS_SHIPPER rs on rs.SHIPPER_ID = t.SHIPMENT_UNIT_ID
+    left join RMS_CONSIGNEE RC on RC.CONSIGNEE_ID = t.DAYPLAN_RECEIVE_UNIT
+    left join RMS_CARRIER RC2 on RC2.CARRIER_ID = t.CARRIER_ID
+    <where>
+      t.material_id = 3650
+      <if test="status != null">
+        and t.dayplan_receive_status = #{status}
+      </if>
+    </where>
+    )
+    <where>
+      <if test="dayplanNo != null">
+        <foreach collection="dayplanNo" item="item" open="(" separator="or" close=")">
+          "dayplanNo" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="dayplanTruckNumber != null">
+        and
+        <foreach collection="dayplanTruckNumber" item="item" open="(" separator="or" close=")">
+          "dayplanTruckNumber" 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="consigneeCompanyName != null">
+        and
+        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+          "consigneeCompanyName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="dayplanDeliveryDate != null">
+        and
+        <foreach collection="dayplanDeliveryDate" item="item" open="(" separator="or" close=")">
+          "dayplanDeliveryDate" 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="dayplanMaterialWeight != null">
+        and
+        <foreach collection="dayplanMaterialWeight" item="item" open="(" separator="or" close=")">
+          "dayplanMaterialWeight" 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="insertUpdateRemark != null">
+        and
+        <foreach collection="insertUpdateRemark" item="item" open="(" separator="or" close=")">
+          "insertUpdateRemark" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderBy"></include>
+
     </select>
 
   <!-- 得到最大id -->
@@ -523,4 +700,26 @@ where t.dayplan_receive_status=0 and  t.material_id=496
       ARRIVAL_NAME "label"
     from RMSTRAIN_ARRIVAL_SEND
   </select>
+
+<!-- 通过发运计划ID查询修改信息 -->
+  <select id="getDayPlanByDayPlanId" parameterType="int" resultType="java.util.Map">
+    select ARD.DAYPLAN_NO "dayplanNo",
+           ARD.DAYPLAN_TRUCK_NUMBER "dayplanTruckNumber",
+           ARD.SHIPMENT_UNIT_ID "shipperId",
+           ARD.DAYPLAN_RECEIVE_UNIT "dayplanReceiveUnit",
+           ARD.DAYPLAN_DELIVERY_DATE "dayplanDeliveryDate",
+           ARD.MATERIAL_ID "materialId",
+           ARD.DAYPLAN_MATERIAL_WEIGHT "dayplanMaterialWeight",
+           ARD.INSERT_UPDATE_REMARK "insertUpdateRemark"
+    from AMSTRUCK_RAIL_DAYPLAN ARD
+    where ARD.DAYPLAN_ID = #{dayplanId}
+  </select>
+
+<!-- 查询所有承运商 -->
+  <select id="getCarrierMes" resultType="java.util.Map">
+    select RC.CARRIER_ID "id",
+           RC.CARRIER_ID "value",
+           RC.CARRIER_NAME "label"
+    from RMS_CARRIER RC
+  </select>
 </mapper>