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

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

@@ -1148,11 +1148,12 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String orgCode) {
+                                          String orgCode,
+                                                       String index) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index);
     }
 
     @PostMapping("/getPurRequirementList")

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

@@ -595,4 +595,24 @@ public class BMSController extends BaseRESTfulController {
                  endTime);
     }
 
-}
+
+
+    @PostMapping("/getInwardWeightTimeDetailsOrder")
+    public Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String carrierSsoId,
+                                                           Integer detailStatus,
+                                                           Integer orderType,
+                                                           String userId,
+                                                           String startTime,
+                                                           String endTime) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getInwardWeightTimeDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
+                endTime);
+    }
+
+}

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

@@ -225,6 +225,17 @@ public class OTMSController {
         return otmsFeign.getObtainTheOptimalPath(startPoint,endPoint);
     }
 
+    @ApiOperation(value="获取当前订单导航路径")
+    @GetMapping(value = "/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws  Exception {
+       return otmsFeign.getPathByOrderID(orderId,startStep,endStep);
+    }
+
+    @ApiOperation(value="查询所有可选地点")
+    @GetMapping(value = "/mapvertexs/findSelections")
+    public RESTfulResult findSelections(){
+        return otmsFeign.findSelections();
+    }
 
     //在途订单列表
     @PostMapping("/transportationPerformance")

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

@@ -1128,4 +1128,40 @@ public class RMScontroller {
     public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
         return rmsFeign.getCapacityInfoById(id);
     }
+
+   //获取货权转移送达单位列表
+    @PostMapping(value = "/getCargoDep")
+    public Map<String,Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize,
+                                     String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return rmsFeign.getCargoDep(mapValue,apiId,pageNum,pageSize,con);
+    }
+    //删除货权转移送达单位
+    @PostMapping(value = "/deleteCargoDep")
+    public Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCargoDep(map);
+    }
+    @PostMapping(value = "/getCargoDepById/{id}")
+    public Map<String,Object> getCargoDepById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCargoDepById(id);
+    }
+
+    //更新货权转移送达单位
+    @PostMapping(value = "/updateCargoDep")
+    public Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateCargoDep(map);
+    }
+
+    //新增货权转移送达单位
+    @PostMapping(value = "/insertCargoDep")
+    public Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertCargoDep(map);
+    }
+
+
 }

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

@@ -970,6 +970,16 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getUnloadingPointName();
     }
 
+
+    //下拉框
+    @ApiOperation(value = "获取货权转移图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downLoadDeilveryNotice")
+    public Map<String, Object> downLoadDeilveryNotice(@RequestParam Integer noticeId) {
+        return tmsshipFeign.downLoadDeilveryNotice(noticeId);
+    }
+
     @ApiOperation(value = "获取卸车路径名称")
     @ApiImplicitParams({
     })
@@ -1926,9 +1936,10 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                String startTime,
                                                String endTime,
-                                               Integer orderType
+                                               Integer orderType,
+                                               String con
     ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType,con);
     }
     @ApiOperation(value="查询销售统计报表")
     @PostMapping("/getAllSaleReport")
@@ -2218,8 +2229,9 @@ public class TMSController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   String startTime,
                                                   String endTime,
-                                                  String con){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con);
+                                                  String con,
+                                                  String yes){
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con,yes);
     }
 
     @ApiOperation("厂外抵达作业")

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

@@ -1191,7 +1191,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
                                    @RequestParam Integer requirementStatus,
-                                   @RequestParam String orgCode);
+                                   @RequestParam String orgCode,
+                                                @RequestParam String index);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")

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

@@ -245,4 +245,20 @@ public interface BmstruckFeign {
                                                     @RequestParam("userId") String userId,
                                                     @RequestParam("startTime")String startTime,
                                                     @RequestParam("endTime")String endTime);
-}
+
+
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightTimeDetailsOrder")
+    Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("carrierSsoId") String carrierSsoId,
+                                                        @RequestParam("detailStatus") Integer detailStatus,
+                                                        @RequestParam("orderType") Integer orderType,
+                                                        @RequestParam("userId") String userId,
+                                                        @RequestParam("startTime")String startTime,
+                                                        @RequestParam("endTime")String endTime);
+}
+
+

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

@@ -123,6 +123,14 @@ public interface OtmsFeign {
     @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
     public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception;
 
+    //获取当前订单导航路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws Exception;
+
+    //获取导航可选地点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findSelections")
+    public RESTfulResult findSelections();
+
     @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
 

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

@@ -618,4 +618,23 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
     Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDep")
+    Map<String, Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("con") String con);
+
+    @PostMapping("api/v1/rms/rmscargodeps/deleteCargoDep")
+    Map<String,Object> deleteCargoDep(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/updateCargoDep")
+    Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/insertCargoDep")
+    Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
+    Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
 }

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

@@ -253,4 +253,5 @@ 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

@@ -372,7 +372,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("startTime") String startTime,
                                       @RequestParam("endTime")   String endTime,
-                                      @RequestParam("orderType") Integer orderType
+                                      @RequestParam("orderType") Integer orderType,
+                                      @RequestParam("con")String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
@@ -543,7 +544,8 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageSize,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime,
-                                          @RequestParam String con
+                                          @RequestParam String con,
+                                            @RequestParam String yes
                                          );
 
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -756,4 +757,8 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
+    @ApiOperation(value = "查看货权转移图片")
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
+    Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
+
 }