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

李旭东

2023-12-08 7efc6ed86025b610cab109a2e9f83362740d8ed4

 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);
    }

@@ -109,6 +113,18 @@
        return materialReleaseService.mixingConsumeIn(values);
    }

    // 拌合站 （2023-12-5） 标识牌， 手动修改 原料消耗  t_mixing_consume -> t_mixing_signboard
    @PostMapping("/mixingConsumeUp")
    public BasicResult mixingConsumeUp(@RequestBody Map<String,Object> values){
        return materialReleaseService.mixingConsumeUp(values);
    }
    //搅拌站 删除
    @PostMapping("/mixingConsumeDel")
    public BasicResult mixingConsumeDel(@RequestBody HashMap<String,Object> values)  {
        return materialReleaseService.mixingConsumeDel(values);
    }


    //  ！！！列表 ：拌合站 （2023-11-16） 标识牌， 手动添加 原料消耗  t_mixing_consume -> t_mixing_signboard
    @PostMapping("/mixingConsumeList")
    public BasicResult mixingConsumeList(@RequestBody Map<String,Object> values){
@@ -131,6 +147,18 @@
        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);
    }



}