From 6a9dc2c9553ae13bb3196f325c9905abbd502145 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 04 十二月 2023 16:46:00 +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 |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 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 79e9a60..018373b 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
@@ -97,4 +97,40 @@
         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-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);
+    }
+
+
+
 }

--
Gitblit v1.9.3