Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

严智鑫

2025-08-18 3b65a5dc04be7cdac460c84ebaa38bf009405128

 河北望美项目/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java

@@ -103,9 +103,10 @@
    }
   
   //缁撴潫浠诲姟
   @RequestMapping(method=RequestMethod.GET,value="/delecttask/{id}")
    public String delecttask(Model model,@PathVariable("id") Long id){
       return cutManageService.delecttask(id);
   @RequestMapping(method=RequestMethod.GET,value="/delecttask/{id}/{line}")
   @ResponseBody
    public String delecttask(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
       return cutManageService.delecttask(id,line);
    }
   
   @RequestMapping(method=RequestMethod.POST, value="/updatedengluname")
@@ -116,9 +117,11 @@
   }
   
   //涓柇浠诲姟
   @RequestMapping(method=RequestMethod.GET,value="/delecttask1/{id}")
   public String delecttask1(Model model,@PathVariable("id") Long id){
       return cutManageService.delecttask1(id);

   @RequestMapping(method=RequestMethod.GET,value="/delecttask1/{id}/{line}")
   @ResponseBody
   public String delecttask1(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
       return cutManageService.delecttask1(id,line);
   }