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 | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 097eb28..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,10 +222,12 @@
@Override
public BasicResult mixingInsert(HashMap<String, Object> values) {
- List<TMixing> mixingList = (List<TMixing>) values.get("mixingList");
- for (TMixing mixing : mixingList){
- materialReleaseMappper.mixingUpdateType(mixing.getSiloId());
- mixing.setTypes(1);
+ 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();
@@ -258,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();
@@ -299,4 +302,22 @@
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