zhangym 2 лет назад
Родитель
Сommit
105d06caa7

+ 16 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -582,4 +582,20 @@ public class AMScontroller {
     public Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.productionRequirementChanges(id,map);
     }
+
+    @ApiOperation(value = "展示生产订单审批详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getproductionRequirementworkflowList")
+    Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required = false) Map<String, Object> map,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize
+    ) {
+        return amsFeign.getproductionRequirementworkflowList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
 }

+ 15 - 1
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -1192,6 +1192,20 @@ public class RMScontroller extends BaseRESTfulController {
     public  Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map) {
         return  rmsFeign.addapprovelines(map);
     }
+    @ApiOperation(value="更新审批流程")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/updateapprovelines")
+    public  Map<String, Object> updateapprovelines(@RequestBody(required = false) Map<String, Object> map) {
+        return  rmsFeign.updateapprovelines(map);
+    }
+    @ApiOperation(value="删除审批流程")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/approvelinesdelete")
+    public  Map<String, Object> approvelinesdelete(@RequestBody(required = false) Map<String, Object> map) {
+        return  rmsFeign.approvelinesdelete(map);
+    }
  @ApiOperation(value = "燃料类型")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
@@ -1222,4 +1236,4 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> deleteFuelType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteFuelType(map);
     }
-}}
+}

+ 7 - 0
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -206,4 +206,11 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChanges/{id}")
     Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody Map<String, Object> map);
 
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getproductionRequirementworkflowList")
+    Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam  Integer apiId,
+                                                     @RequestParam  Integer pageNum,
+                                                     @RequestParam  Integer pageSize);
+
 }

+ 4 - 0
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -663,6 +663,10 @@ public interface RmsFeign {
                                         @RequestParam Integer apiId);
     @PostMapping("api/v1/rms/rmsapprovelines/addapprovelines")
     Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/rms/rmsapprovelines/updateapprovelines")
+    Map<String, Object> updateapprovelines(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/rms/rmsapprovelines/approvelinesdelete")
+    Map<String, Object> approvelinesdelete(@RequestBody(required = false) Map<String, Object> map);
 
     //燃料类型
     @PostMapping(value = "api/v1/rms/rmsfueltypes/getFuelTypeList")