Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-12-05 53f19b08636cd0ee13caf4603224c8a02ae95adb

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java

@@ -88,6 +88,10 @@
    //搅拌站 (2023-11-14) 添加原料 入站
    @PostMapping("/mixingInsert")
    public BasicResult mixingInsert(@RequestBody HashMap<String,Object> values)  {
        System.out.println("-------");
        System.out.println("-------");
        System.out.println("-------");
        System.out.println(values);
        return materialReleaseService.mixingInsert(values);
    }

@@ -115,8 +119,33 @@
        return materialReleaseService.mixingConsumeList(values);
    }

    //  ！！！列表 ：拌合站 （2023-11-16） 标识牌下拉
    @GetMapping("/mixingConsumePull")
    public BasicResult mixingConsumePull(){
        return materialReleaseService.mixingConsumePull();
    }
    //
    @GetMapping("/siloPull")
    public BasicResult siloPull(){
        return materialReleaseService.siloPull();
    }
    // web 端拌合站屏 列表
    @PostMapping("/siloMixingList")
    public BasicResult siloMixingList(@RequestBody Map<String,Object> values){
        return materialReleaseService.siloMixingList(values);
    }

    //搅拌站 (2023-11-14) 修改
    @PostMapping("/mixingUpdate")
    public BasicResult mixingUpdate(@RequestBody HashMap<String,Object> values)  {
        return materialReleaseService.mixingUpdate(values);
    }

    //搅拌站 删除
    @PostMapping("/mixingDel")
    public BasicResult mixingDel(@RequestBody HashMap<String,Object> values)  {
        return materialReleaseService.mixingDel(values);
    }


}