11111

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

@@ -81,9 +81,10 @@ public class VisController {
     }
 
     /*物资调用情况*/
+    /*调用：1 调出：2*/
     @GetMapping("/getMaterialCallSituation")
     public List<OutboundMaterialInfo> getMaterialCallSituation(@RequestParam("type") String type,
-                                                               @RequestParam("action")String action) {
+                                                               @RequestParam("action")Integer action) {
 
         List<OutboundMaterialInfo> list = outboundMaterialInfoService.getMaterialCallSituation(type,action);
         return list;
@@ -107,8 +108,9 @@ public class VisController {
      * @return
      */
     @GetMapping("/entry_exit_records")
-    public List<OutAndInboundRecord> getEnterExitRecords(@RequestParam(value = "type", required = false) Integer type){
-        return inboundMaterialInfoService.getEnterExitRecords(type);
+    public List<OutAndInboundRecord> getEnterExitRecords(@RequestParam(value = "type", required = false) Integer type,
+                                                         @RequestParam(value = "name", required = false) String name){
+        return inboundMaterialInfoService.getEnterExitRecords(type,name);
     }
 
     /*损耗记录*/

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

@@ -28,7 +28,7 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
       * 出入库记录
       * @return
       */
-     List<OutAndInboundRecord> getEnterExitRecords(@Param("type") Integer type);
+     List<OutAndInboundRecord> getEnterExitRecords(@Param("type") Integer type,@Param("name")String name);
 
 
 }

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

@@ -2,6 +2,7 @@ package com.unis.vis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unis.vis.model.OutboundMaterialInfo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -10,7 +11,9 @@ import java.util.List;
 @Repository
 public interface OutboundMaterialInfoMapper extends BaseMapper<OutboundMaterialInfo> {
 
-    List<OutboundMaterialInfo> getMaterialCallSituation(String type,String action);
+    List<OutboundMaterialInfo> getMaterialCallSituationDY(@Param("type") String type);
+
+    List<OutboundMaterialInfo> getMaterialCallSituationDC(@Param("type") String type);
 
     List<OutboundMaterialInfo> getInventoryDispatchStatus();
 

src/main/java/com/unis/vis/model/OutAndInboundRecord.java

@@ -40,4 +40,6 @@ public class OutAndInboundRecord {
      * 出入库日期
      */
     private String boundTime;
+
+    private Integer parentID;
 }

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

@@ -20,6 +20,6 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
 
     HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm();
 
-    List<OutAndInboundRecord> getEnterExitRecords(Integer type);
+    List<OutAndInboundRecord> getEnterExitRecords(Integer type,String name);
     Map<String,List<MaterialReserveSituationVO>> selectWarehouseForMaterialType(String warehouse);
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 public interface OutboundMaterialInfoService extends IService<OutboundMaterialInfo> {
 
 
-    List<OutboundMaterialInfo>  getMaterialCallSituation(String type,String action);
+    List<OutboundMaterialInfo>  getMaterialCallSituation(String type,Integer action);
 
     List<OutboundMaterialInfo> getLossRecord();
 

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

@@ -74,8 +74,8 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
      * @return
      */
     @Override
-    public List<OutAndInboundRecord> getEnterExitRecords(Integer type) {
-        return inboundMaterialInfoMapper.getEnterExitRecords(type);
+    public List<OutAndInboundRecord> getEnterExitRecords(Integer type,String name) {
+        return inboundMaterialInfoMapper.getEnterExitRecords(type,name);
     }
 
 }

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

@@ -17,9 +17,14 @@ public class OutboundMaterialInfoServiceImpl extends ServiceImpl<OutboundMateria
     private OutboundMaterialInfoMapper outboundMaterialInfoMapper;
 
     @Override
-    public List<OutboundMaterialInfo> getMaterialCallSituation(String type,String action) {
+    public List<OutboundMaterialInfo> getMaterialCallSituation(String type,Integer action) {
+        /*调用：1 调出：2*/
+        if(action==1){
+            return outboundMaterialInfoMapper.getMaterialCallSituationDY(type);
+        }
+            return outboundMaterialInfoMapper.getMaterialCallSituationDC(type);
+
 
-        return outboundMaterialInfoMapper.getMaterialCallSituation(type,action);
     }
 
     @Override

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

@@ -45,18 +45,20 @@
         GROUP BY std.NAME_
     </select>
     <!-- 出入库记录 -->
-    <select id="getEnterExitRecords" parameterType="integer" resultType="com.unis.vis.model.OutAndInboundRecord">
+    <select id="getEnterExitRecords"  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.bound_time as boundTime,
+        record.PARENT_ID as parentID
         FROM (
         SELECT
         1 AS type,
         null as shengName,
         std.NAME_ as material_name,
+        std.PARENT_ID as PARENT_ID,
         ruku.quantity,
         ruku.specs,
         ruku.inbound_time AS bound_time
@@ -69,8 +71,8 @@
         AND ruku.is_available = 0
         <!-- 审核通过的 -->
         AND flow."status" = 5
-        <if test="type != null">
-            AND ii.name = #{name}
+        <if test="name != null">
+            AND ii.warehouse = #{name}
         </if>
         UNION ALL
 
@@ -80,12 +82,13 @@
         std.NAME_ as material_name,
         chuku.quantity,
         chuku.specs,
+        std.PARENT_ID as PARENT_ID,
         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
-        LEFT JOIN inbound_info ii ON ii.outbound_id = chuku.outbound_id
+        LEFT JOIN outbound_info ii ON ii.outbound_id = chuku.outbound_id
         WHERE
         flow.is_invalid = 0
         AND chuku.is_available = 0
@@ -93,7 +96,7 @@
         AND flow."status" = 5
         AND dict.DICT_TYPE = 'province_ch'
         <if test="name != null">
-            AND ii.name = #{name}
+            AND ii.warehouse = #{name}
         </if>
         ) record
         <where>

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

@@ -13,7 +13,7 @@
         GROUP BY dic.NAME_
     </select>-->
     <!-- 物资调用情况 -->
-    <select id="getMaterialCallSituation" resultType="com.unis.vis.model.OutboundMaterialInfo">
+    <select id="getMaterialCallSituationDY" resultType="com.unis.vis.model.OutboundMaterialInfo">
         SELECT dic.NAME_ as material_type,
                SUM(CASE WHEN iif.is_available = 0 THEN iif.quantity ELSE 0 END) AS yes_quantity,
                SUM(CASE WHEN iif.is_available = 1 THEN iif.quantity ELSE 0 END) AS no_quantity
@@ -48,10 +48,54 @@
         <if test="type == 12">
             AND iif.material_type = 12
         </if>
+        GROUP BY dic.NAME_
 
+    </select>
+    <!-- 物资调用情况 -->
+    <select id="getMaterialCallSituationDC" resultType="com.unis.vis.model.OutboundMaterialInfo">
+        SELECT --dic.NAME_ as material_type,
+        iif.province,b.warehouse,sum(total_price)as total_price,
+        SUM(CASE WHEN iif.is_available = 0 THEN iif.quantity ELSE 0 END) AS quantity
+        -- SUM(CASE WHEN iif.is_available = 1 THEN iif.quantity ELSE 0 END) AS no_quantity
+        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_DICT_ITEM c on iif."province"=c.ITEM_VALUE
+        where b."status"=5 and C.dict_type='province_ch'
+        GROUP BY b.warehouse
+        <if test="type == 4">
+            AND iif.material_type = 4
+        </if>
+        <if test="type == 5">
+            AND iif.material_type = 5
+        </if>
+        <if test="type == 6">
+            AND iif.material_type = 6
+        </if>
+        <if test="type == 7">
+            AND iif.material_type = 7
+        </if>
+        <if test="type == 8">
+            AND iif.material_type = 8
+        </if>
+        <if test="type == 9">
+            AND iif.material_type = 9
+        </if>
+        <if test="type == 10">
+            AND iif.material_type = 10
+        </if>
+        <if test="type == 11">
+            AND iif.material_type = 11
+        </if>
+        <if test="type == 12">
+            AND iif.material_type = 12
+        </if>
         GROUP BY dic.NAME_
 
     </select>
+
+
+
     <!-- 物资出库情况 -->
     <select id="getInventoryDispatchStatus" resultType="com.unis.vis.model.OutboundMaterialInfo">
         SELECT std.NAME_            as material_type,