cc

物资出库
物资入库

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

@@ -50,6 +50,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

@@ -13,4 +13,10 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
      List<InboundMaterialInfo> getEmergencySuppliesCategory();
 
      List<InboundMaterialInfo> getMaterialSituation();
+
+     /**
+      * 入库
+      * @return
+      */
+     List<InboundMaterialInfo> getInventoryReceiptStatus();
 }

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

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

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

@@ -12,5 +12,10 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
 
     List<InboundMaterialInfo> getMaterialSituation();
 
+    /**
+     * 物资入库情况
+     * @return
+     */
+    List<InboundMaterialInfo> getInventoryReceiptStatus();
 
 }

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

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

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

@@ -27,6 +27,10 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
         return inboundMaterialInfoMapper.getMaterialSituation();
     }
 
+    @Override
+    public List<InboundMaterialInfo> getInventoryReceiptStatus() {
+        return inboundMaterialInfoMapper.getInventoryReceiptStatus();
+    }
 
 
 }

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

@@ -22,5 +22,14 @@ public class OutboundMaterialInfoServiceImpl extends ServiceImpl<OutboundMateria
         return outboundMaterialInfoMapper.getMaterialCallSituation(type,action);
     }
 
+    /**
+     * 物资出库
+     * @return
+     */
+    @Override
+    public List<OutboundMaterialInfo> getInventoryDispatchStatus() {
+        return outboundMaterialInfoMapper.getInventoryDispatchStatus();
+    }
+
 
 }

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

@@ -23,5 +23,19 @@
         where b."status"=5
         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>
+
 
 </mapper>

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

@@ -24,5 +24,18 @@
         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>
 
 </mapper>