Merge branch 'master' of http://192.168.2.241:3000/haiqiu/tofly-zmrq

workflow/src/main/java/com/tofly/workflow/wzyy/controller/MaterialOutInController.java

@@ -88,4 +88,11 @@ public class MaterialOutInController {
         PageInListDto vos = mOutInService.getYyInMaterial(dto);
         return ResultData.ok(vos);
     }
+    @GetMapping("/returnOfMaterial")
+    @ApiOperation(value = "手动触发退料")
+    public ResultData returnOfMaterial(Long  processId){
+        mOutInService.returnOfMaterial(processId);
+        return ResultData.ok("success");
+    }
+
 }