Merge branch 'dev' into feature/dev-0729

# Conflicts:
#	mhd_bms/src/main/resources/bootstrap.yml

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/statementStatistics/ImmediateInventoryDTO.java

@@ -45,6 +45,10 @@ public class ImmediateInventoryDTO {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
     @ApiModelProperty("仓库id")
     @Excel(name = "仓库id")
     private Long warehouseId;

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/statementStatistics/StatementStatisticsApi.java

@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -48,13 +50,14 @@ public class StatementStatisticsApi {
      */
     @ApiOperation("查询即时库存列表")
     @GetMapping("/queryImmediateInventoryList")
-    public TableDataInfo queryImmediateInventoryList(ImmediateInventoryDTO immediateInventoryDTO)
+    public HashMap<String, Object> queryImmediateInventoryList(ImmediateInventoryDTO immediateInventoryDTO)
     {
         //转换实体
         ImmediateInventoryDO immediateInventoryDO = immediateInventoryAssembler.toDO(immediateInventoryDTO);
         startPage();
         List<ImmediateInventoryPO> list = statementStatisticsService.queryImmediateInventoryList(immediateInventoryDO);
-        return getDataTable(list);
+        BigDecimal bigDecimal = statementStatisticsService.sumImmediateInventoryQuantity(immediateInventoryDO);
+        return getDataTableWarehouse(list,bigDecimal);
     }
     /**
      * 分页查询入库日报表列表
@@ -129,4 +132,18 @@ public class StatementStatisticsApi {
         rspData.setTotal(new PageInfo(list).getTotal());
         return rspData;
     }
+
+    /**
+     * 响应请求分页、仓库数量 数据
+     */
+    protected HashMap<String, Object> getDataTableWarehouse(List<?> list,BigDecimal bigDecimal)
+    {
+        HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+        stringObjectHashMap.put("data",list);
+        stringObjectHashMap.put("total",new PageInfo(list).getTotal());
+        stringObjectHashMap.put("code",HttpStatus.SUCCESS);
+        stringObjectHashMap.put("msg","查询成功");
+        stringObjectHashMap.put("totalInventoryQuantity",bigDecimal);
+        return stringObjectHashMap;
+    }
 }