'进口矿和一体机'

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

@@ -99,8 +99,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);
     }
 
 

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

@@ -1781,4 +1781,22 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
         return tmsTruckFeign.updateTruckWeight(mapList);
     }
+
+    @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,

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

@@ -324,6 +324,12 @@ public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
     public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
+
+    @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/resources/bootstrap.yml

@@ -27,7 +27,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:192.168.1.104:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign:
@@ -49,7 +49,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:192.168.1.115:8060}
+    url: ${RMSFEIGN_HRL:localhost:8060}
 
 genxml:
   pth: com/a