From 7af2d33d8fda6af451b0873a8f642c3cf7686136 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期三, 29 十一月 2023 16:21:49 +0800
Subject: [PATCH] 20231129_qiuyh_解决钢筋笼生产查询问题、新加钢筋笼材料标示牌、调整区域打卡
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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..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
@@ -246,4 +246,35 @@
}
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