From 53f19b08636cd0ee13caf4603224c8a02ae95adb Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 05 十二月 2023 11:23:29 +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 | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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..b577d55 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,68 @@
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-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