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/service/impl/TMaterialReleaseServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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 dcad2b7..097eb28 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,12 @@
@Override
public BasicResult mixingInsert(HashMap<String, Object> values) {
- values.put("mixingId","");
- materialReleaseMappper.mixingInsert(values);
+ List<TMixing> mixingList = (List<TMixing>) values.get("mixingList");
+ for (TMixing mixing : mixingList){
+ materialReleaseMappper.mixingUpdateType(mixing.getSiloId());
+ mixing.setTypes(1);
+ materialReleaseMappper.mixingInsert(mixing);
+ }
return BasicResult.success();
}
@@ -246,4 +250,53 @@
}
return BasicResult.success(tSilos);
}
+
+ @Override
+ @Transactional
+ public BasicResult mixingConsumeIn(Map<String, Object> values) {
+ values.put("mixingSignboardId","");
+ 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);
+ materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
+ }
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult mixingConsumeList(Map<String, Object> values) {
+ Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
+ Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
+ PageHelper.startPage(pageNum,pageSize);
+ List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingSignboardList(values);
+ for (TMixingSignboard mixingSignboard : mixingSignboards){
+ Integer star = materialReleaseMappper.starIntSig(mixingSignboard.getMixingSignboardId());
+ List<TMixingConsume> mixingConsumes = materialReleaseMappper.mixingConsumes(mixingSignboard.getMixingSignboardId(),star);
+ mixingSignboard.setTMixingConsumes(mixingConsumes);
+ }
+ 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);
+ }
}
--
Gitblit v1.9.3