From ba1a99c09206ac657e2fffaa2777fb1ea7c5077f Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 21 十一月 2023 17:13:04 +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 | 22 ++++++++++++++++++++++
1 files changed, 22 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..a9d2e96 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,26 @@
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);
+ }
+
+
+
+
+
}
--
Gitblit v1.9.3