From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+), 0 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
index a9e5f7f..bffdcd8 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
@@ -84,4 +84,81 @@
     public BasicResult materialRew(@RequestBody HashMap<String,Object> values)  {
         return materialReleaseService.materialRew(values);
     }
+
+    //搅拌站 (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);
+    }
+
+    //搅拌站 (2023-11-14) 添加原料 入站 列表
+    @PostMapping("/mixingList")
+    public BasicResult mixingList(@RequestBody HashMap<String,Object> values)  {
+        return materialReleaseService.mixingList(values);
+    }
+
+    //搅拌站 (2023-11-14) 添加原料 入站 列表 /罐子 类型表
+    @GetMapping("/siloList")
+    public BasicResult siloList(@RequestParam Integer types)  {
+        return materialReleaseService.siloList(types);
+    }
+
+    // 拌合站 (2023-11-16) 标识牌, 手动添加 原料消耗  t_mixing_consume -> t_mixing_signboard
+    @PostMapping("/mixingConsumeIn")
+    public BasicResult mixingConsumeIn(@RequestBody Map<String,Object> values){
+        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){
+        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);
+    }
+
+
+
 }

--
Gitblit v1.9.3