tj

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

@@ -1039,6 +1039,25 @@ public class AMScontroller{
         }
         return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
     }
+
+    @ApiModelProperty(value = "展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getPlanOrder")
+    public Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                Integer planId,
+                                                Integer orderStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPlanOrder(mapValue, pageNum, pageSize, apiId,planId,orderStatus);
+    }
     /**
      *用车单位提出需求
      *新增用车需求

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

@@ -30,7 +30,6 @@ public class WMSController extends BaseRESTfulController {
     WMSFeign wmsFeign;
     @Autowired
     QMSFeign qmsFeign;
-
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({

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

@@ -1141,6 +1141,19 @@ public interface AmsFeign {
                                          @RequestParam Integer planStatus,
                                          @RequestParam String carrierId,
                                          @RequestParam Integer planId);
+
+    @ApiOperation(value="展示运输计划下的运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getPlanOrder")
+    Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planId,
+                                        @RequestParam Integer orderStatus);
+
     /**
      *新增用车需求
      */

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign: