From 7750acd839c4ef724b991ee5098de7ae2e15e52c Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Sun, 9 Jul 2023 16:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=9B=BE=E6=A0=87=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DepositoryRecordMapper.xml         |   6 +
 .../impl/DepositoryRecordServiceImpl.java     |   1 +
 .../pages/material/material-view_back.html    | 160 ++++++++++--------
 .../mapper/DepositoryRecordMapper.xml         |   6 +
 4 files changed, 102 insertions(+), 71 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 9e47983c..f86311d3 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -1775,6 +1775,9 @@
         <if test="typeId != null and typeId != ''">
             and mtid = #{typeId}
         </if>
+        <if test="depositoryId != null and depositoryId != ''">
+            and did = #{depositoryId}
+        </if>
         <if test="mid != null and mid != ''">
             and mid = #{mid}
         </if>
@@ -1802,6 +1805,9 @@
         <if test="mid != null and mid != ''">
             and mid = #{mid}
         </if>
+        <if test="depositoryId != null and depositoryId != ''">
+            and depositoryId = #{depositoryId}
+        </if>
         <if test="state == 1 or state == 4">
             and depositoryManagerPass in (1,4)
         </if>
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index b86d65d8..cfec26de 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -2086,6 +2086,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         String materialUnit = inventoryById.getUnit();
         // 声明用于查询的map
         Map<String, Object> paramForSelect = new HashMap<>();
+        paramForSelect.put("depositoryId",inventoryById.getDepositoryId());
         if (type == 1) {
             paramForSelect.put("mid", inventoryById.getMid());
         } else {
diff --git a/src/main/resources/templates/pages/material/material-view_back.html b/src/main/resources/templates/pages/material/material-view_back.html
index 1b3ad0a7..f8ded99a 100644
--- a/src/main/resources/templates/pages/material/material-view_back.html
+++ b/src/main/resources/templates/pages/material/material-view_back.html
@@ -88,33 +88,52 @@
                     <div class="panel-heading">数据图标
                     </div>
                     <div class="panel-body">
-                        <div class="layui-col-xs4  myEchart">
-                            <div class="panel panel-warning">
-                                <div class="panel-heading">物料入库明细</div>
-                                <div class="panel-body">
-                                    <div id="echarts-line-in" style="height:500px;width: 500px;">
+                        <ul id="myTab" class="nav nav-tabs nav-pills">
+                            <li class="active">
+                                <a href="#inventoryEchart" data-toggle="tab">
+                                    库存明细图标
+                                </a>
+                            </li>
+                            <li><a href="#applicationInEchart" data-toggle="tab">入库明细图表</a></li>
+                            <li><a href="#applicationOutEchart" data-toggle="tab">出库明细图表</a></li>
+
+                        </ul>
+                        <div id="myTabContent" class="tab-content">
+                            <div class="tab-pane fade in active" id="inventoryEchart">
+                                <div class="layui-col-xs4  myEchart">
+                                    <div class="panel panel-warning">
+                                        <div class="panel-body">
+                                            <div id="echarts-line-inventory" style="height: 500px;width: 500px">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="layui-col-xs4  myEchart">
-                            <div class="panel panel-warning">
-                                <div class="panel-heading">物料出库明细</div>
-                                <div class="panel-body">
-                                    <div id="echarts-line-out" style="height: 500px;width: 500px">
+                            <div class="tab-pane fade" id="applicationInEchart">
+                                <div class="layui-col-xs4  myEchart">
+                                    <div class="panel panel-warning">
+                                        <div class="panel-body">
+                                            <div id="echarts-line-in" style="height:500px;width: 500px;">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
+
                             </div>
-                        </div>
-                        <div class="layui-col-xs4  myEchart">
-                            <div class="panel panel-warning">
-                                <div class="panel-heading">物料库存明细</div>
-                                <div class="panel-body">
-                                    <div id="echarts-line-inventory" style="height: 500px;width: 500px">
+                            <div class="tab-pane fade" id="applicationOutEchart">
+                                <div class="layui-col-xs4  myEchart">
+                                    <div class="panel panel-warning">
+                                        <div class="panel-body">
+                                            <div id="echarts-line-out" style="height: 500px;width: 500px">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
+
                             </div>
                         </div>
+
+
                     </div>
                 </div>
             </div>
@@ -156,6 +175,8 @@
 </script>
 
 <script src="/static/lib/layui-v2.8.6/layui.js" charset="utf-8"></script>
+<script src="/static/lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
+<script src="/static/lib/bootstrap-3.4.1-dist/js/bootstrap.min.js" charset="utf-8"></script>
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script src="/static/lib/echarts/echarts.js" charset="utf-8"></script>
 <script>
@@ -293,7 +314,7 @@
         };
 
         // 数据行点击事件
-        table.on('row(currentTableId)', function(obj){
+        table.on('rowDouble(currentTableId)', function (obj) {
             var data = obj.data; // 获取当前行数据
             let id = data.id;
             let req = {};
@@ -471,7 +492,7 @@
             let pid = $(obj).find("option:selected").attr("pid");
             let id = obj.id.split("placeItem")[1];
             let placeAndMaterialId = obj.value;
-            $("#applicationIn"+id).attr("placeId",pid);
+            $("#applicationIn" + id).attr("placeId", pid);
             let unit = $("#unitItem" + id).val();
             let req = {};
             req.unit = unit;
@@ -493,63 +514,60 @@
         };
 
 
-
-
-        initEchart = function(req) {
+        initEchart = function (req) {
             $.ajax({
-            url: '/depositoryRecord/getApplicationForMaterial',
-            type: 'post',
-            async: true,
-            dataType: "json",
-            data: JSON.stringify(req),
-            contentType: "application/json;charset=utf-8",
-            complete: function (XHR, TS) {
-                layer.close(this.layerIndex);
-                if (XHR.status !== 200) {
-                    layer.alert("系统繁忙，稍后重试");
+                url: '/depositoryRecord/getApplicationForMaterial',
+                type: 'post',
+                async: true,
+                dataType: "json",
+                data: JSON.stringify(req),
+                contentType: "application/json;charset=utf-8",
+                complete: function (XHR, TS) {
+                    layer.close(this.layerIndex);
+                    if (XHR.status !== 200) {
+                        layer.alert("系统繁忙，稍后重试");
+                    }
+                },
+                beforeSend: function () {
+                    this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                },
+                success: function (result) {
+                    let data = result.data;
+                    let dayNames = data["dayNames"];
+                    let amountItemForIn = data["amountItemForIn"];
+                    let countItemForIn = data["countItemForIn"];
+                    let amountItemForOut = data["amountItemForOut"];
+                    let countItemForOut = data["countItemForOut"];
+                    let countItemForInventory = data["countItemForInventory"];
+                    let amountItemForInventory = data["amountItemForInventory"];
+                    let legendItem = data["legend"];
+                    let seriesInItem = [];
+                    let seriesOutItem = [];
+                    let seriesInventoryItem = [];
+                    seriesInItem.push(amountItemForIn);
+                    seriesInItem.push(countItemForIn);
+                    seriesOutItem.push(amountItemForOut);
+                    seriesOutItem.push(countItemForOut);
+                    seriesInventoryItem.push(countItemForInventory);
+                    seriesInventoryItem.push(amountItemForInventory);
+                    optionLineChartIn.series = seriesInItem;
+                    optionLineChartOut.series = seriesOutItem;
+                    optionLineChartInventory.series = seriesInventoryItem;
+
+                    optionLineChartIn.xAxis.data = dayNames;
+                    optionLineChartIn.legend = legendItem;
+                    optionLineChartOut.legend = legendItem;
+                    optionLineChartOut.xAxis.data = dayNames;
+                    optionLineChartInventory.legend = legendItem;
+                    optionLineChartInventory.xAxis.data = dayNames;
+                    echartLineChartIn.setOption(optionLineChartIn);
+                    echartLineChartOut.setOption(optionLineChartOut);
+                    echartLineChartInventory.setOption(optionLineChartInventory);
                 }
-            },
-            beforeSend: function () {
-                this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
-            },
-            success: function (result) {
-                let data = result.data;
-                let dayNames = data["dayNames"];
-                let amountItemForIn = data["amountItemForIn"];
-                let countItemForIn = data["countItemForIn"];
-                let amountItemForOut = data["amountItemForOut"];
-                let countItemForOut = data["countItemForOut"];
-                let countItemForInventory = data["countItemForInventory"];
-                let amountItemForInventory = data["amountItemForInventory"];
-                let legendItem = data["legend"];
-                let seriesInItem = [];
-                let seriesOutItem = [];
-                let seriesInventoryItem = [];
-                seriesInItem.push(amountItemForIn);
-                seriesInItem.push(countItemForIn);
-                seriesOutItem.push(amountItemForOut);
-                seriesOutItem.push(countItemForOut);
-                seriesInventoryItem.push(countItemForInventory);
-                seriesInventoryItem.push(amountItemForInventory);
-                optionLineChartIn.series = seriesInItem;
-                optionLineChartOut.series = seriesOutItem;
-                optionLineChartInventory.series = seriesInventoryItem;
-
-                optionLineChartIn.xAxis.data = dayNames;
-                optionLineChartIn.legend = legendItem;
-                optionLineChartOut.legend = legendItem;
-                optionLineChartOut.xAxis.data = dayNames;
-                optionLineChartInventory.legend = legendItem;
-                optionLineChartInventory.xAxis.data = dayNames;
-                echartLineChartIn.setOption(optionLineChartIn);
-                echartLineChartOut.setOption(optionLineChartOut);
-                echartLineChartInventory.setOption(optionLineChartInventory);
-            }
-        })
+            })
         }
 
 
-
     });
 </script>
 
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 9e47983c..f86311d3 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -1775,6 +1775,9 @@
         <if test="typeId != null and typeId != ''">
             and mtid = #{typeId}
         </if>
+        <if test="depositoryId != null and depositoryId != ''">
+            and did = #{depositoryId}
+        </if>
         <if test="mid != null and mid != ''">
             and mid = #{mid}
         </if>
@@ -1802,6 +1805,9 @@
         <if test="mid != null and mid != ''">
             and mid = #{mid}
         </if>
+        <if test="depositoryId != null and depositoryId != ''">
+            and depositoryId = #{depositoryId}
+        </if>
         <if test="state == 1 or state == 4">
             and depositoryManagerPass in (1,4)
         </if>