Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRAIN-API into dev

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

@@ -65,7 +65,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> wagonLoadList = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue == null) {
+        if (mapValue.size() == 0) {
             mapValue.put("resultType", resultType);
             //将查询结果存入索引中
             wagonLoadList = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
@@ -73,7 +73,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
             //添加索引
             map.put("index", "get_tmstrain_wagon_load");
             //添加id
-            map.put("indexId", "resultId1");
+            map.put("indexId", "trainLoadingId");
             wagonLoadList.add(map);
             //新建索引
             String s = JSON.toJSONString(wagonLoadList);
@@ -98,9 +98,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
                                                    Integer pageSize,
                                                    Integer resultType,
                                                    String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
+
         mapValue.put("resultType", resultType);
         //设置要查询的索引名称
         String index = "get_tmstrain_wagon_load";
@@ -220,10 +218,24 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
      * @param
      * @return
      */
-    @ApiOperation(value = "获取装车车皮号")
-    @GetMapping(value = "/getWagonNo/{resultType}")
-    public RESTfulResult getWagonNo(@PathVariable("resultType") Integer resultType) {
-        return success(tmstrainLoadingResultService.getWagonNo(resultType));
+    @ApiOperation(value = "获取已装车还未卸车车皮")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(213)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getWagonNo/{resultType}")
+    public RESTfulResult getWagonNo(@PathVariable("resultType") Integer resultType,
+                                    @RequestBody(required = false) Map<String, Object> mapValue,
+                                    Integer apiId,
+                                    Integer pageNum,
+                                    Integer pageSize) {
+        mapValue.put("resultType", resultType);
+        //不分页筛选数据
+        List<Map<String, Object>> allWagonNo = tmstrainLoadingResultService.getWagonNo(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> wagonNo = tmstrainLoadingResultService.getWagonNo(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWagonNo,wagonNo);
+        return success(pageList);
     }
 
 

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

@@ -67,27 +67,24 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
                                            Integer resultType) {
         //初始化过滤
         List<Map<String, Object>> wagonPleaseList = null;
+        mapValue.put("resultType", resultType);
+        mapValue.put("status", status);
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue == null) {
-            mapValue.put("resultType", resultType);
-            mapValue.put("status", status);
+        if (mapValue.size() == 2) {
             //将查询结果存入索引中
             wagonPleaseList = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "get_all_wagon_please");
             //添加id
-            map.put("indexId", "resultId3");
+            map.put("indexId", "wagonPleaseId");
             wagonPleaseList.add(map);
             //新建索引
-            String s = JSON.toJSONString(wagonPleaseList);
             esFeign.insertIndex(wagonPleaseList);
             //删除
             wagonPleaseList.remove(wagonPleaseList.size() - 1);
         }
         if (wagonPleaseList == null) {
-            mapValue.put("resultType", resultType);
-            mapValue.put("status", status);
             wagonPleaseList = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -106,9 +103,6 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
                                                 Integer resultType,
                                                 Integer status,
                                                 String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
         mapValue.put("status", status);
         mapValue.put("resultType", resultType);
         //设置要查询的索引名称
@@ -224,25 +218,23 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
                                                   Integer resultType) {
         //初始化过滤
         List<Map<String, Object>> approveWagonPleaseList = null;
+        mapValue.put("resultType", resultType);
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue == null) {
-            mapValue.put("resultType", resultType);
+        if (mapValue.size() == 1 ) {
             //将查询结果存入索引中
             approveWagonPleaseList = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "get_approve_wagon_please");
             //添加id
-            map.put("indexId", "resultId4");
+            map.put("indexId", "approveWagonPleaseId");
             approveWagonPleaseList.add(map);
             //新建索引
-            String s = JSON.toJSONString(approveWagonPleaseList);
             esFeign.insertIndex(approveWagonPleaseList);
             //删除
             approveWagonPleaseList.remove(approveWagonPleaseList.size() - 1);
         }
         if (approveWagonPleaseList == null) {
-            mapValue.put("resultType", resultType);
             approveWagonPleaseList = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -260,9 +252,6 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
                                                        Integer pageSize,
                                                        Integer resultType,
                                                        String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
         mapValue.put("resultType", resultType);
         //设置要查询的索引名称
         String index = "get_approve_wagon_please";

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

@@ -271,17 +271,16 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> wagonUnLoadResult = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue == null) {
+        if (mapValue.size()==0) {
             //将查询结果存入索引中
-            wagonUnLoadResult = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(null);
+            wagonUnLoadResult = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(mapValue);
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "wagon_unload_result");
             //添加id
-            map.put("indexId", "result8");
+            map.put("indexId", "trainUnloadId");
             wagonUnLoadResult.add(map);
             //新建索引
-            String s = JSON.toJSONString(wagonUnLoadResult);
             esFeign.insertIndex(wagonUnLoadResult);
             //删除
             wagonUnLoadResult.remove(wagonUnLoadResult.size() - 1);

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

@@ -29,7 +29,7 @@ public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoading
     //获得批次ID
     List<Map<String, Object>> getBatchId();
     //获得装车车皮号
-    List<Map<String, Object>> getWagonNo(Integer resultType);
+    List<Map<String, Object>> getWagonNo(Map<String, Object> map);
     //获得要渲染的数据
     List<Map<String, Object>> selectByResultId(BigDecimal ResultId);
     //通过发站ID查询所属港口ID

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

@@ -1,11 +1,13 @@
 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;
 
 @ApiModel(value="车皮装车作业")
 public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
@@ -141,6 +143,13 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="装车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）2：采购进口矿（海港-老区轨道衡）3：采购国产矿 4：内转",required=false)
     private BigDecimal resultType;
 
+    /**
+     * 车皮号列表
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "车皮号列表")
+    private List<String> wagonNoList;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -361,4 +370,12 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         sb.append("]");
         return sb.toString();
     }
+
+    public List<String> getWagonNoList() {
+        return wagonNoList;
+    }
+
+    public void setWagonNoList(List<String> wagonNoList) {
+        this.wagonNoList = wagonNoList;
+    }
 }

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

@@ -1,11 +1,14 @@
 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 TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
@@ -105,6 +108,12 @@ public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="卸车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）2：采购进口矿（海港-老区轨道衡）3：采购国产矿 4：内转",required=false)
     private BigDecimal resultType;
 
+    /**
+     * 车皮号列表
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "车皮号列表")
+    private List<Map<String, Object>> wagonNoList;
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -271,4 +280,12 @@ public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
         sb.append("]");
         return sb.toString();
     }
+
+    public List<Map<String, Object>> getWagonNoList() {
+        return wagonNoList;
+    }
+
+    public void setWagonNoList(List<Map<String, Object>> wagonNoList) {
+        this.wagonNoList = wagonNoList;
+    }
 }

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

@@ -31,7 +31,7 @@ public interface ITmstrainLoadingResultService{
     //获得批次ID
     List<Map<String, Object>> getBatchId();
     //获得装车车皮号
-    List<Map<String, Object>> getWagonNo(Integer resultType);
+    List<Map<String, Object>> getWagonNo(Map<String, Object> map);
     //通过主键获得车皮装车信息
     List<Map<String, Object>> getTmstrainLoadingResultByResultId(BigDecimal resultId);
     //修改车皮装车作业实绩

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

@@ -57,43 +57,65 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     /**
-     * 新增采购装车实绩
+     * 新增装车实绩
      * @param tmstrainLoadingResult
      * @return
      */
     @Override
     @Transactional
     public int addTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult) {
-        BigDecimal maxId = tmstrainLoadingResultMapper.selectMaxId();
-        //生成主键id
-        tmstrainLoadingResult.setResultId(maxId);
-        //通过批次ID获得采购订单号和物资ID
+        List<String> wagonNoList = tmstrainLoadingResult.getWagonNoList();
+        //通过批次ID获得采购订单号
         BigDecimal batchId = tmstrainLoadingResult.getBatchId();
-        BigDecimal materialId = tmstrainLoadingResultMapper.getMaterialID(batchId);
         //查询并插入采购订单号
         BigDecimal purchaseOrderId = tmstrainLoadingResultMapper.getPurchaseOrderId(batchId);
         tmstrainLoadingResult.setPurchaseOrderRailPlanId(purchaseOrderId);
-        tmstrainLoadingResult.setMaterialId(materialId);
+        //添加常规字段
+        addRegularField(tmstrainLoadingResult);
+        int count = 0;
+        Double totalWeight = 0.0;
+        for (String wagonNo : wagonNoList) {
+            tmstrainLoadingResult.setResultWagonNo(wagonNo);
+            BigDecimal maxId = tmstrainLoadingResultMapper.selectMaxId();
+            //生成主键id
+            tmstrainLoadingResult.setResultId(maxId);
+            count += tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
+            totalWeight += tmstrainLoadingResult.getResultBillableTonnage().doubleValue();
+        }
+        //如果订单类型为采购进口矿火运（万州港---老区轨道衡 || 万州港--老区轨道衡）
+        if(tmstrainLoadingResult.getResultType().intValue() == 1){
+            tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(totalWeight.toString()));
+            addOutWarehouse(tmstrainLoadingResult, batchId);
+        }
+        return count;
+    }
+
+    /**
+     * 添加港存库出库实绩
+     * @param tmstrainLoadingResult
+     * @param batchId
+     */
+    public void addOutWarehouse(TmstrainLoadingResult tmstrainLoadingResult, BigDecimal batchId){
+        Map<String, Object> map = new HashMap<>();
+        map.put("isClean",tmstrainLoadingResult.getResultIsclear());
+        map.put("resultTonnage", tmstrainLoadingResult.getResultBillableTonnage());
+        map.put("batchId", batchId);
+        //通过发站查询发站的所属港口
+        BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
+        map.put("portId", portId);
+//            wmshBoundFeign.addResult(map);
+    }
+
+    /**
+     * 添加常规字段
+     * @param tmstrainLoadingResult
+     */
+    public void addRegularField(TmstrainLoadingResult tmstrainLoadingResult){
         //常规字段插入
         tmstrainLoadingResult.setInsertUsername("admin");
         tmstrainLoadingResult.setInsertTime(new Date());
-        tmstrainLoadingResult.setUpdateUsername("admin");
-        tmstrainLoadingResult.setUpdateTime(new Date());
         tmstrainLoadingResult.setInsertUpdateRemark("无");
         tmstrainLoadingResult.setDeleted(new BigDecimal(0));
-
-        if(tmstrainLoadingResult.getResultType().intValue() == 1){
-            Map<String, Object> map = new HashMap<>();
-            map.put("isClean",tmstrainLoadingResult.getResultIsclear());
-            map.put("resultTonnage", tmstrainLoadingResult.getResultBillableTonnage());
-            map.put("batchId", batchId);
-            //通过发站查询发站的所属港口
-            BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
-            map.put("portId", portId);
-//            wmshBoundFeign.addResult(map);
-        }
-
-        return tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
     }
 
     /**
@@ -180,7 +202,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     @Override
-    public List<Map<String, Object>> getWagonNo(Integer resultType) {
-        return tmstrainLoadingResultMapper.getWagonNo(resultType);
+    public List<Map<String, Object>> getWagonNo(Map<String, Object> map) {
+        return tmstrainLoadingResultMapper.getWagonNo(map);
     }
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.TmstrainLoadingResultMapper;
 import com.steerinfo.dil.mapper.TmstrainWagonUnloadResultMapper;
+import com.steerinfo.dil.model.TmstrainLoadingResult;
 import com.steerinfo.dil.model.TmstrainWagonUnloadResult;
 import com.steerinfo.dil.service.ITmstrainWagonUnloadResultService;
 import com.steerinfo.dil.util.DataChange;
@@ -32,6 +33,9 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
     @Autowired
     private TmstrainWagonUnloadResultMapper tmstrainWagonUnloadResultMapper;
 
+    @Autowired
+    private TmstrainLoadingResultServiceImpl tmstrainLoadingResultService;
+
     /**
      * 查看所有卸车实绩
      * 1采购进口矿（万州港-达州站/万州港-老区轨道衡） 2采购进口矿（海港-老区轨道衡） 3采购国产矿  4内转
@@ -92,24 +96,29 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      */
 
     public int addTmstrainWagonLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
-        //生成主键id
-        tmstrainWagonUnloadResult.setUnloadingId(tmstrainWagonUnloadResultMapper.selectMaxId());
-        //通过装车车皮号得到并插入采购订单id
-        BigDecimal purchaseOrderId = tmstrainWagonUnloadResultMapper.getPurchaseOrderId(tmstrainWagonUnloadResult.getResultWagonNo());
-        tmstrainWagonUnloadResult.setPurchaseOrderRailPlanId(purchaseOrderId);
         //常规字段插入
         tmstrainWagonUnloadResult.setInsertUsername("admin");
         tmstrainWagonUnloadResult.setInsertTime(new Date());
-        tmstrainWagonUnloadResult.setUpdateUsername("admin");
-        tmstrainWagonUnloadResult.setUpdateTime(new Date());
-        tmstrainWagonUnloadResult.setInsertUpdateRemark("无");
         tmstrainWagonUnloadResult.setDeleted(new BigDecimal(0));
-        return tmstrainWagonUnloadResultMapper.insert(tmstrainWagonUnloadResult);
+        List<Map<String, Object>> wagonNoMapList = tmstrainWagonUnloadResult.getWagonNoList();
+        int count = 0;
+        for (Map<String, Object> map : wagonNoMapList) {
+            String resultWagonNo = (String) map.get("resultWagonNo");
+            //通过装车车皮号得到并插入采购订单id
+            BigDecimal purchaseOrderId = tmstrainWagonUnloadResultMapper.getPurchaseOrderId(resultWagonNo);
+            tmstrainWagonUnloadResult.setPurchaseOrderRailPlanId(purchaseOrderId);
+            //生成主键id
+            tmstrainWagonUnloadResult.setUnloadingId(tmstrainWagonUnloadResultMapper.selectMaxId());
+            tmstrainWagonUnloadResult.setResultWagonNo(resultWagonNo);
+            count += tmstrainWagonUnloadResultMapper.insertSelective(tmstrainWagonUnloadResult);
+            count += updateLoadingResult(map); //修改装车实绩为已卸货
+        }
+        return count;
     }
 
 
     /**
-     * 修改装车实绩
+     * 修改卸车实绩
      * @param tmstrainWagonUnloadResult
      * @return
      */
@@ -119,6 +128,19 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         return tmstrainWagonUnloadResultMapper.updateByPrimaryKeySelective(tmstrainWagonUnloadResult);
     }
 
+    /**
+     * 修改装车实绩状态为已卸车
+     * @param map
+     * @return
+     */
+    public int updateLoadingResult(Map<String, Object> map){
+        //添加一条卸货实绩 修改装车状态为已卸车 3
+        TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
+        tmstrainLoadingResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+        tmstrainLoadingResult.setDeleted(new BigDecimal(3));
+        return tmstrainLoadingResultService.updateTmstrainLoadingResult(tmstrainLoadingResult);
+    }
+
     /**
      * 查看火运实绩
      * @param map
@@ -187,6 +209,4 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         return tmstrainWagonUnloadResultMapper.getTrainResult(map);
     }
 
-
-
 }

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:paas-discovery-test.steerinfo.com}:${EUREKA_PORT:80}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
       
 #feign设置
 openfeign:

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

@@ -677,12 +677,12 @@
     left join DIL_BATCH d_batch
     on t_load.BATCH_ID=d_batch.BATCH_ID
     left join RMS_MATERIAL r_material
-    on t_load.MATERIAL_ID=r_material.MATERIAL_ID
+    on d_batch.MATERIAL_ID=r_material.MATERIAL_ID
     left join RMSTRAIN_ARRIVAL_SEND r_s_arrival
     on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
     left join RMSTRAIN_ARRIVAL_SEND r_a_arrival
     on r_a_arrival.ARRIVAL_ID=t_load.ARRIVAL_STATION_ID
-    where t_load.DELETED = 0 and t_load.RESULT_TYPE = #{resultType}
+    where t_load.DELETED in (0, 2) and t_load.RESULT_TYPE = #{resultType}
     order by t_load.RESULT_LOADING_DATE desc
     )
     <where>
@@ -817,15 +817,54 @@
     on RM.MATERIAL_ID = DB.MATERIAL_ID
   </select>
 
-  <select id="getWagonNo" resultType="java.util.LinkedHashMap" parameterType="int">
-    select
-      t_load.RESULT_WAGON_NO "id",
-      t_load.RESULT_WAGON_NO "value",
-      t_load.RESULT_WAGON_NO "label"
-    from TMSTRAIN_LOADING_RESULT t_load
-           left join TMSTRAIN_WAGON_UNLOAD_RESULT t_unload
-                     on t_load.RESULT_WAGON_NO = t_unload.RESULT_WAGON_NO
-    where t_load.RESULT_WAGON_NO not in (select RESULT_WAGON_NO from TMSTRAIN_WAGON_UNLOAD_RESULT) and t_load.DELETED = 0 and t_load.RESULT_TYPE = #{resultType}
+<!--  获取装车实绩中还未卸车的装车实绩-->
+  <select id="getWagonNo" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+    select *
+    from (
+           select TLR.RESULT_WAGON_NO     "resultWagonNo",
+                  TLR.RESULT_ID           "resultId",
+                  TLR.RESULT_LOADING_DATE "resultLoadingDate",
+                  APO.PURCHASE_ORDER_NO   "purchaseOrderNo",
+                  RM.MATERIAL_NAME        "materialName"
+           from TMSTRAIN_LOADING_RESULT TLR
+                  left join AMS_PURCHASE_ORDER APO
+                            on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
+                  left join DIL_BATCH DB
+                            on DB.BATCH_ID = APO.BATCH_ID
+                  left join RMS_MATERIAL RM
+                            on DB.MATERIAL_ID = RM.MATERIAL_ID
+           where TLR.DELETED not in (2, 1)
+             and TLR.RESULT_TYPE = #{resultType}
+         )
+    <where>
+      <if test="resultWagonNo != null">
+        <foreach collection="resultWagonNo" item="item" open="(" separator="or" close=")">
+          "resultWagonNo" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultLoadingDate != null">
+        and
+        <foreach collection="resultLoadingDate" item="item" open="(" separator="or" close=")">
+          "resultLoadingDate" like '%${item}%'
+        </foreach>
+      </if>
+      <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>
+    </where>
+    <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+      order by "resultLoadingDate" desc
+    </if>
   </select>
 
   <select id="selectByResultId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">

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

@@ -526,16 +526,15 @@
     left join DIL_BATCH d_batch
     on t_load.BATCH_ID=d_batch.BATCH_ID
     left join RMS_MATERIAL r_material
-    on t_load.MATERIAL_ID=r_material.MATERIAL_ID
+    on d_batch.MATERIAL_ID=r_material.MATERIAL_ID
     left join RMSTRAIN_ARRIVAL_SEND r_s_arrival
     on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
     left join RMSTRAIN_ARRIVAL_SEND r_a_arrival
     on r_a_arrival.ARRIVAL_ID=t_load.ARRIVAL_STATION_ID
     left join TMSTRAIN_UNLOAD_POINT t_unload_point
     on t_unload_point.UNLOAD_POINT_ID=t_unload.UNLOADING_POINT_ID
-    where t_unload.RESULT_WAGON_NO in (select RESULT_WAGON_NO from TMSTRAIN_WAGON_UNLOAD_RESULT)
-      and t_unload.DELETED = 0 and t_load.DELETED = 0 and t_unload.RESULT_TYPE = #{resultType}
-    order by t_unload.RESULT_UNLOAD_TIME desc)
+    where  t_unload.DELETED = 0 and t_load.DELETED = 3 and t_unload.RESULT_TYPE = #{resultType}
+    )
     <where>
       <if test="purchaseOrderNo != null">
         and
@@ -623,6 +622,9 @@
       </if>
     </where>
     <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+      order by "resultUnloadTime" desc
+    </if>
   </select>
 
   <sql id="orderBy">