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/service/impl/TMaterialReleaseServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
index 8e1befc..3f9021f 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
@@ -222,8 +222,14 @@
@Override
public BasicResult mixingInsert(HashMap<String, Object> values) {
- values.put("mixingId","");
- materialReleaseMappper.mixingInsert(values);
+ List<Map<String,Object>> mixingList = (List<Map<String,Object>>) values.get("mixingList");
+ for (Map<String,Object> mixing : mixingList){
+ materialReleaseMappper.mixingUpdateType(mixing.get("siloId").toString());
+ mixing.put("types",1);
+ mixing.put("mixingId","");
+ mixing.put("stata",2);
+ materialReleaseMappper.mixingInsert(mixing);
+ }
return BasicResult.success();
}
@@ -254,10 +260,11 @@
materialReleaseMappper.mixingConsumeIn(values);
String mixingSignboardId = values.get("mixingSignboardId").toString();
Integer star = materialReleaseMappper.starInt();
- List<TMixingConsume> mixingConsumes = (List<TMixingConsume>) values.get("mixingConsume");
- for (TMixingConsume mixingConsume :mixingConsumes){
- mixingConsume.setMixingSignboardId(mixingSignboardId);
- mixingConsume.setStar(star+1);
+ List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume");
+ for (Map<String,Object> mixingConsume :mixingConsumes){
+ mixingConsume.put("mixingSignboardId",mixingSignboardId);
+ mixingConsume.put("star",star+1);
+ mixingConsume.put("mixingConsumeId","");
materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
}
return BasicResult.success();
@@ -277,4 +284,40 @@
PageInfo<TMixingSignboard> tMixingSignboardPageInfo = new PageInfo<>(mixingSignboards);
return BasicResult.success(tMixingSignboardPageInfo);
}
+
+ @Override
+ public BasicResult mixingConsumePull() {
+ List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingConsumePull();
+ return BasicResult.success(mixingSignboards);
+ }
+
+ @Override
+ public BasicResult siloPull() {
+ List<TSilo> silos = materialReleaseMappper.siloPull();
+ return BasicResult.success(silos);
+ }
+
+ @Override
+ public BasicResult siloMixingList(Map<String, Object> values) {
+ List<TMixing> tMixings = materialReleaseMappper.siloMixingList(values);
+ return BasicResult.success(tMixings);
+ }
+
+ @Override
+ public BasicResult mixingUpdate(HashMap<String, Object> values) {
+ List<Map<String,Object>> mixingList = (List<Map<String,Object>>) values.get("mixingList");
+ for (Map<String,Object> mixing : mixingList){
+ materialReleaseMappper.mixingUpdate(mixing);
+ }
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult mixingDel(HashMap<String, Object> values) {
+ List<String> mixingList = (List<String>) values.get("mixingIds");
+ for (String mixingId : mixingList){
+ materialReleaseMappper.mixingDel(mixingId);
+ }
+ return BasicResult.success();
+ }
}
--
Gitblit v1.9.3