From d4bc64680418827ff4bfa879eb7c8490e20a20db Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 21 十一月 2023 14:22:13 +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 | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 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 1e9c031..8e1befc 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
@@ -5,9 +5,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
-import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
-import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
-import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
+import com.thhy.materials.modules.biz.concret.entity.*;
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
import com.thhy.materials.modules.biz.concret.mapper.TMaterialReleaseMappper;
@@ -221,4 +219,62 @@
PageInfo<PieceDto> pieceDtoPageInfo = new PageInfo<>(pieceDtos);
return BasicResult.success(pieceDtoPageInfo);
}
+
+ @Override
+ public BasicResult mixingInsert(HashMap<String, Object> values) {
+ values.put("mixingId","");
+ materialReleaseMappper.mixingInsert(values);
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult mixingList(HashMap<String, Object> values) {
+// Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
+// Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
+// PageHelper.startPage(pageNum,pageSize);
+ List<TMixing> mixings = materialReleaseMappper.mixingList(values);
+ //PageInfo<TMixing> tMixingPageInfo = new PageInfo<>(mixings);
+ return BasicResult.success(mixings);
+ }
+
+ @Override
+ public BasicResult siloList(Integer types) {
+ List<TSilo> tSilos = materialReleaseMappper.siloList(types);
+ for (TSilo silo :tSilos){
+ TMixing mixings = materialReleaseMappper.mixingLists(silo.getSiloId());
+ silo.setMixing(mixings);
+ }
+ 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);
+ }
}
--
Gitblit v1.9.3