内转火运

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

@@ -171,4 +171,47 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
     public RESTfulResult getWagonNo(){
         return success(tmstrainLoadingResultService.getWagonNo());
     }
+
+
+    //内转物流新增装车
+    @ApiOperation(value="内转物流新增装车")
+    @GetMapping(value = "/addTrainLoadResultForConverted")
+    public RESTfulResult addTrainLoadResultForConverted(TmstrainLoadingResult tmstrainLoadingResult){
+        return success(tmstrainLoadingResultService.addTrainLoadResultForConverted(tmstrainLoadingResult));
+    }
+    /**
+     * 内转物流通过主键查询车皮装车作业信息
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="内转物流通过主键查询车皮装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "车皮装车主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/selectLoadByResultId/{resultId}")
+    public RESTfulResult selectLoadByResultId(@PathVariable("resultId") BigDecimal resultId){
+        List<Map<String, Object>> loadingResultByResultId = tmstrainLoadingResultService.selectLoadByResultId(resultId);
+        System.out.println(loadingResultByResultId);
+        return success(loadingResultByResultId);
+    }
+    /**
+     * 内转展示车皮装车实绩
+     */
+
+    @ApiOperation(value="查询装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(203)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getTmstrainWagonLoadForConverted")
+    public RESTfulResult getTmstrainWagonLoadForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+
+        List<Map<String, Object>> tmstrainWagonLoad = tmstrainLoadingResultService.selectLoadedForConverted(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> tmstrainWagonLoad1 = tmstrainLoadingResultService.selectLoadedForConverted(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonLoad,tmstrainWagonLoad1);
+        return success(pageList);
+    }
 }

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

@@ -90,6 +90,7 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
         return success(i);
     }
 
+
     @ApiOperation(value="修改请车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
@@ -142,6 +143,20 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
         List<Map<String, Object>> shipper = tmstrainPleaseApproveResultService.getRailPlan();
         return success(shipper);
     }
+    //内转物流
+    @ApiOperation(value="查询所有发站/到站")
+    @GetMapping("/getArrivalSend")
+    public RESTfulResult getArrivalSend(){
+        List<Map<String, Object>> send = tmstrainPleaseApproveResultService.getArrivalSend();
+        return success(send);
+    }
+    //查询请车计划号
+    @ApiOperation(value="查询请车计划号")
+    @GetMapping("/getPleasePlanNo")
+    public RESTfulResult getPleasePlanNo(){
+        List<Map<String, Object>> PlanNo = tmstrainPleaseApproveResultService.getPleasePlanNo();
+        return success(PlanNo);
+    }
 
     //******************************批车作业**************************************
 
@@ -211,4 +226,84 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
         int i = tmstrainPleaseApproveResultService.updateByPrimaryKeySelective(tmstrainPleaseApproveResult);
         return success(i);
     }
+
+
+    /********************************************内转物流***************************************************
+     /**
+     * 内转物流，新增请车作业
+     * @param map
+     * @return
+     */
+
+    @ApiOperation(value="新增请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amstrainWagonPlease", value = "请车作业对象", required = false, dataType = "AmstrainWagonPlease"),
+    })
+    @PostMapping("/addWagonApprove")
+    public RESTfulResult addWagonApprove(@RequestBody Map<String,Object> map){
+        int i = tmstrainPleaseApproveResultService.addPleaseApprove(map);
+        return success(i);
+    }
+    /**
+     * 内转查询请车实绩
+     * @return
+     */
+
+    @ApiOperation(value="查询请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(199)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllWagonPleaseForConverted")
+    public RESTfulResult getAllWagonPleaseForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer status){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("status", status);
+        //不分页筛选数据
+        List<Map<String, Object>> wagonPleaseTotal = tmstrainPleaseApproveResultService.selectPleaseApprovePlanForConverted(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> wagonPlease = tmstrainPleaseApproveResultService.selectPleaseApprovePlanForConverted(mapValue);
+        DataChange.changeDateToDayDate(wagonPlease, "resultPleaseDate", "resultPlanDate");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonPleaseTotal,wagonPlease);
+        return success(pageList);
+    }
+
+    /**
+     * 通过id查询请车作业
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="通过Id查询请车作业")
+    @PostMapping ("/getPleasePlanByResultId/{resultId}")
+    public RESTfulResult getPleasePlanByResultId(@PathVariable("resultId")Integer resultId){
+        List<Map<String, Object>> WagonPleaseById = tmstrainPleaseApproveResultService.selectPleasePlanByResultId(resultId);
+        return success(WagonPleaseById);
+    }
+
+    /**
+     * 通过id查询批车作业
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="通过id查询批车作业")
+    @PostMapping ("/getApproveByResultId/{resultId}")
+    public RESTfulResult getApproveByResultId(@PathVariable("resultId")Integer resultId){
+        List<Map<String, Object>> ApproveBYResultId = tmstrainPleaseApproveResultService.selectApproveBYResultId(resultId);
+        return success(ApproveBYResultId);
+    }
+
+
 }
+
+
+
+

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

@@ -90,9 +90,15 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
     })
     @PostMapping(value = "/insertTmstrainWagonUnLoadResult")
-    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult){
-        int i = tmstrainWagonUnloadResultService.addTmstrainWagonLoadResult(tmstrainWagonUnloadResult);
-        return success(i);
+    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult,Integer orderType){
+        int i=0;
+        int i1=0;
+        if (orderType==3){
+               i = tmstrainWagonUnloadResultService.addTmstrainWagonLoadResult(tmstrainWagonUnloadResult);
+        }else if (orderType==4){
+               i1=tmstrainWagonUnloadResultService.addTmstrainWagonLoadResultForConverted(tmstrainWagonUnloadResult);
+        }
+        return success(i+i1);
     }
 
     /**
@@ -152,7 +158,6 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
     })
     @GetMapping(value = "/getUnloadingRouteName")
     public RESTfulResult getUnloadingRouteName(){
-
         return success(tmstrainWagonUnloadResultService.getUnloadingRouteName());
     }
 
@@ -166,9 +171,50 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "unloadingId", value = "车皮卸车主键", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
-    public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId){
-        List<Map<String, Object>> tmstrainWagonUnLoadResultByUnLoadingId = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
-        return success(tmstrainWagonUnLoadResultByUnLoadingId);
+    public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId,Integer orderType){
+        List<Map<String, Object>> tmstrainWagonUnLoadResultByUnLoadingId=null;
+        List<Map<String, Object>> UnLoadResultByUnLoadingId=null;
+        if (orderType==3) {
+             tmstrainWagonUnLoadResultByUnLoadingId = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
+        }else if (orderType==4){
+            UnLoadResultByUnLoadingId=tmstrainWagonUnloadResultService.selectUnloadByLoadingId(unloadingId);
+        }
+        return success();
     }
+   //********内转物流展示卸车实绩**************************************
+   @ApiOperation(value="查询卸车作业信息")
+   @ApiImplicitParams({
+           @ApiImplicitParam(name = "apiId(201)", value = "表头", required = false, dataType = "Interger")
+   })
+   @PostMapping("/selectWagonUnLoadResultForConverted")
+   public RESTfulResult selectWagonUnLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize){
+
+       List<Map<String, Object>> tmstrainWagonUnLoad = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(mapValue);
+       PageHelper.startPage(pageNum,pageSize);
+       List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(mapValue);
+       PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonUnLoad,tmstrainWagonUnLoad1);
+       return success(pageList);
+   }
+   //*********内转物流查询火车卸车实绩************************************
+   @ApiOperation(value="查询火车卸车信息")
+   @ApiImplicitParams({
+           @ApiImplicitParam(name = "apiId(202)", value = "表头", required = false, dataType = "Interger")
+   })
+   @PostMapping("/selectTrainUnLoadResultForConverted")
+   public RESTfulResult selectTrainUnLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                            Integer apiId,
+                                                            Integer pageNum,
+                                                            Integer pageSize){
+
+       List<Map<String, Object>> tmstrainWagonUnLoad = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
+       PageHelper.startPage(pageNum,pageSize);
+       List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
+       PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonUnLoad,tmstrainWagonUnLoad1);
+       return success(pageList);
+   }
+
 
 }

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

@@ -13,11 +13,9 @@ import java.util.Map;
 public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoadingResult, BigDecimal> {
     //查询所有装车作业信息
     List<Map<String, Object>> getTmsWagonLoadInfo(Map<String,Object> map);
-
     //查询主键最大值
     @Select("select seq_tmstrian_loading.nextval from dual")
     BigDecimal selectMaxId();
-
     //获取外轮船名
     String getResultForeignShipName(BigDecimal batchId);
     //获取物资ID
@@ -36,4 +34,10 @@ public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoading
     List<Map<String, Object>> selectByResultId(BigDecimal ResultId);
     //通过发站ID查询所属港口ID
     BigDecimal getPortIdBySendStationId(BigDecimal sendStationId);
+    //通过发运计划号查找物资信息
+    Map<String,Object> getMaterialInfoByRailPlanId(Integer railPlanId);
+    //内转物流查询装车实绩并展示
+    List<Map<String,Object>> selectLoadedForConverted(Map<String,Object> map);
+    //内转物流通过id查询装车作业
+    List<Map<String,Object>> selectLoadByResultId(BigDecimal resultId);
 }

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

@@ -40,6 +40,21 @@ public interface TmstrainPleaseApproveResultMapper extends IBaseMapper<TmstrainP
     //获取发运计划
     List<Map<String, Object>> getRailPlan();
 
+    //根据用户id查找用户
+    String selectPersonNameByPersonnelId(Integer personnelId);
 
+   //查询请车计划
+    List<Map<String,Object>> selectPleaseApprovePlanForConverted(Map<String,Object> map);
 
+    //获取发站/到站下拉框
+    List<Map<String,Object>> getArrivalSend();
+
+    //获取请车计划号下拉框
+    List<Map<String,Object>> getPleasePlanNo();
+
+    //通过id查询请车作业
+    List<Map<String,Object>> selectPleasePlanByResultId(Integer resultId);
+
+   //通过id查询批车作业
+    List<Map<String,Object>> selectApproveBYResultId(Integer resultId);
 }

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

@@ -26,5 +26,10 @@ public interface TmstrainWagonUnloadResultMapper extends IBaseMapper<TmstrainWag
     List<Map<String, Object>> getUnloadingRouteName();
     //获得要渲染的数据
     List<Map<String, Object>> selectByUnLoadingId(BigDecimal unloadingId);
-
+    //内转物流查询卸车实绩
+    List<Map<String,Object>> selectWagonUnLoadResult(Map<String,Object> map);
+    //内转物流通过id渲染数据
+    List<Map<String,Object>> selectUnloadByLoadingId(BigDecimal UnloadingId);
+    //内转物流查询火车卸货实绩
+    List<Map<String,Object>> getTrainResult(Map<String,Object> map);
 }

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

@@ -40,6 +40,10 @@ public interface ITmstrainLoadingResultService{
     int updateTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult);
     //通过主键删除车皮装车作业实绩
     int deleteTmstrainLoadingResultByResultId(BigDecimal resultId);
-
-
+     //内转新增装车实绩
+    int addTrainLoadResultForConverted(TmstrainLoadingResult tmstrainLoadingResult);
+    //内转物流通过id查询装车作业
+    List<Map<String,Object>> selectLoadByResultId(BigDecimal resultId);
+    //内转查询装车实绩
+    List<Map<String,Object>> selectLoadedForConverted(Map<String,Object> map);
 }

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

@@ -45,4 +45,22 @@ public interface ITmstrainPleaseApproveResultService{
 
     //通过Id查询请车作业
     List<Map<String, Object>> getWagonPleaseById(Integer resultId);
+
+    //内转新增请车计划
+    int addPleaseApprove(Map<String,Object> map);
+
+    //获取发站/到站下拉框
+    List<Map<String,Object>> getArrivalSend();
+
+    //查询请车计划
+    List<Map<String,Object>> selectPleaseApprovePlanForConverted(Map<String,Object> map);
+
+    //获取请车计划号下拉框
+    List<Map<String,Object>> getPleasePlanNo();
+
+    //通过id查询请车作业
+    List<Map<String,Object>> selectPleasePlanByResultId(Integer resultId);
+
+    //通过id查询批车作业
+    List<Map<String,Object>> selectApproveBYResultId(Integer resultId);
 }

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

@@ -37,4 +37,12 @@ public interface ITmstrainWagonUnloadResultService{
     List<Map<String, Object>> getUnloadingRouteName();
     //通过主键获取车皮卸车信息
     List<Map<String, Object>> getTmstrainWagonUnLoadResultByUnLoadingId(BigDecimal unloadingId);
+    //内转物流新增卸车实绩
+    int addTmstrainWagonLoadResultForConverted(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);
+    //内转物流查询卸车实绩
+    List<Map<String,Object>> selectWagonUnLoadResult(Map<String,Object> map);
+    //内转物流通过id渲染数据
+    List<Map<String,Object>> selectUnloadByLoadingId(BigDecimal UnloadingId);
+    //内转物流查询火车卸货实绩
+    List<Map<String,Object>> getTrainResult(Map<String,Object> map);
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.TmstrainLoadingResultMapper;
 import com.steerinfo.dil.model.TmstrainLoadingResult;
 import com.steerinfo.dil.service.ITmstrainLoadingResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -93,6 +94,40 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         return tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
     }
 
+    @Override
+    public int addTrainLoadResultForConverted(TmstrainLoadingResult tmstrainLoadingResult) {
+        //设置主键id
+        BigDecimal maxId = tmstrainLoadingResultMapper.selectMaxId();
+        //生成主键id
+        tmstrainLoadingResult.setResultId(maxId);
+        //获取发运计划id
+        BigDecimal planId= tmstrainLoadingResult.getPurchaseOrderRailPlanId();
+        //通过发运计划号查找物资信息
+        Map<String,Object> map=tmstrainLoadingResultMapper.getMaterialInfoByRailPlanId(planId.intValue());
+        //获取物资id
+        Integer materialId =(Integer) map.get("materialId");
+        tmstrainLoadingResult.setMaterialId(DataChange.dataToBigDecimal(materialId));
+        //获取物资件数
+        Integer materialNumber = (Integer)map.get("materialNumber");
+        tmstrainLoadingResult.setResultMaterialNumber(DataChange.dataToBigDecimal(materialNumber));
+        //获取物资理重
+        Integer materialWeight = (Integer)map.get("materialWeight");
+        tmstrainLoadingResult.setResultMaterialTheoryweight(DataChange.dataToBigDecimal(materialWeight));
+        tmstrainLoadingResult.setInsertTime(new Date());
+        tmstrainLoadingResult.setInsertUsername("admin");
+        return tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectLoadByResultId(BigDecimal resultId) {
+        return tmstrainLoadingResultMapper.selectLoadByResultId(resultId);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectLoadedForConverted(Map<String, Object> map) {
+        return tmstrainLoadingResultMapper.selectLoadedForConverted(map);
+    }
+
     @Override
     public List<Map<String, Object>> getSendStationName() {
         return tmstrainLoadingResultMapper.getSendStationName();

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.TmstrainPleaseApproveResultMapper;
 import com.steerinfo.dil.model.TmstrainPleaseApproveResult;
 import com.steerinfo.dil.service.ITmstrainPleaseApproveResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,6 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
     @Override
     public int insertSelective(TmstrainPleaseApproveResult tmstrainPleaseApproveResult) {
         //生成主键ID
-
         BigDecimal maxId = selectMaxId();
         long id = maxId.longValue();
         tmstrainPleaseApproveResult.setResultId(maxId);
@@ -117,6 +117,85 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
     public List<Map<String, Object>> getWagonPleaseById(Integer resultId) {
         return tmstrainPleaseApproveResultMapper.getWagonPleaseById(resultId);
     }
+
+    /**
+     * 内转物流，新增请车计划
+     * @param map
+     * @return
+     */
+    @Override
+    public int addPleaseApprove(Map<String, Object> map) {
+        //生成主键ID
+        BigDecimal maxId = selectMaxId();
+        long id = maxId.longValue();
+        TmstrainPleaseApproveResult tmstrainPleaseApproveResult=new TmstrainPleaseApproveResult();
+        //新增请车id
+        tmstrainPleaseApproveResult.setResultId(maxId);
+        //设置状态 新增的为未下发状态
+        tmstrainPleaseApproveResult.setStatus(new BigDecimal(0));
+        //生成请车计划号
+        String resultPleasePlanNo;
+        if(id >= 100){
+            resultPleasePlanNo = "WQCJH-" + id;
+        }else if(id >= 10) {
+            resultPleasePlanNo = "WQCJH-0" + id;
+        }else {
+            resultPleasePlanNo = "WQCJH-00" + id;
+        }
+        tmstrainPleaseApproveResult.setResultPleasePlanNo(resultPleasePlanNo);
+        //新增请车人
+        Integer personnelId =(Integer) map.get("personnelId");
+        String personelName=tmstrainPleaseApproveResultMapper.selectPersonNameByPersonnelId(personnelId);
+        tmstrainPleaseApproveResult.setInsertUsername(personelName);
+        //获取发运计划id
+        Integer deplanId=(Integer)map.get("id");
+        //设置发运计划id
+        tmstrainPleaseApproveResult.setRailPlanId(DataChange.dataToBigDecimal(deplanId));
+        //获取请车数
+        Integer approveCarNo =(Integer)map.get("approveCarNo");
+        //设置请车数
+        tmstrainPleaseApproveResult.setResultPleaseNumber(new BigDecimal(approveCarNo));
+        //获取请车时间
+        Date approveTime =(Date) map.get("approveTime");
+        //设置请车时间
+        tmstrainPleaseApproveResult.setResultPleaseDate(approveTime);
+        //获取发站id
+        Integer sendId=(Integer)map.get("sendId");
+        tmstrainPleaseApproveResult.setSendStationId(DataChange.dataToBigDecimal(sendId));
+        //执行新增
+        return tmstrainPleaseApproveResultMapper.insertSelective(tmstrainPleaseApproveResult);
+    }
+
+    @Override
+    public List<Map<String, Object>> getArrivalSend() {
+        return tmstrainPleaseApproveResultMapper.getArrivalSend();
+    }
+
+    @Override
+    public List<Map<String, Object>> selectPleaseApprovePlanForConverted(Map<String, Object> map) {
+        return tmstrainPleaseApproveResultMapper.selectPleaseApprovePlanForConverted(map);
+    }
+
+    /**
+     * 获取请车计划号
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPleasePlanNo() {
+        return tmstrainPleaseApproveResultMapper.getPleasePlanNo();
+    }
+    //通过id渲染请车作业
+    @Override
+    public List<Map<String, Object>> selectPleasePlanByResultId(Integer resultId) {
+        return tmstrainPleaseApproveResultMapper.selectPleasePlanByResultId(resultId);
+    }
+   //通过id渲染批车作业
+    @Override
+    public List<Map<String, Object>> selectApproveBYResultId(Integer resultId) {
+        return tmstrainPleaseApproveResultMapper.selectApproveBYResultId(resultId);
+    }
+
+
     /**
      * 获取收货单位
      * @return

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

@@ -1,8 +1,10 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.TmstrainLoadingResultMapper;
 import com.steerinfo.dil.mapper.TmstrainWagonUnloadResultMapper;
 import com.steerinfo.dil.model.TmstrainWagonUnloadResult;
 import com.steerinfo.dil.service.ITmstrainWagonUnloadResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -59,6 +61,11 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         return tmstrainWagonUnloadResultMapper.insert(tmstrainWagonUnloadResult);
     }
 
+
+
+
+
+
     @Override
     public int updateTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
         tmstrainWagonUnloadResult.setUpdateTime(new Date());
@@ -84,4 +91,46 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
     public List<Map<String, Object>> getTmstrainWagonUnLoadResultByUnLoadingId(BigDecimal unloadingId) {
         return tmstrainWagonUnloadResultMapper.selectByUnLoadingId(unloadingId);
     }
+
+
+    //内转物流新增卸车实绩
+    @Override
+    public int addTmstrainWagonLoadResultForConverted(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
+        //生成主键id
+        tmstrainWagonUnloadResult.setUnloadingId(tmstrainWagonUnloadResultMapper.selectMaxId());
+        //通过装车车皮号得到并插入采购订单id
+        BigDecimal planId = tmstrainWagonUnloadResultMapper.getPurchaseOrderId(tmstrainWagonUnloadResult.getResultWagonNo());
+        tmstrainWagonUnloadResult.setPurchaseOrderRailPlanId(planId);
+        //常规字段插入
+        tmstrainWagonUnloadResult.setInsertUsername("admin");
+        tmstrainWagonUnloadResult.setInsertTime(new Date());
+        tmstrainWagonUnloadResult.setUpdateUsername("admin");
+        tmstrainWagonUnloadResult.setUpdateTime(new Date());
+        tmstrainWagonUnloadResult.setInsertUpdateRemark("无");
+        tmstrainWagonUnloadResult.setDeleted(new BigDecimal(0));
+        return tmstrainWagonUnloadResultMapper.insertSelective(tmstrainWagonUnloadResult);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectWagonUnLoadResult(Map<String, Object> map) {
+        return tmstrainWagonUnloadResultMapper.selectWagonUnLoadResult(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectUnloadByLoadingId(BigDecimal UnloadingId) {
+        return tmstrainWagonUnloadResultMapper.selectUnloadByLoadingId(UnloadingId);
+    }
+
+    /**
+     * 内转物流展示火车卸货实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getTrainResult(Map<String, Object> map) {
+        return tmstrainWagonUnloadResultMapper.getTrainResult(map);
+    }
+
+
+
 }

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

@@ -814,8 +814,70 @@
     where t_load.RESULT_ID = #{resultId}
   </select>
 
-
   <select id="getPortIdBySendStationId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
     select RAS.OWNED_PORT_ID from RMSTRAIN_ARRIVAL_SEND RAS where RAS.ARRIVAL_ID = #{sendStationId}
   </select>
+<!-- 通过发运计划号查找物资信息 -->
+  <select id="getMaterialInfoByRailPlanId" resultType="java.util.Map" parameterType="java.lang.Integer">
+   SELECT RM.MATERIAL_NAME "materialName",
+          AROM.OFFSET_MATERIAL_NUMBER "materialNumber",
+          AROM.OFFSET_MATERIAL_WEIGHT "materialWeight",
+          AROM.MATERIAL_ID "materialId"
+   FROM AMS_RAIL_OFFSET_DAYPLAN AROD
+   LEFT JOIN AMS_RAIL_OFFSET_MATERIAL AROM
+   ON AROM.DAYPLAN_ID=AROD.DAYPLAN_ID
+   LEFT JOIN RMS_MATERIAL RM
+   ON RM.MATERIAL_ID=AROM.MATERIAL_ID
+   WHERE AROD.DAYPLAN_ID=#{dayPlanId}
+  </select>
+<!-- 内转物流查询装车作业 -->
+  <select id="selectLoadedForConverted" resultType="java.util.Map">
+  select TLR.RESULT_BILLABLE_TONNAGE "tonnage",
+         TLR.RESULT_MATERIAL_THEORYWEIGHT "meterialTheoryweight",
+         AROD.DAYPLAN_NO "dayplanNo",
+         TLR.RESULT_CLASS "resultClass",
+         TLR.INSERT_UPDATE_REMARK "remark",
+         TLR.RESULT_LOADING_DATE "date",
+         TLR.RESULT_WAGON_NO "wagonNo",
+         RAS.ARRIVAL_NAME "arrivalName",
+         RAS2.ARRIVAL_NAME "arrivalName2",
+         RM.MATERIAL_NAME "materialName",
+         TLR.RESULT_MATERIAL_NUMBER "materialNumber",
+          RC2.CONSIGNEE_COMPANY_NAME "companyName",
+         AROD.DAYPLAN_CONSIGNEE_NAME "consigeeName",
+         AROD.DAYPLAN_CONSIGNEE_TEL "tel",
+         RAS2.DAYPLAN_DEDICATED_LINE "line",
+         RC.CAPACITY_NUMBER "capacityNumber"
+  from TMSTRAIN_LOADING_RESULT TLR
+  LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
+  ON AROD.DAYPLAN_ID=TLR.PURCHASE_ORDER_RAIL_PLAN_ID
+  LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+  ON RAS.ARRIVAL_ID=TLR.ARRIVAL_STATION_ID
+  LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2
+  ON TLR.SEND_STATION_ID=RAS2.ARRIVAL_ID
+  LEFT JOIN RMS_CAPACITY RC
+  ON RC.CAPACITY_ID=TLR.CAPACITY_ID
+  LEFT JOIN RMS_MATERIAL RM
+  ON RM.MATERIAL_ID=TLR.MATERIAL_ID
+  LEFT JOIN  RMS_CONSIGNEE RC2
+  ON RC2.CONSIGNEE_ID=AROD.RECEIVING_UNIT_ID
+
+  WHERE TLR.DELETED=0
+  </select>
+
+  <select id="selectLoadByResultId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
+    select
+      t_load.RESULT_WAGON_NO "resultWagonNo",
+      t_load.RESULT_BILLABLE_TONNAGE "resultBillableTonnage",
+      t_load.RESULT_CLASS "resultClass",
+      t_load.SEND_STATION_ID "sendStationId",
+      t_load.ARRIVAL_STATION_ID "arrivalStationId",
+      t_load.RESULT_LOADING_DATE "resultLoadingDate",
+      t_load.RESULT_REMARKS "resultRemarks",
+      t_load.RESULT_MATERIAL_NUMBER "materialNumber",
+      t_load.RESULT_MATERIAL_THEORYWEIGHT "materialTheoryWeight"
+    from TMSTRAIN_LOADING_RESULT t_load
+    where t_load.RESULT_ID = #{resultId}
+  </select>
+
 </mapper>

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

@@ -758,6 +758,7 @@
     where RESULT_ID = #{resultId}
   </select>
 
+
   <!-- 通过Id查询批车作业-->
   <select id="getApproveWagonPleaseById" parameterType="int" resultType="java.util.Map">
     select
@@ -795,4 +796,79 @@
     from
       AMS_RAIL_OFFSET_DAYPLAN AOD
   </select>
+
+  <!--根据id查找用户名    -->
+  <select id="selectPersonNameByPersonnelId" resultType="java.lang.String" parameterType="java.lang.Integer">
+    select RP.PERSONNEL_NAME "personnelName"
+    from  RMS_PERSONNEL RP
+    where RP.PERSONNEL_ID=#{personnelId}
+  </select>
+
+<!--内转物流查询请车计划-->
+  <select id="selectPleaseApprovePlanForConverted" parameterType="java.lang.Integer" resultType="java.util.Map">
+    SELECT RS.SHIPPER_NAME "shipperName",
+           AROD.DAYPLAN_NO "dayplanNo",
+           RM.MATERIAL_NAME "materialName",
+           AROM.OFFSET_MATERIAL_WEIGHT "theoreticalWeight",
+           AROM.OFFSET_MATERIAL_NUMBER "meterialNumber",
+           RAS.ARRIVAL_NAME "arriverName",
+           RAS2.ARRIVAL_NAME "arriverName2",
+           RAS2.DAYPLAN_DEDICATED_LINE "dayPlanDedicatedLine",
+           RC.CONSIGNEE_CONTACT_NAME "deliveryAdress",
+           AROD.DAYPLAN_CONSIGNEE_TEL "tel",
+           AROD.DAYPLAN_CONSIGNEE_NAME  "consigneeName"
+
+    FROM TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+    LEFT JOIN  AMS_RAIL_OFFSET_DAYPLAN AROD
+    ON  AROD.DAYPLAN_ID=TPAR.RAIL_PLAN_ID
+    LEFT JOIN AMS_RAIL_OFFSET_MATERIAL AROM
+    ON AROM.DAYPLAN_ID=AROD.DAYPLAN_ID
+    LEFT JOIN  RMS_MATERIAL RM
+    ON RM.MATERIAL_ID=AROM.MATERIAL_ID
+    LEFT JOIN RMS_SHIPPER RS
+    ON RS.SHIPPER_ID=TPAR.SHIPPER_ID
+    LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+    ON RAS.ARRIVAL_ID=TPAR.SEND_STATION_ID
+    LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2
+    ON RAS2.ARRIVAL_ID=TPAR.TO_THE_STATION_ID
+    LEFT JOIN RMS_CONSIGNEE RC
+    ON RC.CONSIGNEE_ID=AROD.RECEIVING_UNIT_ID
+    WHERE TPAR.STATUS=#{status}
+  </select>
+<!-- 发站/到站下拉框 -->
+  <select id="getArrivalSend" resultType="java.util.LinkedHashMap">
+    select
+      RAS.ARRIVAL_ID "id",
+      RAS.ARRIVAL_ID "value",
+      RAS.ARRIVAL_NAME "label"
+    from
+      RMSTRAIN_ARRIVAL_SEND RAS
+  </select>
+<!-- 请车计划号-->
+  <select id="getPleasePlanNo" resultType="java.util.LinkedHashMap">
+    select TPAR.RESULT_ID "id",
+           TPAR.RESULT_ID "value",
+           TPAR.RESULT_APPROVE_NUMBER "label"
+    from   TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+  </select>
+
+  <!--通过id渲染查询内转物流请车计划 -->
+  <select id="selectPleasePlanByResultId" parameterType="java.lang.Integer" resultType="java.util.LinkedHashMap">
+    SELECT TPAR.RESULT_PLEASE_PLAN_NO "planNo",
+           TPAR.RAIL_PLAN_ID "planId",
+           TPAR.SEND_STATION_ID "sendStationId",
+           TPAR.RESULT_APPROVE_NUMBER "approveNumber",
+           TPAR.RESULT_APPROVE_DATE "approveDate"
+   FROM TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+   WHERE TPAR.RESULT_ID=#{resultId}
+  </select>
+
+<!-- 通过id渲染批车计划 -->
+  <select id="selectApproveBYResultId" parameterType="java.lang.Integer" resultType="java.util.LinkedHashMap">
+    SELECT TPAR.RESULT_PLEASE_PLAN_NO "pleaseNo",
+           TPAR.RESULT_APPROVE_NUMBER "approveNumber",
+           TPAR.RESULT_APPROVE_DATE "approveDate"
+    FROM TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+    WHERE TPAR.RESULT_ID=#{resultId}
+  </select>
 </mapper>

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

@@ -608,7 +608,7 @@
     </if>
   </sql>
 
-
+<!-- 获取采购订单号 -->
   <select id="getPurchaseOrderId" parameterType="String" resultType="java.math.BigDecimal">
     select PURCHASE_ORDER_RAIL_PLAN_ID from TMSTRAIN_LOADING_RESULT where RESULT_WAGON_NO = #{resultWagonNo} and DELETED = 0
   </select>
@@ -723,13 +723,13 @@
     from TMSTRAIN_UNLOAD_POINT
   </select>
 
-  <select id="getUnloadingRouteName" resultType="java.util.LinkedHashMap">
-    select
-      UNLOAD_ROUTE_ID "id",
-      UNLOAD_ROUTE_ID "value",
-      UNLOAD_ROUTE_NAME "label"
-    from TMSTRAIN_UNLOAD_ROUTE
-  </select>
+<!--  <select id="getUnloadingRouteName" resultType="java.util.LinkedHashMap">-->
+<!--    select-->
+<!--      UNLOAD_ROUTE_ID "id",-->
+<!--      UNLOAD_ROUTE_ID "value",-->
+<!--      UNLOAD_ROUTE_NAME "label"-->
+<!--    from TMSTRAIN_UNLOAD_ROUTE-->
+<!--  </select>-->
 
   <select id="selectByUnLoadingId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
     select
@@ -743,4 +743,172 @@
     from TMSTRAIN_WAGON_UNLOAD_RESULT t_unload
     where t_unload.UNLOADING_ID = #{unloadingId}
   </select>
+  <select id="selectWagonUnLoadResult" resultType="java.util.Map">
+SELECT AROD.DAYPLAN_NO "dayPlanNo",
+       TWUR.RESULT_WAGON_NO "wagonNo",
+       TWUR.RESULT_UNLOAD_TIME "unLoadTime",
+       RAS.ARRIVAL_NAME "arrivelName",
+       RS.SHIPPER_NAME "shipperName",
+       RC.CONSIGNEE_COMPANY_NAME "address",
+       AROD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+       AROD.DAYPLAN_CONSIGNEE_NAME "consigneeName",
+       AROD.DAYPLAN_CONSIGNEE_TEL "tel",
+       RAS.DAYPLAN_DEDICATED_LINE "line",
+       RM.MATERIAL_NAME "materialName",
+       AROM.OFFSET_MATERIAL_WEIGHT "weight",
+       AROM.OFFSET_MATERIAL_NUMBER "number",
+       TWUR.RESULT_ARRIVAL_DATE "arrivaldate",
+       TWUR.INSERT_TIME "insertTime",
+       RW.WAREHOUSE_NAME "warehouseName",
+       TWUR.INSERT_UPDATE_REMARK "remark"
+FROM TMSTRAIN_WAGON_UNLOAD_RESULT TWUR
+LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
+ON AROD.DAYPLAN_ID=TWUR.PURCHASE_ORDER_RAIL_PLAN_ID
+LEFT JOIN  RMSTRAIN_ARRIVAL_SEND RAS
+ON  RAS.ARRIVAL_ID=AROD.DAYPLAN_TO_THE_STATION_ID
+LEFT JOIN RMS_SHIPPER RS
+ON RS.SHIPPER_ID=AROD.SHIPPER_ID
+LEFT JOIN RMS_CONSIGNEE RC
+ON  RC.CONSIGNEE_ID=AROD.RECEIVING_UNIT_ID
+LEFT JOIN  AMS_RAIL_OFFSET_MATERIAL AROM
+ON  AROM.DAYPLAN_ID=AROD.DAYPLAN_ID
+LEFT JOIN RMS_MATERIAL RM
+ON RM.MATERIAL_ID=AROM.MATERIAL_ID
+LEFT JOIN RMS_WAREHOUSE RW
+ON TWUR.UNLOADING_POINT_ID=RW.WAREHOUSE_ID
+LEFT JOIN RMS_WAREHOUSE_TYPE RWT
+ON RW.WAREHOUSE_TYPE_ID=RWT.WAREHOUSE_TYPE_ID
+WHERE  RWT.WAREHOUSE_TYPE_ID=2
+<where>
+  <if test="dayPlanNo!= null">
+    and
+    <foreach collection="dayPlanNo" item="item" open="(" separator="or" close=")">
+      "dayPlanNo" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="wagonNo!= null">
+    and
+    <foreach collection="wagonNo" item="item" open="(" separator="or" close=")">
+      "wagonNo" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="unLoadTime!= null">
+    and
+    <foreach collection="unLoadTime" item="item" open="(" separator="or" close=")">
+      "unLoadTime" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="arrivelName!= null">
+    and
+    <foreach collection="arrivelName" item="item" open="(" separator="or" close=")">
+      "arrivelName" 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="address!= null">
+  and
+  <foreach collection="address" item="item" open="(" separator="or" close=")">
+    "address" like '%${item}%'
+  </foreach>
+  </if>
+  <if test="deliveryDate!= null">
+    and
+    <foreach collection="deliveryDate" item="item" open="(" separator="or" close=")">
+      "deliveryDate" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="consigneeName!= null">
+    and
+    <foreach collection="consigneeName" item="item" open="(" separator="or" close=")">
+      "consigneeName" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="tel!= null">
+    and
+    <foreach collection="tel" item="item" open="(" separator="or" close=")">
+      "tel" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="line!= null">
+    and
+    <foreach collection="line" item="item" open="(" separator="or" close=")">
+      "line" 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="weight!= null">
+    and
+    <foreach collection="weight" item="item" open="(" separator="or" close=")">
+      "weight" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="number!= null">
+    and
+    <foreach collection="number" item="item" open="(" separator="or" close=")">
+      "number" like '%${item}%'
+    </foreach>
+  </if>
+  <if test="arrivaldate!= null">
+    and
+    <foreach collection="arrivaldate" item="item" open="(" separator="or" close=")">
+      "arrivaldate" like '%${item}%'
+    </foreach>
+  </if>
+</where>
+    <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
+</select>
+<!--通过id渲染车皮卸车作业 -->
+  <select id="selectUnloadByLoadingId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
+    select
+      t_unload.RESULT_WAGON_NO "resultWagonNo",
+      t_unload.RESULT_ARRIVAL_DATE "resultArrivalDate",
+      t_unload.RESULT_UNLOAD_TIME "resultUnloadTime",
+      t_unload.UNLOADING_POINT_ID "unloadingPointId",
+      t_unload.RESULT_BIG_TICKET_WEIGHT "resultBigTicketWeight",
+      t_unload.RESULT_RAIL_HORIZONTAL_WEIGHT "resultRailHorizontalWeight",
+      t_unload.RESULT_REMARK "resultRemark"
+    from TMSTRAIN_WAGON_UNLOAD_RESULT t_unload
+    where t_unload.UNLOADING_ID = #{unloadingId}
+  </select>
+<!-- 火车卸货 -->
+  <select id="getTrainResult" resultType="java.util.LinkedHashMap">
+  select *
+  from(
+  select a_order.PURCHASE_ORDER_NO "purchaseOrderNo",
+  t_load.RESULT_WAGON_NO "resultWagonNo",
+  d_batch.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+  r_material.MATERIAL_NAME "materialName",
+  t_unload.RESULT_UNLOAD_TIME "resultUnloadTime",
+  (t_load.RESULT_BILLABLE_TONNAGE-t_unload.RESULT_RAIL_HORIZONTAL_WEIGHT) "differentialWeight",
+  oo.ORDER_NO "orderNo",
+  TUP.UNLOAD_POINT_NAME "unloadPointName"
+  from TMSTRAIN_LOADING_RESULT t_load
+  left join AMS_PURCHASE_ORDER a_order
+  on t_load.PURCHASE_ORDER_RAIL_PLAN_ID=a_order.PURCHASE_ORDER_ID
+  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
+  left join TMSTRAIN_WAGON_UNLOAD_RESULT t_unload
+  on t_unload.RESULT_WAGON_NO=t_load.RESULT_WAGON_NO
+  LEFT JOIN OMSTRAIN_ORDER OO
+  ON OO.ORDER_WAGON_NO=t_unload.RESULT_WAGON_NO
+  left join TMSTRAIN_UNLOAD_POINT TUP
+  on TUP.UNLOAD_POINT_ID=t_unload.UNLOADING_ID
+  where t_load.DELETED = 0
+  )
+  </select>
 </mapper>