合并冲突

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

@@ -112,8 +112,10 @@ public class AMScontroller{
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer planId,
-                                           Integer status, String con) {
-        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status, con);
+                                           Integer status,
+                                                 Integer planStatus,
+                                                 String con) {
+        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status, planStatus, con);
     }
 
 

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

@@ -80,6 +80,15 @@ public class OMSController {
         return omsFeign.getAllCapacity(mapValue, apiId, pageNum, pageSize, carrierId);
     }
 
+    @ApiOperation(value = "新增采购进口矿订单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addInputOrder")
+    public Map<String,Object> addInputOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return omsFeign.addInputOrder(mapValue);
+    }
+
     @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
@@ -99,8 +108,8 @@ public class OMSController {
 
     @ApiOperation(value = "派单")
     @PostMapping("/dispatchOrder")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map) {
-        return omsFeign.dispatchOrder(map);
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return omsFeign.dispatchOrder(mapValue);
     }
 
 
@@ -275,11 +284,10 @@ public class OMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getDriverInfoForSale")
-   public Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize,
-
                                             Integer orderType,
                                             Integer orderStatus,
                                             String con,

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

@@ -224,6 +224,28 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
+
+    @PostMapping("/getBatchList")
+    public Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            String con){
+        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+  //框计算计算货权转移中出现的批次
+  @PostMapping("/getBatchListForAttorney")
+  public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String con){
+      return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+  }
+
+
     /**
      * 展示船只信息
      *
@@ -238,11 +260,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId,con);
     }
 
     /**
@@ -261,9 +284,7 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
+
         return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
@@ -478,9 +499,7 @@ public class TMSController extends BaseRESTfulController {
                                                                 Integer pageSize,
                                                                 Integer apiId,
                                                                 String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
+
         return tmsshipFeign.getGroupList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
     @PostMapping("getMaterialList")
@@ -1800,4 +1819,22 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getAllReturnResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, con);
     }
+    @ApiOperation(value="提货单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getBillOrder")
+    public Map<String, Object> getBillOrder(@RequestParam String orderNumber){
+        return tmsTruckFeign.getBillOrder(orderNumber);
+    }
+
+    @ApiOperation(value="发货通知单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getDeliveryOrder")
+    public Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber){
+        return tmsTruckFeign.getDeliveryOrder(orderNumber);
+
+    }
 }

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

@@ -925,6 +925,7 @@ public interface AmsFeign {
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("planId") Integer planId,
                                            @RequestParam("status") Integer status,
+                                           @RequestParam("planStatus") Integer planStatus,
                                            @RequestParam("con") String con
     );
 

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

@@ -53,7 +53,7 @@ public interface OmsFeign {
     public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorders/dispatchOrder")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue);
 
     @PostMapping("api/v1/oms/omstruckorders/deleteOrder")
     public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
@@ -348,5 +348,9 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运单id查询实绩位置")
     @PostMapping("api/v1/oms/omstruckorderseparates/getOrderResult")
     List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map);
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("api/v1/oms/omstruckorders/addInputOrder")
+    Map<String, Object> addInputOrder(@RequestBody Map<String, Object> mapValue);
 }
 

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

@@ -332,6 +332,13 @@ public interface TmsTruckFeign {
                                                    @RequestParam("pageSize") Integer pageSize,
                                                    @RequestParam("orderType") Integer orderType,
                                                    @RequestParam("con") String con);
+
+    @PostMapping("api/v1/truckTms/selfMachine/getBillOrder")
+    Map<String, Object> getBillOrder(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/selfMachine/getDeliveryOrder")
+    Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber);
+
 }
 
 

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

@@ -243,9 +243,10 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getCapacityList")
     Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                  @RequestParam Integer pageNum,
-                                  @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId);
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam String con);
 
     /**
      * 展示卸船作业信息列表
@@ -258,9 +259,9 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnLoadShipList")
     Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId,
                                           @RequestParam String con);
 
     /**
@@ -531,6 +532,23 @@ public interface TmsshipFeign {
     @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
     Map<String, Object> getBatchId();
 
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchList")
+    Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
+
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForAttorney")
+    Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
     //获取船运物资id
     @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
     Map<String,Object> getMaterialId();

src/main/resources/bootstrap.yml

@@ -49,7 +49,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.161:8060}
 
 genxml:
   pth: com/a