From c163052d4f7e2debfc1cfb14edf85f503b2c7c00 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 21 十一月 2023 10:19:30 +0800
Subject: [PATCH] 修改地址
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 a3783fe..dcad2b7 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,9 @@
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.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;
import com.thhy.materials.modules.biz.concret.service.TMaterialReleaseService;
import com.thhy.materials.modules.biz.weigh.mapper.WeighMapper;
@@ -205,4 +205,45 @@
}
return null;
}
+
+ @Override
+ public BasicResult materialRew(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<PieceDto> pieceDtos = materialReleaseMappper.pieceList(values);
+ for (PieceDto pieceDto : pieceDtos){
+ List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById());
+ pieceDto.setRawMaterials(rawMaterials);
+ }
+ 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);
+ }
}
--
Gitblit v1.9.3