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

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

@@ -103,4 +103,18 @@ public class DropDownController extends BaseRESTfulController {
         List<Map<String, Object>> port = dropDownService.getPlatformId();
         return success(port);
     }
+    //内转物流下拉框
+    @ApiOperation(value="查询装货地点")
+    @GetMapping("/getLoadedPlace")
+    public RESTfulResult getLoadedPlace(){
+        List<Map<String, Object>> loadedPlace = dropDownService.getLoadedPlace();
+        return success(loadedPlace);
+    }
+
+    @ApiOperation(value="查询外轮船名")
+    @GetMapping("/getForeignName")
+    public RESTfulResult getForeignName(){
+        List<Map<String, Object>> foreignName = dropDownService.getForeignName();
+        return success(foreignName);
+    }
 }

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

@@ -170,7 +170,7 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="销售订单新增 ")
+    @ApiOperation(value="销售新增装车实绩 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
     })
@@ -179,4 +179,76 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         int i = tmstruckLoadResultService.addSaleLoadResult(map);
         return success(i);
     }
+    //内转物流新增装车实绩
+    @ApiOperation(value="内转物流新增装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addLoadResultForconverted")
+    public RESTfulResult addLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map){
+        String orderNumber=(String)map.get("orderNumber");
+        Map<String,Object> loadResultIdForOrderNumber = tmstruckLoadResultService.getLoadResultIdForOrderNumber(orderNumber);
+        Integer loadResultId =(Integer) loadResultIdForOrderNumber.get("loadResultId");
+        //通过运输订单号查找实绩是否存在
+        int i=0;
+        int i1=0;
+        int i2=0;
+        if (loadResultId==null){
+            //执行新增
+            i=tmstruckLoadResultService.addLoadResultForconverted(map);
+            //然后执行更新
+            i1=tmstruckLoadResultService.updateLoadResultForconverted(map);
+        }
+        else {
+            i2=tmstruckLoadResultService.updateLoadResultForconverted(map);
+        }
+        return  success(i+i1+i2);
+    }
+    //***********************************内转物流*************************************************
+    /**
+     * 新增汽车装货实绩
+     */
+    @ApiOperation(value="新增汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLoadResultForConverted")
+    public RESTfulResult addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map){
+        int i = tmstruckLoadResultService.addLoadResultForConverted(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询所有装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(91)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectLoadResultForConverted")
+    public RESTfulResult selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize
+    ){
+
+        //不分页筛选数据
+        List<Map<String, Object>> allLoadResult = tmstruckLoadResultService.selectLoadResultForConverted(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> loadResult = tmstruckLoadResultService.selectLoadResultForConverted(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLoadResult,loadResult);
+        return success(pageList);
+    }
+
+    //根据实绩id渲染数据
+    @ApiOperation(value="通过ID查询装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLoadResultByResultId/{resultId}")
+    public RESTfulResult getLoadResultByResultId(@PathVariable("resultId") Integer resultId){
+        List<Map<String, Object>> date = tmstruckLoadResultService.selectLoadResultByResultId(resultId);
+        return success(date);
+    }
 }

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

@@ -89,4 +89,30 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
         int i = tmstruckQualityResultService.updateQualityResult(tmstruckQualityResult);
         return success(i);
     }
+    /**
+     * 内转物流查询质检实绩
+     */
+    @ApiOperation(value="内转物流查询质检作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(204)", 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("/selectQualityResultForConverted")
+    public RESTfulResult selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allQualityResult = tmstruckQualityResultService.selectQualityResultForConverted(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> qualityResult = tmstruckQualityResultService.selectQualityResultForConverted(mapValue);
+        DataChange.dataTo2Number(qualityResult, "resultDeduction");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQualityResult,qualityResult);
+        return success(pageList);
+    }
 }

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

@@ -2,8 +2,11 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.ITmstruckTotalResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,7 +31,8 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
 
     @Autowired
     ITmstruckTotalResultService tmstruckTotalResultService;
-
+    @Autowired
+    ColumnDataUtil columnDataUtil;
     @ApiOperation(value="添加总实绩 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "订单Id", required = false, dataType = "Map"),
@@ -38,4 +43,54 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
         int i = tmstruckTotalResultService.addTotalResult(orderId);
         return success(i);
     }
+    /**
+     * 展示计数实绩列表
+     *
+     */
+
+    @ApiOperation(value="查询计数实绩列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", 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("/selectCountList")
+    public RESTfulResult selectCountList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allUnloadResult = tmstruckTotalResultService.selectCountList(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> unloadResult = tmstruckTotalResultService.selectCountList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allUnloadResult,unloadResult);
+        return success(pageList);
+    }
+    @ApiOperation(value="查询所有的包月作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(111)", 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("/getTmstruckMonthResult")
+    public RESTfulResult getTmstruckMonthResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allQualityResult = tmstruckTotalResultService.getTmstruckMonthResult(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> qualityResult = tmstruckTotalResultService.getTmstruckMonthResult(mapValue);
+        DataChange.dataTo2Number(qualityResult, "resultDeduction");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQualityResult,qualityResult);
+        return success(pageList);
+    }
 }

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

@@ -86,4 +86,34 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
         int i = tmstruckUnloadResultService.addUnloadResult(mapValue);
         return success(i);
     }
+//*******************************************内转物流**************************************************
+    /**
+     *  内转物流卸货装车实绩
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="内转物流新增卸货实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addUnLoadResultForconverted")
+    public RESTfulResult addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map){
+        String orderNumber=(String)map.get("orderNumber");
+        Map<String,Object> loadResultIdForOrderNumber = tmstruckUnloadResultService.selectLoadResultIdByOrderNumber(orderNumber);
+        Integer loadResultId =(Integer) loadResultIdForOrderNumber.get("loadResultId");
+        //通过运输订单号查找实绩是否存在
+        int i=0;
+        int i1=0;
+        int i2=0;
+        if (loadResultId==null){
+            //执行新增
+            i=tmstruckUnloadResultService.addUnloadresultForconverted(map);
+            //然后执行更新
+            i1=tmstruckUnloadResultService.updateUnloadresultForconverted(map);
+        }
+        else {
+            i2=tmstruckUnloadResultService.updateUnloadresultForconverted(map);
+        }
+        return  success(i+i1+i2);
+    }
 }

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 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;
@@ -123,6 +124,15 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         int i = tmstruckWeightResultService.addJiPiResult(mapValue);
         return success(i);
     }
+
+    /**
+     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    @PostMapping("/updateTruckCalculate/{orderId}")
+    public RESTfulResult updateTruckCalculate(@PathVariable("orderId") Integer orderId){
+        int i=tmstruckWeightResultService.isNextNeedJl(new BigDecimal(orderId));
+        return  success(i);
+    }
 }
 
   

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-10-29 11:23
+ */
+@FeignClient(value = "dil-join-api-dev", url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+    @PostMapping("/api/v1/join/tmsTruckSms/insertSms")
+    public boolean push(@RequestBody(required = false)Map<String, Object> map2) ;
+
+
+}

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

@@ -44,4 +44,9 @@ public interface DropDownMapper {
     //获取所有的月台
     List<Map<String, Object>> getPlatformId();
 
+    //装货地点下拉框
+    List<Map<String,Object>>   getLoadedPlace();
+
+    //外轮船名下拉框
+    List<Map<String,Object>> getForeignName();
 }

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

@@ -47,4 +47,20 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     //根据运输订单号查找物资id
     List<Map<String,Object>> selectMaterialIdByOrderNumber(Map<String, Object> map);
+    //内转物流汽车装货展示
+    List<Map<String,Object>> selectLoadResultForConverted(Map<String,Object> map);
+
+
+
+    //通过实绩id渲染数据
+    List<Map<String,Object>> selectLoadResultByResultId(Integer resultId);
+
+    //通过车牌号查找物资id和运力id以及总实绩id
+    Map<String,Object> selectMaterialIdAndCapacityId(String  capacityNumber);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> selectLoadResultIdByOrderNumber(String orderNumber);
+
+    //通过用户id查找用户姓名
+    String selectPersonNameByPersonnelId(Integer personnelId);
 }

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

@@ -21,4 +21,7 @@ public interface TmstruckQualityResultMapper extends IBaseMapper<TmstruckQuality
     //获取主键
     @Select("select seq_tmstruck_quality.nextval from dual")
     BigDecimal selectMaxId();
+
+    //内转物流查询质检作业
+    List<Map<String,Object>>  selectQualityResultForConverted(Map<String,Object> map);
 }

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

@@ -20,4 +20,7 @@ public interface TmstruckSmsRusultMapper extends IBaseMapper<TmstruckSmsRusult,
     String selectCarDriverByOrderNumber(String orderNumber);
     //查询短信实绩
     List<Map<String,Object>> selectSmsResult(Map<String,Object> map);
+
+    Map<String,Object> selectIdApp(BigDecimal bigDecimal);
+
 }

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

@@ -6,10 +6,17 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface TmstruckTotalResultMapper extends IBaseMapper<TmstruckTotalResult, BigDecimal> {
     //查询最大ID值
     @Select("select seq_tmstruck_total_result.nextval from dual")
     BigDecimal selectMaxId();
+
+    //查询计数作业
+    List<Map<String,Object>> selectCountList(Map<String,Object> map);
+    //查询包月作业
+    List<Map<String, Object>> getTmstruckMonthResult(Map<String, Object> mapValue);
 }

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

@@ -26,4 +26,7 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 
     //通过卸货地点查询仓库Id
     BigDecimal getWarehouseIdByWName(String warehouseName);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> selectUnloadResultIdByOrderNumber(String orderNumber);
 }

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

@@ -33,5 +33,12 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //通过物资ID查询应该在哪个汽车衡计量
     List<Integer> getCalculateIdByMaterial(BigDecimal material);
-
+    //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
+    Map<BigDecimal, String> selectByOrderId(BigDecimal orderId);
+    /**
+     * 通过物料、性质判断所去的汽车衡
+     */
+    BigDecimal getTruckCalculateNumber(BigDecimal materialTypeId, BigDecimal bigDecimal);
+
+    List<BigDecimal> getNextStep(BigDecimal lineId, int orderLineSequence);
 }

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

@@ -35,4 +35,10 @@ public interface DropDownService {
 
     //获取所有的月台
     List<Map<String, Object>> getPlatformId();
+
+    //装货地点下拉框
+    List<Map<String,Object>>   getLoadedPlace();
+
+    //外轮船名下拉框
+    List<Map<String,Object>> getForeignName();
 }

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

@@ -44,4 +44,24 @@ public interface ITmstruckLoadResultService{
 
     //销售查询所有的装车实绩
     List<Map<String,Object>> selectLoadResultForSale(Map<String,Object> map);
+
+    //内转物流，新增装车实绩
+    int addLoadResultForconverted(Map<String,Object> map);
+
+    //内转物流，修改装车实绩
+    int updateLoadResultForconverted(Map<String,Object> map);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> getLoadResultIdForOrderNumber(String orderNumber);
+
+    //内转物流汽车装货展示
+    List<Map<String,Object>> selectLoadResultForConverted(Map<String,Object> map);
+
+
+
+    //通过实绩id渲染数据
+    List<Map<String,Object>> selectLoadResultByResultId(Integer resultId);
+
+    //内转物流火车装车新增装车实绩
+    int addLoadResultForConverted(Map<String,Object> map);
 }

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

@@ -31,4 +31,7 @@ public interface ITmstruckQualityResultService {
     //修改质检作业
     int updateQualityResult(TmstruckQualityResult tmstruckQualityResult);
 
+    //内转物流查询质检作业
+    List<Map<String,Object>>  selectQualityResultForConverted(Map<String,Object> map);
+
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.service;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ author    :TXF
@@ -10,4 +12,8 @@ import java.math.BigDecimal;
 public interface ITmstruckTotalResultService {
 
     public int addTotalResult(BigDecimal orderId);
+    //查询计数作业
+    List<Map<String,Object>> selectCountList(Map<String,Object> map);
+    //查询包月作业
+    List<Map<String, Object>> getTmstruckMonthResult(Map<String, Object> mapValue);
 }

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

@@ -28,4 +28,13 @@ public interface ITmstruckUnloadResultService{
 
     // 修改实绩内容
     int updateUnloadResult(Map<String, Object> map);
+
+    //新增卸货实绩
+    int addUnloadresultForconverted(Map<String,Object> map);
+
+    //修改卸货实绩
+    int updateUnloadresultForconverted(Map<String,Object> map);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> selectLoadResultIdByOrderNumber(String orderNumber);
 }

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

@@ -35,4 +35,8 @@ public interface ITmstruckWeightResultService{
 
     //通过物资ID查询应该在哪个汽车衡计量
     int getCalculateIdByMaterial(BigDecimal materialId);
+    /**
+     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    int isNextNeedJl(BigDecimal bigDecimal);
 }

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

@@ -108,6 +108,23 @@ public class DropDownServiceImpl implements DropDownService {
     public List<Map<String, Object>> getPlatformId() {
         return dropDownMapper.getPlatformId();
     }
+    /**
+     * 获取装货点下拉框
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getLoadedPlace() {
+        return dropDownMapper.getLoadedPlace();
+    }
+
+    /**
+     * 获取外轮船名
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getForeignName() {
+        return dropDownMapper.getForeignName();
+    }
 
 
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
+import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.DataChange;
@@ -36,6 +37,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
+    @Autowired
+    private TmstruckReturnResultMapper tmstruckReturnResultMapper;
 
     @Autowired
     private UtilsServiceImpl utilsService;
@@ -362,6 +365,121 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         return null;
     }
 
+    //内转物流，新增装车实绩
+    @Override
+    public int addLoadResultForconverted(Map<String, Object> map) {
+        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        //设置主键id
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //获取开始时间
+        Date startTime =(Date) map.get("startTime");
+        //获取运输订单号
+        String OrderNumber=map.get("OrderNumber").toString();
+        Map<String,Object> Map=new HashMap<>();
+        Map.put("OrderNumber",OrderNumber);
+        //通过运输订单号查找物资id
+        List<Map<String, Object>> materialIdList=tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(Map);
+        //设置物资id
+        for (int i=0;i<materialIdList.size();i++){
+            Map<String,Object> map1 = materialIdList.get(i);
+            Integer materialId =(Integer) map1.get("materialId");
+            tmstruckLoadResult.setMaterialId(new BigDecimal(materialId));
+        }
+        //绑定总实绩id
+        Map<String,Object> map2=tmstruckReturnResultMapper.getResultTotalIdByOrderNumber(OrderNumber);
+        BigDecimal  reultTotalId=(BigDecimal)map2.get("resultTotalId");
+        //设置总实绩id
+        tmstruckLoadResult.setResultTotalId(reultTotalId);
+        tmstruckLoadResult.setResultLoadStartTime(startTime);
+        //获取用户id
+        Integer personnelId=(Integer)map.get("personnelId");
+        String personnelName= tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
+        tmstruckLoadResult.setInsertTime(new Date());
+        tmstruckLoadResult.setInsertUsername(personnelName);
+        int i=tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        return i;
+    }
+    //内转物流,修改装车实绩
+    @Override
+    public int updateLoadResultForconverted(Map<String, Object> map) {
+        //获取装车实绩id
+        //通过运输订单号查找装车实绩
+        String orderNumber =(String) map.get("orderNumber");
+        Map<String,Object> map1 = tmstruckLoadResultMapper.selectLoadResultIdByOrderNumber(orderNumber);
+        //获取结束时间
+        Integer LoadResultId=(Integer)map1.get("loadResultId");
+        Date endTime=(Date)map.get("endTime");
+        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        //根据主键id设置装车结束时间
+        tmstruckLoadResult.setResultId(new BigDecimal(LoadResultId));
+        tmstruckLoadResult.setResultLoadEndTime(endTime);
+        //获取装车开始时间
+        Date startTime = (Date)map1.get("startTime");
+        //开始时间
+        long LoadstartTime = startTime.getTime();
+        long LoadendTime = endTime.getTime();
+        long time = LoadendTime - LoadstartTime;
+        long l = time / 1000;
+        //设置标准时长
+        tmstruckLoadResult.setResultLoadDuration(new BigDecimal(l));
+        int i=tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        return i;
+    }
+
+    @Override
+    public Map<String, Object> getLoadResultIdForOrderNumber(String orderNumber) {
+        return tmstruckLoadResultMapper.selectLoadResultIdByOrderNumber(orderNumber);
+    }
+
+    /**
+     * 内转物流汽车装货实绩展示
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectLoadResultForConverted(Map<String, Object> map) {
+        return tmstruckLoadResultMapper.selectLoadResultForConverted(map);
+    }
+
 
+    /**
+     * 根据实绩id渲染数据
+     * @param resultId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectLoadResultByResultId(Integer resultId) {
+        return tmstruckLoadResultMapper.selectLoadResultByResultId(resultId);
+    }
+
+    /**
+     * 内转物流新增装车实绩(火车卸货后装车，装车点固定为达州站）
+     * @param map
+     * @return
+     */
+    @Override
+    public int addLoadResultForConverted(Map<String, Object> map) {
+        Integer personnelId =(Integer) map.get("personnelId");
+        String personnelName= tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
+        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //获取车牌号
+        String capacityNumber = (String)map.get("capacityNumber");
+        Map<String,Object> map1 = tmstruckLoadResultMapper.selectMaterialIdAndCapacityId(capacityNumber);
+        BigDecimal materialId =(BigDecimal) map1.get("materialId");
+        BigDecimal resultTotalId = (BigDecimal)map1.get("resultTotalId");
+        tmstruckLoadResult.setMaterialId(materialId);
+        tmstruckLoadResult.setResultTotalId(resultTotalId);
+        tmstruckLoadResult.setInsertTime(new Date());
+        //获取装货点
+        Integer arrivalId =(Integer) map.get("arrivalId");
+        tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(arrivalId));
+        Date insertTime =(Date)map.get("insertTime");
+        tmstruckLoadResult.setInsertTime(insertTime);
+        Integer tonnage =(Integer) map.get("tonnage");
+        tmstruckLoadResult.setResultMeasuredTonnage(DataChange.dataToBigDecimal(tonnage));
+        tmstruckLoadResult.setInsertUsername(personnelName);
+        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+    }
 
 }

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

@@ -61,4 +61,9 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
         tmstruckQualityResultMapper.updateByPrimaryKeySelective(tmstruckQualityResult);
         return 0;
     }
+
+    @Override
+    public List<Map<String, Object>> selectQualityResultForConverted(Map<String, Object> map) {
+        return tmstruckQualityResultMapper.selectQualityResultForConverted(map);
+    }
 }

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

@@ -1,16 +1,20 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckSmsRusultMapper;
 import com.steerinfo.dil.model.TmstruckSmsRusult;
 import com.steerinfo.dil.service.ITmstruckSmsRusultService;
+import com.steerinfo.dil.util.MD5Util;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.security.provider.MD5;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +38,8 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
     private TmstruckSmsRusultMapper tmstruckSmsRusultMapper;
     @Autowired
     private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
+    @Autowired
+    JoinFeign joinFeign;
 //    @Autowired
 //    private OmstruckOrderMapper omstruckOrderMapper;
 
@@ -64,15 +70,41 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
         Integer shipperId = tmstruckSmsRusultMapper.selectShipperIdByOrderNumber(orderNumber);
         //设置发送方id
         tmstruckSmsRusult.setSenderId(new BigDecimal(shipperId));
+        //通过发送方ID查询appId和秘钥
+        Map<String,Object>map5=tmstruckSmsRusultMapper.selectIdApp(new BigDecimal(shipperId));
+        String AppId= (String) map5.get("AppId");
+        String secretKey=(String) map5.get("secretKey");
+
         tmstruckSmsRusult.setResultSendingTime(new Date());
         //根据运输订单号查找司机电话号码
         String driverPhone=tmstruckSmsRusultMapper.selectCarDriverByOrderNumber(orderNumber);
+        String content="您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流";
         tmstruckSmsRusult.setResultSmsContent("您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流");
+
         //新增短信实绩
         tmstruckSmsRusult.setInsertTime(new Date());
-//        tmstruckSmsRusult.setInsertUsername(personnelName);
-        int i=tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
-        return i;
+        //调用接口发送短信
+        Map<String, Object> map2 = new HashMap<>();
+        String timestamp=String.valueOf(new Date().getTime());
+        String sign=AppId+secretKey+timestamp;
+        try {
+            String signMd5=MD5Util.md5Encode(sign);
+            map2.put("sign",signMd5);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+      	map2.put("AppId",AppId);
+        map2.put("timestamp",timestamp);
+        map2.put("content",content);
+        map2.put("mobiles",driverPhone);
+        if (joinFeign.push(map2)){
+            int i=tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
+            return i;
+        }
+        else return 0;
+
+
+
     }
 
     @Override

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

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ author    :TXF
@@ -34,5 +36,21 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
         tmstruckTotalResult.setInsertUsername("admin");
         return tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
     }
-
+    /**
+     * 展示计数实绩列表
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectCountList(Map<String, Object> map) {
+        return tmstruckTotalResultMapper.selectCountList(map);
+    }
+    /**
+     * 展示包月实绩列表
+     * @param map
+     * @return
+     */
+    public List<Map<String, Object>> getTmstruckMonthResult(Map<String, Object> mapValue) {
+        return tmstruckTotalResultMapper.getTmstruckMonthResult(mapValue);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
 import com.steerinfo.dil.mapper.TmstruckUnloadResultMapper;
 import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
@@ -7,13 +8,20 @@ import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.dil.model.TmstruckUnloadResult;
 import com.steerinfo.dil.service.ITmstruckUnloadResultService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,6 +47,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     @Autowired
     private TmstruckReceiptResultServiceImpl tmstruckReceiptResultService;
 
+    @Autowired
+    private TmstruckLoadResultMapper tmstruckLoadResultMapper;
 
     @Autowired
     private UtilsServiceImpl utilsService;
@@ -147,6 +157,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         return i;
     }
 
+
+
     /**
      * 扫码确认卸货 更新卸货实绩
      *  运输订单号
@@ -174,4 +186,64 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         return tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
     }
 
+
+    //内转物流更新卸车实绩
+    @Override
+    public int updateUnloadresultForconverted(Map<String, Object> map) {
+        //获取装车实绩id
+        //通过运输订单号查找装车实绩
+        String orderNumber =(String) map.get("orderNumber");
+        Map<String,Object> map1 = tmstruckUnloadResultMapper.selectUnloadResultIdByOrderNumber(orderNumber);
+        //获取结束时间
+        Integer LoadResultId=(Integer)map1.get("loadResultId");
+        Date endTime=(Date)map.get("endTime");
+        TmstruckUnloadResult tmstruckUnloadResult=new TmstruckUnloadResult();
+        //根据主键id设置装车结束时间
+        tmstruckUnloadResult.setResultId(new BigDecimal(LoadResultId));
+        tmstruckUnloadResult.setResultEndTime(endTime);
+        //获取装车开始时间
+        Date startTime = (Date)map1.get("startTime");
+        //开始时间
+        long LoadstartTime = startTime.getTime();
+        long LoadendTime = endTime.getTime();
+        long time = LoadendTime - LoadstartTime;
+        long l = time / 1000;
+        //设置标准时长
+        tmstruckUnloadResult.setResultDuration(new BigDecimal(l));
+        int i=tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
+        return i;
+
+    }
+    //根据运输订单查找装车实绩id
+    @Override
+    public Map<String, Object> selectLoadResultIdByOrderNumber(String orderNumber) {
+        return tmstruckUnloadResultMapper.selectUnloadResultIdByOrderNumber(orderNumber);
+    }
+    //内转物流新增卸车实绩
+    @Override
+    public int addUnloadresultForconverted(Map<String, Object> map) {
+        TmstruckUnloadResult tmstruckUnloadResult=new TmstruckUnloadResult();
+        //设置主键id
+        BigDecimal maxId = tmstruckUnloadResultMapper.selectMaxId();
+        tmstruckUnloadResult.setId(maxId);
+        //获取开始时间
+        Date startTime =(Date) map.get("startTime");
+        //获取运输订单号
+        String OrderNumber=map.get("OrderNumber").toString();
+
+        //绑定总实绩id
+        Map<String,Object> map2=tmstruckLoadResultMapper.selectLoadResultIdByOrderNumber(OrderNumber);
+        BigDecimal  reultTotalId=(BigDecimal)map2.get("resultTotalId");
+        //设置总实绩id
+        tmstruckUnloadResult.setResultTotalId(reultTotalId);
+        tmstruckUnloadResult.setResultStartTime(startTime);
+        //获取用户id
+        Integer personnelId=(Integer)map.get("personnelId");
+        String personnelName= tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
+        tmstruckUnloadResult.setInsertTime(new Date());
+        tmstruckUnloadResult.setInsertUsername(personnelName);
+        int i=tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+        return i;
+    }
+
 }

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

@@ -311,4 +311,111 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         tmstruckWeightResult.setUpdateTime(new Date());
         tmstruckWeightResult.setUpdateUsername("admin");
     }
+    /**
+     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    @Override
+    public int isNextNeedJl(BigDecimal orderId) {
+        //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
+        Map<BigDecimal,String> map=tmstruckWeightResultMapper.selectByOrderId(orderId);
+        //通过运输订单id获取物资的类型
+        BigDecimal materialTypeId=new BigDecimal(map.get("materialTypeId").toString());
+        //获取路段顺序号
+        BigDecimal orderLineSequence=new BigDecimal(map.get("orderLineSequence").toString());
+        //计量实绩主键
+        BigDecimal weightTaskResultId=new BigDecimal(map.get("weightTaskResultId").toString());
+        //line_id
+        BigDecimal lineId=new BigDecimal(map.get("lineId").toString());
+        //通过运输线路判断下一步是否为计量，当前是啥，下下一步是啥
+        //如果下一步为计量，且当前步为进厂，则选择进厂称，如果下下步为出厂则选择出厂称，其他则选择中转称
+        List<BigDecimal> list=getNextStep(lineId,orderLineSequence.intValue());
+        if(list.size()==3){
+            //0:进厂；1：计毛；2：计皮；3：卸货；4：装货；5：出厂
+            if(list.get(1).intValue()==1 || list.get(1).intValue()==2){
+                //如果当前为进厂
+                if(list.get(0).intValue()==0){
+                    //获取到汽车衡id
+                    BigDecimal truckCalculateId =tmstruckWeightResultMapper.getTruckCalculateNumber(materialTypeId,new BigDecimal(1));
+                    //将获取到的汽车衡id更新到计量实绩表中
+                    //如果下一步为计毛作业
+                    if(list.get(1).intValue()==1){
+                        //通过订单号获取计量实绩主键，并更新
+                        TmstruckWeightResult tmstruckWeightResult=new TmstruckWeightResult();
+                        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
+                        tmstruckWeightResult.setResultGrossPlaceId(truckCalculateId);
+                        tmstruckWeightResult.setUpdateTime(new Date());
+                        tmstruckWeightResult.setUpdateUsername("admin");
+                        tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                    }
+                    //如果下一步为计皮作业
+                    if(list.get(1).intValue()==2){
+                        //通过订单号获取计量实绩主键，并更新
+                        TmstruckWeightResult tmstruckWeightResult=new TmstruckWeightResult();
+                        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
+                        tmstruckWeightResult.setResultTarePlaceId(truckCalculateId);
+                        tmstruckWeightResult.setUpdateTime(new Date());
+                        tmstruckWeightResult.setUpdateUsername("admin");
+                        tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                    }
+                }
+                //如果计量后一步为出厂
+                else if(list.get(2).intValue()==5){
+                    //获取到汽车衡id
+                    BigDecimal truckCalculateId =tmstruckWeightResultMapper.getTruckCalculateNumber(materialTypeId,new BigDecimal(2));
+                    //将获取到的汽车衡id更新到计量实绩表中
+                    //如果下一步为计毛作业
+                    if(list.get(1).intValue()==1){
+                        //通过订单号获取计量实绩主键，并更新
+                        TmstruckWeightResult tmstruckWeightResult=new TmstruckWeightResult();
+                        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
+                        tmstruckWeightResult.setResultGrossPlaceId(truckCalculateId);
+                        tmstruckWeightResult.setUpdateTime(new Date());
+                        tmstruckWeightResult.setUpdateUsername("admin");
+                        tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                    }
+                    //如果下一步为计皮作业
+                    if(list.get(1).intValue()==2){
+                        //通过订单号获取计量实绩主键，并更新
+                        TmstruckWeightResult tmstruckWeightResult=new TmstruckWeightResult();
+                        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
+                        tmstruckWeightResult.setResultTarePlaceId(truckCalculateId);
+                        tmstruckWeightResult.setUpdateTime(new Date());
+                        tmstruckWeightResult.setUpdateUsername("admin");
+                        tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                    }
+                }else{
+                    //获取到汽车衡id
+                    BigDecimal truckCalculateId =tmstruckWeightResultMapper.getTruckCalculateNumber(materialTypeId,new BigDecimal(3));
+                    //将获取到的汽车衡id更新到计量实绩表中
+                    //如果下一步为计毛作业
+                    if(list.get(1).intValue()==1){
+                        //通过订单号获取计量实绩主键，并更新
+                        TmstruckWeightResult tmstruckWeightResult=new TmstruckWeightResult();
+                        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
+                        tmstruckWeightResult.setResultGrossPlaceId(truckCalculateId);
+                        tmstruckWeightResult.setUpdateTime(new Date());
+                        tmstruckWeightResult.setUpdateUsername("admin");
+                        tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                    }
+                    //如果下一步为计皮作业
+                    if(list.get(1).intValue()==2){
+                        //通过订单号获取计量实绩主键，并更新
+                        TmstruckWeightResult tmstruckWeightResult=new TmstruckWeightResult();
+                        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
+                        tmstruckWeightResult.setResultTarePlaceId(truckCalculateId);
+                        tmstruckWeightResult.setUpdateTime(new Date());
+                        tmstruckWeightResult.setUpdateUsername("admin");
+                        tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                    }
+                }
+            }
+        }else {
+            return 0;
+        }
+        return 0;
+    }
+
+    public List<BigDecimal> getNextStep(BigDecimal lineId, int orderLineSequence) {
+        return tmstruckWeightResultMapper.getNextStep(lineId,orderLineSequence);
+    }
 }

src/main/java/com/steerinfo/dil/util/MD5Util.java

@@ -0,0 +1,50 @@
+package com.steerinfo.dil.util;
+
+import java.security.MessageDigest;
+
+/**
+ * @author luobang
+ * @create 2021-10-29 10:16
+ */
+
+    public class MD5Util {
+        /***
+         * MD5加密 生成32位md5码
+         *
+         * @param 待加密字符串
+         * @return 返回32位md5码
+         */
+        public static String md5Encode(String inStr) throws Exception {
+            MessageDigest md5 = null;
+            try {
+                md5 = MessageDigest.getInstance("MD5");
+            } catch (Exception e) {
+                System.out.println(e.toString());
+                e.printStackTrace();
+                return "";
+            }
+
+            byte[] byteArray = inStr.getBytes("UTF-8");
+            byte[] md5Bytes = md5.digest(byteArray);
+            StringBuffer hexValue = new StringBuffer();
+            for (int i = 0; i < md5Bytes.length; i++) {
+                int val = ((int) md5Bytes[i]) & 0xff;
+                if (val < 16) {
+                    hexValue.append("0");
+                }
+                hexValue.append(Integer.toHexString(val));
+            }
+            return hexValue.toString();
+        }
+
+        /**
+         *测试
+         * @throws Exception
+         */
+        public static void main(String[] args) throws Exception {
+            String str = "123456";
+            System.out.println(MD5Util.md5Encode(str));
+        }
+
+    }
+

src/main/resources/bootstrap.yml

@@ -27,6 +27,8 @@ openfeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
   OmsFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:localhost:8066}
 
 
 #eureka设置
@@ -68,4 +70,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8088
+  port: 8094

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

@@ -113,4 +113,18 @@
         from
             RMS_PWAREHOUSE_PLATFORM RPP
     </select>
+    <!-- 外轮船名下拉框-->
+    <select id="getForeignName" resultType="java.util.LinkedHashMap">
+        SELECT DB.BATCH_ID "id",
+               DB.BATCH_ID "value",
+               DB.RESULT_FOREIGN_SHIP_NAME "label"
+        FROM DIL_BATCH DB
+    </select>
+    <!--装货地点下拉框-->
+    <select id="getLoadedPlace" resultType="java.util.LinkedHashMap">
+        select RAS.ARRIVAL_ID "id",
+               RAS.ARRIVAL_ID "value",
+               RAS.ARRIVAL_NAME "label"
+        from RMSTRAIN_ARRIVAL_SEND RAS
+    </select>
 </mapper>

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

@@ -786,5 +786,76 @@
     on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
     where OO.ORDER_ID = #{orderId} and TLR.MATERIAL_ID = #{materialId}
   </select>
+  <!--通过运输订单号查找装车实绩id-->
+  <select id="selectLoadResultIdByOrderNumber" resultType="java.lang.Integer" parameterType="java.util.Map">
+    SELECT TLR.RESULT_ID "loadResultId",
+           TLR.RESULT_LOAD_START_TIME "startTime"
+    FROM  OMSTRUCK_ORDER OO
+            LEFT JOIN  TMSTRUCK_TOTAL_RESULT TTR
+                       ON  OO.ORDER_ID=TTR.ORDER_ID
+            LEFT JOIN  TMSTRUCK_LOAD_RESULT TLR
+                       ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+    WHERE  OO.ORDER_NUMBER=#{orderNumber}
+  </select>
+  <!--内转物流查询汽车装车实绩 -->
+  <select id="selectLoadResultForConverted" resultType="java.util.LinkedHashMap">
+    select APO.PURCHASE_ORDER_NO "orderNo",
+           TLR.INSERT_TIME "insertTime",
+           RC.CAPACITY_NUMBER "capacityNumber",
+           TLR.RESULT_MEASURED_TONNAGE "toggage",
+           RAS.ARRIVAL_NAME "arrivelName",
+           DB.RESULT_FOREIGN_SHIP_NAME "foreignShipName",
+           OO.ORDER_NUMBER "orderNumber",
+           RM.MATERIAL_NAME "materialName"
+
+    from TMSTRUCK_LOAD_RESULT TLR
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                     ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+           LEFT JOIN OMSTRUCK_ORDER OO
+                     ON OO.ORDER_ID=TTR.ORDER_ID
+           left join AMS_PURCHASE_ORDER APO
+                     ON oo.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+           LEFT JOIN DIL_BATCH DB
+                     ON DB.BATCH_ID=APO.BATCH_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     ON RM.MATERIAL_ID=TLR.MATERIAL_ID
+           LEFT JOIN RMS_CAPACITY RC
+                     ON OO.CAPACITY_ID = RC.CAPACITY_ID
+           LEFT JOIN  TMSTRAIN_LOADING_RESULT TLR2
+                      ON TLR2.PURCHASE_ORDER_RAIL_PLAN_ID=OO.ORDER_PLAN_ID
+           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+                     ON  RAS.ARRIVAL_ID=TLR.LOADING_ID
+
+  </select>
+
+  <!-- 根据实绩id渲染数据 -->
+  <select id="selectLoadResultByResultId" resultType="java.lang.Integer">
+    SELECT  TLR.LOADING_ID "loadingId",
+            TLR.MATERIAL_ID  "materialId",
+            TLR.RESULT_TOTAL_ID "totalId"
+    FROM   TMSTRUCK_LOAD_RESULT TLR
+    WHERE TLR.RESULT_ID=#{resultId}
+  </select>
+
+  <!--通过车牌号号查找物资id和运力id以及总实绩id-->
+  <select id="selectMaterialIdAndCapacityId" resultType="java.util.Map" parameterType="java.lang.Integer">
+    select OOM.MATERIAL_ID "materialId",
+           OO.CAPACITY_ID "capacityId",
+           TTR.RESULT_TOTAL_ID "resultTotalId"
+    from   TMSTRUCK_TOTAL_RESULT TTR
+             left join OMSTRUCK_ORDER OO
+                       on OO.ORDER_ID=TTR.ORDER_ID
+             left join OMSTRUCK_ORDER_MATERIAL OOM
+                       on OOM.ORDER_ID=OO.ORDER_ID
+             LEFT JOIN RMS_CAPACITY RC
+                       ON RC.CAPACITY_ID=OO.CAPACITY_ID
+    where RC.CAPACITY_NUMBER=#{capacityNumber}
+  </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>
 
 </mapper>

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

@@ -368,4 +368,11 @@
     left join RMS_SHIPPER RS
     on TSR.SENDER_ID=RS.SHIPPER_ID
   </select>
+    <select id="selectIdApp" resultType="java.util.Map">
+      select
+      rs.SHIPPER_APPID "AppId",
+        rs.SHIPPER_SECRETKEY "secretKey"
+      from RMS_SHIPPER RS
+      where rs.SHIPPER_ID=#{bigDecimal}
+    </select>
 </mapper>

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

@@ -340,5 +340,56 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+<!-- 查询计数实绩 -->
+  <select id="selectCountList" resultType="java.util.Map" parameterType="java.lang.String">
+    SELECT RM.MATERIAL_NAME "materialName",
+           OO.ORDER_NUMBER "orderNumber",
+           RC.CAPACITY_NUMBER "capacityNumber",
+           RW.WAREHOUSE_NAME "warehouseName",
+           RCD.DRIVER_NAME "driverName",
+           RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+           RS.SHIPPER_NAME "shipperName",
+           AIR.REQUIREMENT_WORK_CONTENT "requirmentWorkContent"
 
+    FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+           LEFT JOIN OMSTRUCK_ORDER OO
+                     ON OO.ORDER_PLAN_ID=AIR.PURCHASE_ORDER_ID
+           LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                     ON OO.ORDER_ID = OOM.ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     ON RM.MATERIAL_ID=OOM.MATERIAL_ID
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                     ON TTR.ORDER_ID=OO.ORDER_ID
+           LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
+                     ON TTR.RESULT_TOTAL_ID=TUR.RESULT_TOTAL_ID
+           LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                     ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+           LEFT JOIN RMS_CAPACITY RC
+                     ON OO.CAPACITY_ID = RC.CAPACITY_ID
+           LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                     ON RC.CAPACITY_ID=RDC.CAPACITY_ID
+           LEFT JOIN RMS_CAPACITY_TYPE RCT
+                     ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
+           LEFT JOIN RMS_CAR_DRIVER RCD
+                     ON RDC.DRIVER_ID=RCD.DRIVER_ID
+      --   LEFT JOIN RMS_PWAREHOUSE_PLATFORM RPP
+--   ON TLR.LOADER_ID=RPP.PLATFORM_ID
+           LEFT JOIN RMS_WAREHOUSE RW
+                     ON RW.WAREHOUSE_ID=TUR.RESULT_UNLOAD_PLACE_ID
+           LEFT JOIN RMS_WAREHOUSE_TYPE RWT
+                     ON RWT.WAREHOUSE_TYPE_ID=RW.WAREHOUSE_TYPE_ID
+           LEFT JOIN RMS_SHIPPER RS
+                     ON AIR.REQUIREMENT_SHIPPER_ID=RS.SHIPPER_ID
+    WHERE AIR.REQUIREMENT_TYPE=2 AND RW.WAREHOUSE_TYPE_ID=3
+      AND  OO.ORDER_STATUS=4
+  </select>
+  <!-- 查询所有的包月作业实绩 -->
+  <select id="getTmstruckMonthResult" parameterType="java.util.Map" resultType="java.util.Map">
+    select * from tmstruck_total_result  ttr
+                    left join omstruck_order oo on ttr.order_id=oo.order_id
+                    left join amstruck_inward_plan aip on oo.order_plan_id=aip.plan_id
+                    left join amstruck_requirement_plan arp on aip.plan_id=arp.plan_id
+                    left join amstruck_inward_requirement air on arp.requirement_plan_id=air.requirement_id
+    where oo.order_type=4 and air.requirement_type=3
+  </select>
 </mapper>

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

@@ -799,4 +799,44 @@
       on RTC.TRUCK_CALCULATE_ID = RTCM.TRUCK_CALCULATE_ID and RTC.TRUCK_CALCULATE_STATUS = 0
       where RM.MATERIAL_ID = #{materialId}
     </select>
+<!--  //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
+    Map<BigDecimal, String> selectByOrderId(BigDecimal orderId);-->
+    <select id="selectByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+      select oo.ORDER_LINE_SEQUENCE as "orderLineSequence",
+             oo.LINE_ID as "lineId",
+             rm.material_type_id as "materialTypeId",
+             twr.weight_task_result_id as "weightTaskResultId"
+        from omstruck_order oo
+             join omstruck_order_material oom on oom.order_id=oo.order_id
+             left join rms_material rm on oom.material_id=rm.material_id
+             left join tmstruck_total_result ttr on oo.order_id=ttr.order_id
+             left join tmstruck_weight_result twr on ttr.result_total_id=twr.result_total_id
+      where oo.order_id=#{orderId} and rownum=1 order by twr.weight_task_result_id desc
+    </select>
+
+<!--  * 通过物料、性质判断所去的汽车衡-->
+  <select id="getTruckCalculateNumber" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+    select rtc.truck_calculate_id from rms_truck_calculate_material rtcm
+                                         left join rms_truck_calculate rtc on rtcm.truck_calculate_id=rtc.truck_calculate_id
+    where rtcm.material_type_id=#{materialTypeId} and rtc.nature=#{nature} and rownum=1 order by rtc.truck_calculate_priority
+  </select>
+
+  <!--    //返回下一步路段顺序号对应的终点type
+    BigDecimal getNextStep(BigDecimal lineId, int i);-->
+  <select id="getNextStep" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+    select rls.segment_end_node_type
+    from rms_line_segemnt rls
+    where rls.line_id = #{lineId}
+      and rls.segment_sqe = #{orderLineSequence}
+    union
+    select rls.segment_end_node_type
+    from rms_line_segemnt rls
+    where rls.line_id = 1
+      and rls.segment_sqe = #{orderLineSequence}+1
+    union
+    select rls.segment_end_node_type
+    from rms_line_segemnt rls
+    where rls.line_id = 1
+      and rls.segment_sqe = #{orderLineSequence}+2
+  </select>
 </mapper>