Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

pom.xml

@@ -71,10 +71,10 @@
             <version>3.4.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--        </dependency>-->
 
         <!--swagger-->
         <dependency>

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

@@ -1148,12 +1148,11 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String orgCode,
-                                                       String index) {
+                                          String orgCode, String index,String startTime,String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index,startTime,endTime);
     }
 
     @PostMapping("/getPurRequirementList")
@@ -1166,11 +1165,13 @@ public class AMScontroller{
                                                        String userId,
                                                        String carrierSsoId,
                                                        String enableStatus,
-                                                       String planStatus) {
+                                                       String planStatus,
+                                                     String startTime,
+                                                     String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus);
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime);
     }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")
@@ -1322,8 +1323,10 @@ public class AMScontroller{
                                                Integer sporadicStatus,
                                                String carrierSsoId,
                                                String userId,
-                                               String userIds) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds);
+                                               String userIds,
+                                               String startTime,
+                                               String endTime) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds,startTime,endTime);
     }
 
     @ApiModelProperty(value = "查看物资详情")
@@ -1421,11 +1424,13 @@ public class AMScontroller{
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   String consigneeSsoId,
-                                                  @RequestParam(required = false) String con) {
+                                                  @RequestParam(required = false) String con,
+                                                  String startTime,
+                                                  String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1435,11 +1440,13 @@ public class AMScontroller{
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
                                                @RequestParam(required = false) String consigneeSsoId,
-                                               @RequestParam(required = false) String con){
+                                               @RequestParam(required = false) String con,
+                                               String startTime,
+                                               String endTime){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")
@@ -1456,11 +1463,11 @@ public class AMScontroller{
                                                               String con,
                                                               Integer shipperId,
                                                               Integer saleType,
-                                                              String consigneeSsoId
-//                                                              String startDate,
-//                                                              String endDate
+                                                              String consigneeSsoId,
+                                                              String startTime,
+                                                              String endTime
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1888,9 +1895,11 @@ public class AMScontroller{
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   String con,
-                                                  Integer deleted
+                                                  Integer deleted,
+                                                  @RequestParam(required = false) String startTime,
+                                                  @RequestParam(required = false)String endTime
     ) {
-        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted));
+        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted),startTime,endTime);
     }
 
     @ApiOperation(value = "修改销售订单中的物资")
@@ -1927,9 +1936,17 @@ public class AMScontroller{
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   String con,
-                                                        String consigneeSsoId
+                                                        String consigneeSsoId,
+                                                        String startTime,
+                                                        String endTime
     ) {
-        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId);
+        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime);
+    }
+
+    @ApiOperation(value = "修改厂内未装货车辆的运单车牌号")
+    @PostMapping(value = "/updateCapacityNumberInFactory")
+    public Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateCapacityNumberInFactory(mapValue);
     }
 
 }

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

@@ -40,15 +40,19 @@ public class OMSController {
     })
     @PostMapping("/getAllTruckOrder")
     public Map<String, Object> getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderStatus,
-                                          Integer planId,
-                                          Integer orderType,
-                                          Integer fuelOrder,String carrierSSOId,String con) {
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderStatus,
+                                                Integer planId,
+                                                Integer orderType,
+                                                Integer fuelOrder,
+                                                String carrierSSOId,
+                                                String con,
+                                                String startTime,
+                                                String endTime) {
         return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con);
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con,startTime,endTime);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -232,9 +236,11 @@ public class OMSController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con){
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con,
+                                                    String startTime,
+                                                    String endTime){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder,carrierSSOId,con);
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con,startTime,endTime);
     }
 
     /**
@@ -629,11 +635,13 @@ public class OMSController {
                                                   Integer pageSize,
                                                   Integer orderStatus,
                                                   String carrierId,
-                                                  String con) {
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con);
+        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,startTime,endTime);
         return map;
     }
 
@@ -743,8 +751,10 @@ public class OMSController {
                                                  String  con,
                                                  String userId,
                                                  String usersId,
-                                                       Integer type1) {
-        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1);
+                                                       Integer type1,
+                                                       String startTime,
+                                                       String endTime) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1,startTime,endTime);
     }
 
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")

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

@@ -1189,8 +1189,9 @@ public class TMSController extends BaseRESTfulController {
                                           Integer orderType,
                                           String con,
                                           String userId,
-                                          String userIds){
-        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds);
+                                          String userIds,
+                                                String startTime,String endTime){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "新增采购汽车装车实绩")
@@ -1319,8 +1320,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer orderType,
                                                  String con,
                                                  String userId,
-                                                 String userIds){
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+                                                 String userIds,
+                                                 String startTime,
+                                                 String endTime){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "查询计皮实绩")
@@ -1339,8 +1342,10 @@ public class TMSController extends BaseRESTfulController {
                                                 Integer orderType,
                                                 String con,
                                                 String userId,
-                                                String userIds) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+                                                String userIds,
+                                                String startTime,
+                                                String endTime) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
 
@@ -1380,9 +1385,11 @@ public class TMSController extends BaseRESTfulController {
                                                Integer orderType,
                                                String con,
                                                String userId,
-                                               String userIds
+                                               String userIds,
+                                               String startTime,
+                                               String endTime
     ){
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "添加卸货实绩")
@@ -1418,9 +1425,11 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                                Integer orderType,String con
+                                                Integer orderType,String con,
+                                                String startTime,
+                                                String endTime
     ){
-        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,startTime,endTime);
     }
 
 
@@ -1484,13 +1493,15 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getQualityResult")
     public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderType,
-                                          String con
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderType,
+                                                String con,
+                                                String startTime,
+                                                String endTime
     ){
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con);
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con,startTime,endTime);
     }
 
     @ApiOperation(value = "通过ID获取质检实绩 ")
@@ -2220,9 +2231,10 @@ public class TMSController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            String startTime,
-                                           String endTime
+                                           String endTime,
+                                                 String con
     ){
-        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
     }
 
 
@@ -2303,6 +2315,13 @@ public class TMSController extends BaseRESTfulController {
         return map;
     }
 
+
+    @ApiOperation("根据船舶位置查询船舶动态")
+    @PostMapping("/getShipLocationStatus")
+    public Map<String,Object> getShipLocationStatus(String shipLocation) {
+        Map<String, Object> map = tmsshipFeign.getShipLocationStatus(shipLocation);
+        return map;
+    }
     //根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
     @ApiOperation(value="根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话", notes="模糊查询")
     @ApiImplicitParams({
@@ -2312,5 +2331,6 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping("/getPersonByName")
     public Map<String,Object>  getPersonByName(@RequestParam(value ="personName")String personName){
         return tmsshipFeign.getPersonByName(personName);
+
     }
 }

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

@@ -838,4 +838,11 @@ public class UniversalController extends BaseRESTfulController {
     public List<Map<String, Object>> getSteelWarehouse(){
         return universalMapper.getSteelWarehouse();
     }
+
+
+    @ApiOperation(value = "查询运力联系方式")
+    @GetMapping("/getCapacityTel")
+    public Map<String,Object>getCapacityTel(BigDecimal capacityId){
+        return universalMapper.getCapacityTel(capacityId);
+    }
 }

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

@@ -1191,8 +1191,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
                                    @RequestParam Integer requirementStatus,
-                                   @RequestParam String orgCode,
-                                                @RequestParam String index);
+                                   @RequestParam String orgCode, @RequestParam String index,@RequestParam String startTime,
+                                                @RequestParam String endTime);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1299,7 +1299,9 @@ public interface AmsFeign {
                                               @RequestParam Integer sporadicStatus,
                                               @RequestParam String carrierSsoId,
                                               @RequestParam String userId,
-                                              @RequestParam String userIds);
+                                              @RequestParam String userIds,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1353,7 +1355,9 @@ public interface AmsFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
                                            @RequestParam(required = false) String consigneeSsoId,
-                                           @RequestParam(required = false) String con);
+                                           @RequestParam(required = false) String con,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1365,7 +1369,9 @@ public interface AmsFeign {
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
                                                @RequestParam(required = false) String consigneeSsoId,
-                                               @RequestParam(required = false) String con);
+                                               @RequestParam(required = false) String con,
+                                               @RequestParam String startTime,
+                                               @RequestParam String endTime);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1375,9 +1381,9 @@ public interface AmsFeign {
                                                        @RequestParam("con") String con,
                                                        @RequestParam Integer shipperId,
                                                        @RequestParam(required = false) Integer saleType,
-                                                       @RequestParam(required = false) String consigneeSsoId
-//                                                       @RequestParam String startDate,
-//                                                       @RequestParam String endDate
+                                                       @RequestParam(required = false) String consigneeSsoId,
+                                                       @RequestParam(required = false) String startTime,
+                                                       @RequestParam(required = false) String endTime
     );
 
     @ApiOperation(value="查询财务已审批销售订单信息")
@@ -1524,7 +1530,9 @@ public interface AmsFeign {
                                               @RequestParam String userId,
                                               @RequestParam String carrierSsoId,
                                               @RequestParam String enableStatus,
-                                              @RequestParam String planStatus);
+                                              @RequestParam String planStatus,
+                                              @RequestParam String startTime,
+                                              @RequestParam String endTime);
 
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
     Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);
@@ -1664,7 +1672,9 @@ public interface AmsFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
                                            @RequestParam String con,
-                                           @RequestParam BigDecimal deleted);
+                                           @RequestParam BigDecimal deleted,
+                                           @RequestParam(required = false) String startTime,
+                                           @RequestParam(required = false)String endTime);
 
     // 展示副产品销售订单列表
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateAllMaterialInSale")
@@ -1685,5 +1695,11 @@ public interface AmsFeign {
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
                                                  @RequestParam String con,
-                                                 @RequestParam String consigneeSsoId);
+                                                 @RequestParam String consigneeSsoId,
+                                                 @RequestParam(required = false) String startTime,
+                                                 @RequestParam(required = false) String endTime);
+
+    // 修改厂内未装货车辆的运单车牌号
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")
+    Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -34,7 +34,9 @@ public interface OmsFeign {
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("fuelOrder") Integer fuelOrder,
                                           @RequestParam("carrierSSOId")String carrierSSOId,
-                                          @RequestParam("con")String con);
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
     public Map<String, Object> getAllTruckOrderReturnListMap(
@@ -107,7 +109,9 @@ public interface OmsFeign {
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
                                               @RequestParam("carrierSSOId") String carrierSSOId,
-                                              @RequestParam("con")      String con);
+                                              @RequestParam("con")      String con,
+                                                    @RequestParam("startTime") String startTime,
+                                                    @RequestParam("endTime")String endTime);
     /**
      * 展示承运商接收销售公司已接受的销售订单
      * @param carrierId
@@ -333,7 +337,9 @@ public interface OmsFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer orderStatus,
                                            @RequestParam String carrierId,
-                                           @RequestParam String con);
+                                           @RequestParam String con,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 
     // 分派计划
     @PostMapping("api/v1/oms/omstruckorders/apportionInwardOrder")
@@ -389,7 +395,9 @@ public interface OmsFeign {
                                                        @RequestParam("con") String con,
                                                        @RequestParam("userId") String userId,
                                                        @RequestParam("usersId") String usersId,
-                                                       @RequestParam("type1")Integer type1
+                                                       @RequestParam("type1")Integer type1,
+                                                @RequestParam("startTime")String  startTime,
+                                                @RequestParam("endTime") String endTime
                                                        );
 
     @ApiOperation(value = "根据运输订单id修改运力id")

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

@@ -59,7 +59,9 @@ public interface TmsTruckFeign {
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("con")   String con,
                                           @RequestParam("userId") String userId,
-                                          @RequestParam("userIds") String userIds
+                                          @RequestParam("userIds") String userIds,
+                                                @RequestParam("startTime") String startTime,
+                                                @RequestParam("endTime") String endTime
     );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
@@ -145,7 +147,9 @@ public interface TmsTruckFeign {
                                                  @RequestParam("orderType") Integer orderType,
                                                  @RequestParam("con")     String con,
                                                  @RequestParam("userId")  String userId,
-                                                 @RequestParam("userIds") String userIds
+                                                 @RequestParam("userIds") String userIds,
+                                                 @RequestParam("startTime")String startTime,
+                                                 @RequestParam("endTime")String endTime
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
@@ -156,7 +160,9 @@ public interface TmsTruckFeign {
                                                 @RequestParam("orderType") Integer orderType,
                                                 @RequestParam("con") String con,
                                                 @RequestParam("userId")String userId,
-                                                @RequestParam("userIds")String userIds);
+                                                @RequestParam("userIds")String userIds,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -177,7 +183,9 @@ public interface TmsTruckFeign {
                                                @RequestParam("orderType") Integer orderType,
                                                @RequestParam("con")      String con,
                                                @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds
+                                               @RequestParam("userIds") String userIds,
+                                               @RequestParam("startTime")String startTime,
+                                               @RequestParam("endTime")String endTime
     );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
@@ -191,13 +199,15 @@ public interface TmsTruckFeign {
      */
 
 
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiveResult")
+    @PostMapping("api/v1/truckTms/tmstruckreciveresult/getReceiveResult")
     public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")  String con);
+                                          @RequestParam("con")  String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     /*
     TmstruckLeaveFactoryResultController
@@ -239,7 +249,9 @@ public interface TmsTruckFeign {
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")String con);
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")
@@ -525,7 +537,8 @@ public interface TmsTruckFeign {
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam String startTime,
-                                     @RequestParam String endTime);
+                                     @RequestParam String endTime,
+                                          @RequestParam String con);
 
 
     @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")

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

@@ -775,6 +775,10 @@ public interface TmsshipFeign {
     @PostMapping("/api/v1/shipTms/dilbatchs/getPersonByName")
     Map<String, Object> getPersonByName(@RequestParam(value ="personName")String personName);
 
+    @ApiOperation("value=查询船舶状态")
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationStatus")
+    Map<String, Object> getShipLocationStatus(@RequestParam("shipLocation") String shipLocation);
+
 
     @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
     Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);

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

@@ -192,4 +192,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getShipNameMesByLike(Map<String, Object> map);
 
+    //查询运力联系方式
+    Map<String, Object> getCapacityTel(BigDecimal capacityId);
 }

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

@@ -223,7 +223,7 @@ public class UniversalServiceImpl implements UniversalService {
                 return 0;
             }
         }else{
-            System.out.println("短信发送失败：" + jsonData);
+            System.out.println("补录委托失败：" + jsonData);
             return 0;
         }
     }

src/main/resources/application-dev.yml

@@ -42,7 +42,7 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+    url: ${TMSSHIPFEIGN_URL:localhost:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
@@ -50,7 +50,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:localhost:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:

src/main/resources/bootstrap.yml

@@ -12,16 +12,21 @@ spring:
   mvc:
     static-path-pattern:
 
-
 #eureka设置
 eureka:
   client:
     service-url:
+
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
+    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+
+
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
+
 genxml:
   pth: com/agit
 cache:
@@ -29,7 +34,7 @@ cache:
 redis:
   host: 10.10.50.28
   port: 6379
-  pwd: 123456
+  pwd: adhykdj
   project:
     prefix: sysmanage
   pool:

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

@@ -987,4 +987,8 @@
                and DB.RESULT_FOREIGN_SHIP_NAME like #{index}
                and DB.MATERIAL_ID = #{materialId}
     </select>
+    <select id="getCapacityTel" resultType="java.util.Map" parameterType="decimal">
+        SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_ID = #{capacityId}
+    </select>
 </mapper>