From 56c81870c0cf2e7cc2916da746f05aa637ce6b77 Mon Sep 17 00:00:00 2001
From: bingbo <bingbo1993@126.com>
Date: 星期一, 27 十一月 2023 10:52:33 +0800
Subject: [PATCH] 加减钢筋笼库存 带记录

---
 hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java b/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java
index 22d4968..4f0710d 100644
--- a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java
+++ b/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java
@@ -45,11 +45,17 @@
 
         map.put("pipePlanActual",yearCountList);
         //月度生产计划和实际完成
-        List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
-        map.put("pipeMonthPlanActual",pipeMonthPlanActuals);
+        //List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
+        //map.put("pipeMonthPlanActual",pipeMonthPlanActuals);
         //原料消耗 周月
-        List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
-        map.put("materialWeekAndMonths",materialWeekAndMonths);
+        //List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
+        //map.put("materialWeekAndMonths",materialWeekAndMonths);
+        //钢筋消耗
+        List<HashMap<String,Object>> steelUseList = bigScreenMapper.querySteelMake();
+        map.put("steelUse",steelUseList);
+        //缓存区
+        List<HashMap<String,Object>> restInfo = bigScreenMapper.queryRestInfo();
+        map.put("restInfo",restInfo);
         //水养池
         List<WaterCulInfo> culInfoList = bigScreenMapper.WaterCulInfo(companyId);
         map.put("waterCulInfo",culInfoList);

--
Gitblit v1.9.3