修改

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")
@@ -1421,11 +1422,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 +1438,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 +1461,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 +1893,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 +1934,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

@@ -635,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;
     }
 

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

@@ -248,7 +248,7 @@ public class TMSController extends BaseRESTfulController {
                                                        Integer pageSize,
                                                        Integer apiId,
                                                        String con){
-        return  tmsshipFeign.getBatchIdByForeign(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+        return  tmsshipFeign.getBatchIdByForeign(mapValue==null?new HashMap<String, Object>():mapValue, pageNum, pageSize, apiId, con);
     }
 
 
@@ -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 = "新增采购汽车装车实绩")
@@ -2228,9 +2229,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);
     }
 
 
@@ -2310,4 +2312,23 @@ 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({
+            @ApiImplicitParam(name = "personName",value = "用户输入的输入提货联系人", required = false, dataType = "String")
+    })
+
+    @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")
@@ -1353,7 +1353,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 +1367,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 +1379,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 +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);
@@ -1664,7 +1670,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 +1693,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

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

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

@@ -253,5 +253,4 @@ public interface TmsTrainFeign {
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
-
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -548,17 +549,23 @@ public interface TmsshipFeign {
                                      @RequestParam Integer apiId,
                                      @RequestParam String con);
 
+
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchIdByForeign")
     Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam Integer pageNum,
-                                                @RequestParam Integer pageSize,
-                                                @RequestParam Integer apiId,
-                                                @RequestParam String con);
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
 
     //获取船运物资id
     @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
     Map<String,Object> getMaterialId();
 
+    //船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
+                                               @RequestParam("con") String con);
+
     /**
      * 展示货权转移
      *
@@ -753,8 +760,7 @@ public interface TmsshipFeign {
 
     //船舶动态表
     @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
-    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
-                                               @RequestParam("con") String con);
+    Map<String, Object> selectAllShipDynamaics();
 
 
     //获取合同水分值，实装吨位，水分吨位
@@ -765,8 +771,15 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
-    @ApiOperation(value = "查看货权转移图片")
+    //  根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
+    @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/bootstrap.yml

@@ -16,10 +16,12 @@ spring:
 eureka:
   client:
     service-url:
+
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
     register-with-eureka: false #表示向EurekaServer注册自己 默认为true
     fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
+
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
@@ -32,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

@@ -688,16 +688,20 @@
     <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
         select *
         from (
-                 select DB.BATCH_ID                                                         "batchId",
-                        DB.RESULT_FOREIGN_SHIP_NAME                                         "foreignShipName",
-
-                        CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
+                 select 		DBI.BATCH_INFACOTRY_ID        "batchId",
+                               DB.RESULT_FOREIGN_SHIP_NAME      "foreignShipName",
+                               DBI.INFACTORY_SHIP_NAME				"infactoryShipName",
+                               CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"' || DBI.INFACTORY_SHIP_NAME) "value"
                  from DIL_BATCH DB
-                          left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
-                          join AMS_PURCHASE_ORDER APO on APO.BATCH_ID = DB.BATCH_ID
-                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
+                          left join DIL_BATCH_INFACOTRY DBI
+                                    on DB.BATCH_ID=DBI.BATCH_ID
+                          left join RMS_MATERIAL RM
+                                    on RM.MATERIAL_ID = DB.MATERIAL_ID
+                          join AMS_PURCHASE_ORDER APO
+                               on APO.BATCH_ID = DB.BATCH_ID
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null and DBI.INFACTORY_SHIP_NAME is not null
              )
-        where instr("foreignShipName", #{index}) > 0
+        where instr("value", #{index}) > 0
 
     </select>
 
@@ -983,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>