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

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

@@ -1078,6 +1078,13 @@ public class AMScontroller{
         return amsFeign.selectRequirement(requirementId);
     }
 
+    /*
+    查询需求物资详情
+     */
+    @PostMapping("/getRequirementMaterial/{requirementId}")
+    public Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.getRequirementMaterial(requirementId);
+    }
     /**
      * 展示用车需求
      * @param mapValue

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

@@ -743,6 +743,14 @@ public class OMSController {
     public Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue){
         return omsFeign.getAllLoadUnloadResult(mapValue);
     }
+
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("/getOrderMaterial/{orderId}")
+    public Map<String,Object> getOrderMaterial(@PathVariable("orderId")Integer orderId){
+        return omsFeign.getOrderMaterial(orderId);
+    }
+
+
     @ApiOperation(value = "查看所有实绩点")
     @PostMapping("/getAllResultLineMes")
     public Map<String, Object> getAllResultLineMes(Integer orderId){

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

@@ -1500,6 +1500,7 @@ public interface AmsFeign {
                                               @RequestParam String enableStatus,
                                               @RequestParam String planStatus);
 
-
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getRequirementMaterial/{requirementId}")
+    Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId);
 
 }

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

@@ -437,7 +437,13 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/refuseCtrlZ")
     Map<String, Object> refuseCtrlZ(Map<String, Object> map);
 
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderMaterial/{orderId}")
+    Map<String, Object> getOrderMaterial(@PathVariable Integer orderId);
+
+
     @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
     Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId);
+
 }