修改库存明细页面中图标的数据算法

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>

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 {

src/main/resources/templates/pages/material/material-view_back.html

@@ -88,33 +88,52 @@
                     <div class="panel-heading">数据图标
                     </div>
                     <div class="panel-body">
+                        <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-heading">物料入库明细</div>
                                         <div class="panel-body">
-                                    <div id="echarts-line-in" style="height:500px;width: 500px;">
+                                            <div id="echarts-line-inventory" style="height: 500px;width: 500px">
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
+                            <div class="tab-pane fade" id="applicationInEchart">
                                 <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 id="echarts-line-in" style="height:500px;width: 500px;">
                                             </div>
                                         </div>
                                     </div>
                                 </div>
+
+                            </div>
+                            <div class="tab-pane fade" id="applicationOutEchart">
                                 <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 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,9 +514,7 @@
         };
 
 
-
+        initEchart = function (req) {
-
-        initEchart = function(req) {
             $.ajax({
                 url: '/depositoryRecord/getApplicationForMaterial',
                 type: 'post',
@@ -549,7 +568,6 @@
         }
 
 
-
     });
 </script>
 

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>