wzj

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

@@ -2,6 +2,8 @@ package com.unis.vis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unis.vis.model.InboundMaterialInfo;
+import com.unis.vis.model.OutAndInboundRecord;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -18,4 +20,11 @@ public interface InboundMaterialInfoMapper extends BaseMapper<InboundMaterialInf
 
      List<InboundMaterialInfo> getWzsyqkpm();
 
+     /**
+      * 出入库记录
+      * @return
+      */
+     List<OutAndInboundRecord> getEnterExitRecords(@Param("type") Integer type);
+
+
 }

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

@@ -2,6 +2,7 @@ package com.unis.vis.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unis.vis.model.InboundMaterialInfo;
+import com.unis.vis.model.OutAndInboundRecord;
 
 import java.util.HashMap;
 import java.util.List;
@@ -17,4 +18,6 @@ public interface InboundMaterialInfoService extends IService<InboundMaterialInfo
 
     HashMap<String, List<InboundMaterialInfo>> getWzsyqkpm();
 
+    List<OutAndInboundRecord> getEnterExitRecords(Integer type);
+
 }

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

@@ -4,6 +4,7 @@ package com.unis.vis.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.unis.vis.mapper.InboundMaterialInfoMapper;
 import com.unis.vis.model.InboundMaterialInfo;
+import com.unis.vis.model.OutAndInboundRecord;
 import com.unis.vis.service.InboundMaterialInfoService;
 import org.springframework.stereotype.Service;
 
@@ -55,4 +56,14 @@ public class InboundMaterialInfoServiceImpl extends ServiceImpl<InboundMaterialI
 
         return wzsyqkpmMap;
     }
+
+    /**
+     * 出入库记录
+     * @return
+     */
+    @Override
+    public List<OutAndInboundRecord> getEnterExitRecords(Integer type) {
+        return inboundMaterialInfoMapper.getEnterExitRecords(type);
+    }
+
 }

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

@@ -44,4 +44,57 @@
           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
+        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
+
+        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'
+        ) record
+        <where>
+            <if test="type != null and type > 0">
+                AND record.type = #{type}
+            </if>
+        </where>
+        ORDER BY record.bound_time desc
+    </select>
+
 </mapper>