Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -583,6 +583,14 @@ public class AMScontroller {
         return amsFeign.productionRequirementChanges(id,map);
     }
 
+    @ApiOperation(value = "查询派单时需要的发运单信息", notes = "查询派单时需要的发运单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planChildId", value = "json格式具体参数", required = true, dataType = "Integer")
+    })
+    @PostMapping(value = "/selectPlanChildById/{planChildId}")
+    public RESTfulResult selectPlanChildById(@PathVariable("planChildId") String planChildId) {
+        return amsFeign.selectPlanChildById(planChildId);
+    }
     @ApiOperation(value = "展示生产订单审批详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -597,5 +605,6 @@ public class AMScontroller {
                                               Integer pageSize
     ) {
         return amsFeign.getproductionRequirementworkflowList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
     }
 }

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

@@ -207,6 +207,9 @@ public interface AmsFeign {
     Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody Map<String, Object> map);
 
 
+    @PostMapping(value = "api/v1/ams/amsplanchilds/selectPlanChildById/{planChildId}")
+    RESTfulResult selectPlanChildById(@PathVariable("planChildId") String planChildId);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/getproductionRequirementworkflowList")
     Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                      @RequestParam  Integer apiId,