Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/unis/vis/service/OutboundMaterialInfoService.java
#	src/main/java/com/unis/vis/service/impl/OutboundMaterialInfoServiceImpl.java

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

@@ -99,5 +99,10 @@ public class VisController {
         return inboundMaterialInfoService.getEnterExitRecords(type);
     }
 
-
+    /*损耗记录*/
+    @GetMapping("/getLossRecord")
+    public List<OutboundMaterialInfo> getLossRecord() {
+        List<OutboundMaterialInfo> list = outboundMaterialInfoService.getLossRecord();
+        return list;
+    }
 }

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

@@ -14,4 +14,5 @@ public interface OutboundMaterialInfoMapper extends BaseMapper<OutboundMaterialI
 
     List<OutboundMaterialInfo> getInventoryDispatchStatus();
 
+    List<OutboundMaterialInfo> getLossRecord();
 }

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

@@ -11,6 +11,7 @@ public interface OutboundMaterialInfoService extends IService<OutboundMaterialIn
 
     List<OutboundMaterialInfo>  getMaterialCallSituation(String type,String action);
 
+    List<OutboundMaterialInfo> getLossRecord();
 
     /**
      * 物资出库

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

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

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

@@ -38,4 +38,15 @@
         GROUP BY std.NAME_
     </select>
 
+    <!-- 损耗记录 -->
+    <select id="getLossRecord" resultType="com.unis.vis.model.OutboundMaterialInfo">
+        SELECT omi."material_name",oi."outbound_type",sdi.LABEL ,SUM(oi."quantity") ,omi."unit" ,SUM(omi."total_price")
+        FROM
+            "outbound_material_info" omi
+                LEFT JOIN "outbound_info" oi ON oi."outbound_id" = omi."outbound_id"
+                LEFT JOIN "outbound_status" os ON os."outbound_id" = omi."outbound_id"
+                LEFT JOIN SYS_DICT_ITEM sdi ON sdi.ITEM_VALUE = oi."outbound_type"
+        WHERE oi."status" =5 AND omi."is_available" = 0 AND sdi.DICT_TYPE = 'outbound_type'
+        GROUP BY oi."warehouse"
+    </select>
 </mapper>