src/main/java/com/unis/vis/controller/VisController.java

@@ -47,6 +47,26 @@ public class VisController {
         return list;
     }
 
+    /**
+     * 物资入库情况
+     * @return
+     */
+    @GetMapping("/getInventoryReceiptStatus")
+    public List<InboundMaterialInfo> getInventoryReceiptStatus() {
+        List<InboundMaterialInfo> list = inboundMaterialInfoService.getInventoryReceiptStatus();
+        return list;
+    }
+
+    /**
+     * 物资出库情况
+     * @return
+     */
+    @GetMapping("/getInventoryDispatchStatus")
+    public List<OutboundMaterialInfo> getInventoryDispatchStatus() {
+        List<OutboundMaterialInfo> list = outboundMaterialInfoService.getInventoryDispatchStatus();
+        return list;
+    }
+
     /*物资情况*/
     @GetMapping("/getMaterialSituation")
     public List<InboundMaterialInfo> getMaterialSituation() {

src/main/java/com/unis/vis/mapper/InboundMaterialInfoMapper.java

@@ -16,11 +16,15 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
 
      List<InboundMaterialInfo> getMaterialSituation();
 
+     List<InboundMaterialInfo> getInventoryReceiptStatus();
+
      List<InboundMaterialInfo> getWzsyqkpm();
 
-    /**
-     * 出入库记录
-     * @return
-     */
-    List<OutAndInboundRecord> getEnterExitRecords(@Param("type") Integer type);
+     /**
+      * 出入库记录
+      * @return
+      */
+     List<OutAndInboundRecord> getEnterExitRecords(@Param("type") Integer type);
+
+
 }

src/main/java/com/unis/vis/mapper/OutboundMaterialInfoMapper.java

@@ -12,6 +12,7 @@ public interface OutboundMaterialInfoMapper extends BaseMapper<OutboundMaterialI
 
     List<OutboundMaterialInfo> getMaterialCallSituation(String type,String action);
 
+    List<OutboundMaterialInfo> getInventoryDispatchStatus();
 
     List<OutboundMaterialInfo> getLossRecord();
 }

src/main/java/com/unis/vis/service/InboundMaterialInfoService.java

@@ -14,11 +14,10 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
 
     List<InboundMaterialInfo> getMaterialSituation();
 
+    List<InboundMaterialInfo> getInventoryReceiptStatus();
+
     HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm();
 
-    /**
-     * 出入库记录
-     * @return
-     */
     List<OutAndInboundRecord> getEnterExitRecords(Integer type);
+
 }

src/main/java/com/unis/vis/service/OutboundMaterialInfoService.java

@@ -12,4 +12,10 @@ public interface OutboundMaterialInfoService extends IService<OutboundMaterialIn
     List<OutboundMaterialInfo>  getMaterialCallSituation(String type,String action);
 
     List<OutboundMaterialInfo> getLossRecord();
+
+    /**
+     * 物资出库
+     * @return
+     */
+    List<OutboundMaterialInfo> getInventoryDispatchStatus();
 }

src/main/java/com/unis/vis/service/impl/InboundMaterialInfoServiceImpl.java

@@ -32,6 +32,11 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
     }
 
     @Override
+    public List<InboundMaterialInfo> getInventoryReceiptStatus() {
+        return inboundMaterialInfoMapper.getInventoryReceiptStatus();
+    }
+
+    @Override
     public HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm() {
         HashMap<String, List<InboundMaterialInfo>> wzsyqkpmMap = new HashMap<>();
         List<InboundMaterialInfo> wzsyqkpm = inboundMaterialInfoMapper.getWzsyqkpm();
@@ -51,6 +56,7 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
 
         return wzsyqkpmMap;
     }
+
     /**
      * 出入库记录
      * @return
@@ -60,5 +66,4 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
         return inboundMaterialInfoMapper.getEnterExitRecords(type);
     }
 
-
 }

src/main/java/com/unis/vis/service/impl/OutboundMaterialInfoServiceImpl.java

@@ -26,4 +26,14 @@ public class OutboundMaterialInfoServiceImpl extends ServiceImpl<OutboundMateria
     public List<OutboundMaterialInfo> getLossRecord() {
         return outboundMaterialInfoMapper.getLossRecord();
     }
+    /**
+     * 物资出库
+     * @return
+     */
+    @Override
+    public List<OutboundMaterialInfo> getInventoryDispatchStatus() {
+        return outboundMaterialInfoMapper.getInventoryDispatchStatus();
+    }
+
+
 }

src/main/resources/mapper/vis/InboundMaterialInfoMapper.xml

@@ -23,59 +23,72 @@
         where b."status"=5
         GROUP BY dic.NAME_
     </select>
+    <!-- 应用物资大类 -->
     <select id="getWzsyqkpm" resultType="com.unis.vis.model.InboundMaterialInfo">
         select dic.NAME_ as material_type,SUM(iif.quantity)as quantity,SUM(iif.total_price)as total_price
         from outbound_material_info iif
-        left JOIN SYS_TREE_DICT dic on iif.material_type=dic.ID
-        left join outbound_info b ON iif."outbound_id"=B."outbound_id"
+                 left JOIN SYS_TREE_DICT dic on iif.material_type=dic.ID
+                 left join outbound_info b ON iif."outbound_id"=B."outbound_id"
         where b."status"=5 and dic.DIFFERENCE_=2
         GROUP BY dic.NAME_
     </select>
-
+    <!-- 物资入库情况 -->
+    <select id="getInventoryReceiptStatus" resultType="com.unis.vis.model.InboundMaterialInfo">
+        SELECT std.NAME_            as material_type,
+               SUM(imi.quantity)    as quantity,
+               SUM(imi.total_price) as total_price
+        FROM "inbound_material_info" imi
+                 LEFT JOIN "inbound_info" ii ON imi."inbound_id" = ii."inbound_id"
+                 LEFT JOIN "SYS_TREE_DICT" std ON std."id" = ii."material_type"
+        WHERE ii."status" = 5
+          AND ii."is_available" = 0
+          AND ii."material_type" in (SELECT id FROM SYS_TREE_DICT std WHERE std.DIFFERENCE_ = 2)
+        GROUP BY std.NAME_
+    </select>
     <!-- 出入库记录 -->
     <select id="getEnterExitRecords" parameterType="integer" resultType="com.unis.vis.model.OutAndInboundRecord">
         SELECT record.type,
-               record.shengName,
-               record.material_name as materialName,
-               record.quantity,
-               record.specs,
-               record.bound_time as boundTime
+        record.shengName,
+        record.material_name as materialName,
+        record.quantity,
+        record.specs,
+        record.bound_time as boundTime
         FROM (
-              SELECT
-                  1 AS type,
-                  null as shengName,
-                  std.NAME_ as material_name,
-                  ruku.quantity,
-                  ruku.specs,
-                  ruku.inbound_time AS bound_time
-              FROM "inbound_status" flow
-              LEFT JOIN "inbound_material_info" ruku ON ruku."inbound_id" = flow."inbound_id"
-              LEFT JOIN SYS_TREE_DICT std ON std.id = ruku.material_name
-              WHERE
-                flow.is_invalid = 0
-                AND ruku.is_available = 0
-                <!-- 审核通过的 -->
-                AND flow."status" = 5
+        SELECT
+        1 AS type,
+        null as shengName,
+        std.NAME_ as material_name,
+        ruku.quantity,
+        ruku.specs,
+        ruku.inbound_time AS bound_time
+        FROM "inbound_status" flow
+        LEFT JOIN "inbound_material_info" ruku ON ruku."inbound_id" = flow."inbound_id"
+        LEFT JOIN SYS_TREE_DICT std ON std.id = ruku.material_name
+        WHERE
+        flow.is_invalid = 0
+        AND ruku.is_available = 0
+        <!-- 审核通过的 -->
+        AND flow."status" = 5
 
-              UNION ALL
+        UNION ALL
 
-              SELECT
-                  2 AS type,
-                  dict.DESCRIPTION as shengName,
-                  std.NAME_ as material_name,
-                  chuku.quantity,
-                  chuku.specs,
-                  chuku.outbound_time AS bound_time
-              FROM "outbound_status" flow
-              LEFT JOIN "outbound_material_info" chuku ON chuku."outbound_id" = flow."outbound_id"
-              LEFT JOIN SYS_DICT_ITEM dict ON dict.ITEM_VALUE  = chuku."province"
-              LEFT JOIN SYS_TREE_DICT std ON std.id = chuku.material_name
-              WHERE
-                flow.is_invalid = 0
-                AND chuku.is_available = 0
-                <!-- 审核通过的 -->
-                AND flow."status" = 5
-                AND dict.DICT_TYPE = 'province_ch'
+        SELECT
+        2 AS type,
+        dict.DESCRIPTION as shengName,
+        std.NAME_ as material_name,
+        chuku.quantity,
+        chuku.specs,
+        chuku.outbound_time AS bound_time
+        FROM "outbound_status" flow
+        LEFT JOIN "outbound_material_info" chuku ON chuku."outbound_id" = flow."outbound_id"
+        LEFT JOIN SYS_DICT_ITEM dict ON dict.ITEM_VALUE  = chuku."province"
+        LEFT JOIN SYS_TREE_DICT std ON std.id = chuku.material_name
+        WHERE
+        flow.is_invalid = 0
+        AND chuku.is_available = 0
+        <!-- 审核通过的 -->
+        AND flow."status" = 5
+        AND dict.DICT_TYPE = 'province_ch'
         ) record
         <where>
             <if test="type != null and type > 0">

src/main/resources/mapper/vis/OutboundMaterialInfoMapper.xml

@@ -24,6 +24,19 @@
         GROUP BY dic.NAME_
 
     </select>
+    <!-- 物资出库 -->
+    <select id="getInventoryDispatchStatus" resultType="com.unis.vis.model.OutboundMaterialInfo">
+        SELECT std.NAME_            as material_type,
+               SUM(imi.quantity)    as quantity,
+               SUM(imi.total_price) as total_price
+        FROM "outbound_material_info" imi
+                 LEFT JOIN "outbound_info" ii ON imi."outbound_id" = ii."outbound_id"
+                 LEFT JOIN "SYS_TREE_DICT" std ON std."id" = ii."material_type"
+        WHERE ii."status" = 5
+          AND ii."is_available" = 0
+          AND ii."material_type" in (SELECT id FROM SYS_TREE_DICT std WHERE std.DIFFERENCE_ = 2)
+        GROUP BY std.NAME_
+    </select>
 
     <!-- 损耗记录 -->
     <select id="getLossRecord" resultType="com.unis.vis.model.OutboundMaterialInfo">