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

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")

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

@@ -629,11 +629,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;
     }
 

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

@@ -1187,8 +1187,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 = "新增采购汽车装车实绩")
@@ -2218,9 +2219,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);
     }
 
 
@@ -2301,6 +2303,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({
@@ -2310,5 +2319,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")
@@ -1528,7 +1528,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);

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

@@ -333,7 +333,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")

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")
@@ -525,7 +527,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:

src/main/resources/bootstrap.yml

@@ -33,7 +33,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>