2,3,5楼仓储看板接口

hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java

@@ -0,0 +1,34 @@
+package com.hw.wms.board.controller;
+
+
+import com.hw.common.core.web.domain.AjaxResult;
+import com.hw.wms.board.service.FifthWmsBorderService;
+import com.hw.wms.board.service.SecondWmsBorderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/FifthWmsBorder")
+public class FifthWmsBorderController {
+    @Autowired
+    private FifthWmsBorderService fifthWmsBorderService;
+
+    /**
+     * 五楼库存数量
+     */
+    @GetMapping("/locationCount")
+    public AjaxResult locationCount(){
+        return AjaxResult.success(fifthWmsBorderService.locationCount());
+    }
+    /**
+     * 库存饼状图
+     */
+    @GetMapping("fifthPanake")
+    public AjaxResult fifthPanake(){
+        return AjaxResult.success(fifthWmsBorderService.fifthPanake());
+    }
+
+
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/SecondWmsBorderController.java

@@ -0,0 +1,64 @@
+package com.hw.wms.board.controller;
+
+
+import com.hw.common.core.web.domain.AjaxResult;
+import com.hw.wms.board.service.SecondWmsBorderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/SecondWmsBorder")
+public class SecondWmsBorderController {
+    @Autowired
+    private SecondWmsBorderService secondWmsBorderService;
+
+    /**
+     * 库存总量统计
+     * @return
+     */
+    @GetMapping("/totalStock")
+    public AjaxResult totalStock(){
+        return AjaxResult.success(secondWmsBorderService.totalStock());
+    }
+    /**
+     * 库位原理统计
+     */
+    @GetMapping("/locationCount")
+    public AjaxResult locationCount(){
+        return AjaxResult.success(secondWmsBorderService.locationCount());
+    }
+    /**
+     * 任务编号
+     */
+    @GetMapping("/tableInfo")
+    public AjaxResult tableInfo(){
+        return AjaxResult.success(secondWmsBorderService.tableInfo());
+    }
+    /**
+     * 库存变化折线图
+     */
+    @GetMapping("/inAndOutStockInfo")
+    public AjaxResult inAndOutStockInfo(){
+        return AjaxResult.success(secondWmsBorderService.inAndOutStockInfo());
+    }
+
+    /**
+     * 入库时段统计
+     * @return
+     */
+    @GetMapping("/instockTimeCount")
+    public AjaxResult instockTimeCount(){
+        return AjaxResult.success(secondWmsBorderService.instockTimeCount());
+    }
+
+    /**
+     * 当日入库量
+     * @return
+     */
+    @GetMapping("/todayInstockAmount")
+    public AjaxResult todayInstockAmount(){
+        return AjaxResult.success(secondWmsBorderService.todayInstockAmount());
+    }
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/ThirdWmsBorderController.java

@@ -0,0 +1,41 @@
+package com.hw.wms.board.controller;
+
+
+import com.hw.common.core.web.domain.AjaxResult;
+import com.hw.wms.board.service.SecondWmsBorderService;
+import com.hw.wms.board.service.ThirdWmsBorderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/ThirdWmsBorder")
+public class ThirdWmsBorderController {
+
+    @Autowired
+    private ThirdWmsBorderService thirdWmsBorderService;
+
+    /**
+     * 单月原材料出入库统计
+     */
+    @GetMapping("/monthRawAmount")
+    public AjaxResult monthRawAmount(){
+        return AjaxResult.success(thirdWmsBorderService.monthRawAmount());
+    }
+    /**
+     * 三楼仓库库位状态
+     */
+    @GetMapping("/locationStatus")
+    public AjaxResult locationStatus(){
+        return AjaxResult.success(thirdWmsBorderService.locationStatus());
+    }
+    /**
+     * 生产计划
+     */
+    @GetMapping("/productPlan")
+    public AjaxResult productPlan(){
+        return AjaxResult.success(thirdWmsBorderService.productPlan());
+    }
+
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/RecordIotenvInstant.java

@@ -0,0 +1,24 @@
+package com.hw.wms.board.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class RecordIotenvInstant {
+    private Long objId;
+    private String monitorId;
+    private BigDecimal tempreture;
+    private BigDecimal humidity;
+    private BigDecimal illuminance;
+    private BigDecimal noise;
+    private BigDecimal concentration;
+    private BigDecimal pm1;
+    private BigDecimal pm2;
+    private BigDecimal pm10;
+    private BigDecimal standBy;
+    private Date collectTime;
+    private Date recodeTime;
+
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java

@@ -0,0 +1,18 @@
+package com.hw.wms.board.service;
+
+
+import com.hw.wms.domain.WmsProductInstock;
+import com.hw.wms.domain.WmsProductOutstockDetail;
+import com.hw.wms.domain.WmsProductStock;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+public interface FifthWmsBorderService {
+
+
+    Map locationCount();
+
+    Map fifthPanake();
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/SecondWmsBorderService.java

@@ -0,0 +1,26 @@
+package com.hw.wms.board.service;
+
+
+import com.hw.wms.domain.WmsProductInstock;
+import com.hw.wms.domain.WmsProductOutstock;
+import com.hw.wms.domain.WmsProductOutstockDetail;
+import com.hw.wms.domain.WmsProductStock;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+public interface SecondWmsBorderService {
+
+    List<WmsProductStock> totalStock();
+
+    Map<String, BigDecimal> locationCount();
+
+    List<WmsProductOutstockDetail> tableInfo();
+
+    List<WmsProductInstock> inAndOutStockInfo();
+
+    Map<String,Integer> instockTimeCount();
+
+    BigDecimal todayInstockAmount();
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/ThirdWmsBorderService.java

@@ -0,0 +1,15 @@
+package com.hw.wms.board.service;
+
+import com.hw.wms.domain.WmsBaseLocation;
+import com.hw.wms.domain.WmsRawOutstock;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ThirdWmsBorderService {
+    Map monthRawAmount();
+
+    List<WmsBaseLocation> locationStatus();
+
+    List<WmsRawOutstock> productPlan();
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java

@@ -0,0 +1,71 @@
+package com.hw.wms.board.service.impl;
+
+import com.hw.wms.board.service.FifthWmsBorderService;
+import com.hw.wms.board.service.SecondWmsBorderService;
+import com.hw.wms.domain.*;
+import com.hw.wms.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class FifthWmsBoardServiceImpl implements FifthWmsBorderService {
+    @Autowired
+    private WmsProductStockMapper wmsProductStockMapper;
+    @Autowired
+    private WmsRawInstockMapper wmsRawInstockMapper;
+    @Autowired
+    private WmsRawOutstockMapper wmsRawOutstockMapper;
+    @Autowired
+    private WmsProductInstockMapper wmsProductInstockMapper;
+    @Autowired
+    private WmsProductOutstockMapper wmsProductOutstockMapper;
+    @Autowired
+    private WmsRawStockMapper wmsRawStockMapper;
+    @Autowired
+    private WmsBaseLocationMapper wmsBaseLocationMapper;
+
+
+    @Override
+    public Map locationCount() {
+        HashMap map = new HashMap<>();
+        List<WmsProductInstock> list = wmsRawInstockMapper.locationCount();
+        List<WmsRawOutstock> list1 = wmsRawOutstockMapper.locationCount();
+        List<WmsProductInstock> list2 = wmsProductInstockMapper.locationCount();
+        List<WmsProductOutstock> list3 = wmsProductOutstockMapper.locationCount();
+        for (WmsProductInstock wmsProductInstock : list) {
+            if (wmsProductInstock.getWarehouseId()==511){
+                map.put("rawInStock",wmsProductInstock.getInstockAmount());
+            }
+            if (wmsProductInstock.getWarehouseId()==512){
+                map.put("furawInStock",wmsProductInstock.getInstockAmount());
+            }
+        }
+        map.put("rawOutStock",list1.get(0).getOutstockAmount());
+        map.put("productInStock",list2.get(0).getInstockAmount());
+        map.put("productOutStock",list3.get(0).getOutstockQty());
+        return map;
+    }
+
+    @Override
+    public Map fifthPanake() {
+        List<WmsRawStock> wmsRawStocks = wmsRawStockMapper.selectRawLocationPercentage();
+        List<WmsProductStock> productStocks = wmsProductStockMapper.selectProductStockPercentage();
+        Integer emptyLocationCount = wmsBaseLocationMapper.selectEmptyLocation();
+        Integer allLocation = wmsBaseLocationMapper.selectAllLocation();
+        BigDecimal emptyLocationPercentage = new BigDecimal(emptyLocationCount).divide(new BigDecimal(allLocation), 2, BigDecimal.ROUND_HALF_UP);
+        Integer oppylLocation = allLocation - emptyLocationCount;
+        BigDecimal opplyLocationPercentage = new BigDecimal(oppylLocation).divide(new BigDecimal(allLocation), 2, BigDecimal.ROUND_HALF_UP);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("wmsRawStocks",wmsRawStocks);
+        map.put("productStocks",productStocks);
+        map.put("emptyLocationPercentage",emptyLocationPercentage);
+        map.put("opplyLocationPercentage",opplyLocationPercentage);
+        return map;
+    }
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java

@@ -0,0 +1,79 @@
+package com.hw.wms.board.service.impl;
+
+import com.hw.wms.board.service.SecondWmsBorderService;
+import com.hw.wms.domain.WmsProductInstock;
+import com.hw.wms.domain.WmsProductOutstock;
+import com.hw.wms.domain.WmsProductOutstockDetail;
+import com.hw.wms.domain.WmsProductStock;
+import com.hw.wms.mapper.WmsProductStockMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class SecondWmsBoardServiceImpl implements SecondWmsBorderService {
+    @Autowired
+    private WmsProductStockMapper wmsProductStockMapper;
+
+    @Override
+    public List<WmsProductStock> totalStock() {
+        return wmsProductStockMapper.totalStock();
+    }
+
+    @Override
+    public BigDecimal todayInstockAmount() {
+        BigDecimal result = wmsProductStockMapper.todayInstockAmount();
+        return result;
+    }
+
+    @Override
+    public Map<String, Integer> instockTimeCount() {
+        HashMap<String, Integer> result = new HashMap<>();
+        int oneWeekCount = wmsProductStockMapper.selectOneWeek();
+        int twoWeekCount = wmsProductStockMapper.selectTwoWeek();
+        int oneMonthCount = wmsProductStockMapper.selectOneMonth();
+        int halfYearCount = wmsProductStockMapper.selectHalfYear();
+        result.put("oneWeekCount",oneWeekCount);
+        result.put("twoWeekCount",twoWeekCount);
+        result.put("oneMonthCount",oneMonthCount);
+        result.put("halfYearCount",halfYearCount);
+        return result;
+    }
+
+    @Override
+    public List<WmsProductInstock> inAndOutStockInfo() {
+        List<WmsProductInstock> instocks = wmsProductStockMapper.selectInStock();
+        List<WmsProductOutstock> outstocks = wmsProductStockMapper.selectOutStock();
+        Map<Long,List<WmsProductOutstock>> map = outstocks.stream().collect(Collectors.groupingBy(WmsProductOutstock::getProductId));
+        for (WmsProductInstock instock : instocks) {
+            WmsProductOutstock wmsProductOutstock = map.get(instock.getProductId()).get(0);
+            instock.setOutStockAmount(wmsProductOutstock.getOutstockQty());
+        }
+        return instocks;
+    }
+
+    @Override
+    public List<WmsProductOutstockDetail> tableInfo() {
+        return wmsProductStockMapper.tableInfo();
+    }
+
+    @Override
+    public Map<String, BigDecimal> locationCount() {
+        int availibleLocation = wmsProductStockMapper.selectAvailibleLocation();
+        int toatlLocation = wmsProductStockMapper.selectTotalLocation();
+        int opplyLocation = wmsProductStockMapper.selectOpplyLocation();
+        HashMap<String, BigDecimal> result = new HashMap<>();
+        BigDecimal bigDecimal = new BigDecimal(toatlLocation);
+        BigDecimal availibleRate = new BigDecimal(availibleLocation).divide(bigDecimal, 2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal opplyRate = new BigDecimal(opplyLocation).divide(bigDecimal, 2, BigDecimal.ROUND_HALF_UP);
+        result.put("availibleRate",availibleRate);
+        result.put("opplyRate",opplyRate);
+        return result;
+    }
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java

@@ -0,0 +1,46 @@
+package com.hw.wms.board.service.impl;
+
+import com.hw.wms.board.service.ThirdWmsBorderService;
+import com.hw.wms.domain.WmsBaseLocation;
+import com.hw.wms.domain.WmsRawOutstock;
+import com.hw.wms.mapper.WmsBaseLocationMapper;
+import com.hw.wms.mapper.WmsRawInstockMapper;
+import com.hw.wms.mapper.WmsRawOutstockMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ThirdWmsBorderServiceImpl implements ThirdWmsBorderService {
+    @Autowired
+    private WmsRawInstockMapper wmsRawInstockMapper;
+    @Autowired
+    private WmsRawOutstockMapper wmsRawOutstockMapper;
+    @Autowired
+    private WmsBaseLocationMapper wmsBaseLocationMapper;
+
+    @Override
+    public Map monthRawAmount() {
+        BigDecimal monthRawInAmount = wmsRawInstockMapper.monthRawInAmount();
+        BigDecimal monthRawOutAmount = wmsRawOutstockMapper.monthRawOutAmount();
+        HashMap hashMap = new HashMap();
+        hashMap.put("monthRawInAmount",monthRawInAmount);
+        hashMap.put("monthRawOutAmount",monthRawOutAmount);
+        return hashMap;
+    }
+
+    @Override
+    public List<WmsRawOutstock> productPlan() {
+        return wmsRawOutstockMapper.productPlan();
+
+    }
+
+    @Override
+    public List<WmsBaseLocation> locationStatus() {
+        List<WmsBaseLocation> list = wmsBaseLocationMapper.locationStatus();
+        return list;
+    }
+
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java

@@ -172,6 +172,8 @@ public class WmsProductInstock extends BaseEntity {
     @Excel(name = "同步给ERP的数量")
     private BigDecimal erpAmount;
 
+    private BigDecimal outStockAmount;
+
     /**
      * 成品入库记录明细信息
      */
@@ -189,7 +191,13 @@ public class WmsProductInstock extends BaseEntity {
 
     private String materialSpec;
 
+    public BigDecimal getOutStockAmount() {
+        return outStockAmount;
+    }
 
+    public void setOutStockAmount(BigDecimal outStockAmount) {
+        this.outStockAmount = outStockAmount;
+    }
     public BigDecimal getPrice() {
         return price;
     }

hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java

@@ -92,4 +92,9 @@ public interface WmsBaseLocationMapper
      */
     public int selectCountOfWmsBaseLocation(WmsBaseLocation wmsBaseLocation);
 
+    int selectEmptyLocation();
+
+    int selectAllLocation();
+
+    List<WmsBaseLocation> locationStatus();
 }

hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductInstockMapper.java

@@ -99,4 +99,5 @@ public interface WmsProductInstockMapper
      */
     List<WmsProductInstock> selectWmsProductInstockJoinList(WmsProductInstock wmsProductInstock);
 
+    List<WmsProductInstock> locationCount();
 }

hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java

@@ -141,4 +141,6 @@ public interface WmsProductOutstockMapper
      * @return
      */
     WmsProductOutstock selectGetProductOutstockAuditByProductOutstockId(Long productOutstockId);
+
+    List<WmsProductOutstock> locationCount();
 }

hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockMapper.java

@@ -2,8 +2,8 @@ package com.hw.wms.mapper;
 
 import java.math.BigDecimal;
 import java.util.List;
-import com.hw.wms.domain.WmsProductStock;
+
-import com.hw.wms.domain.WmsRawStock;
+import com.hw.wms.domain.*;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -132,4 +132,29 @@ public interface WmsProductStockMapper
     public List<WmsProductStock> selectWmsProductStocks4Transfer(WmsProductStock wmsProductStock);
 
 
+    List<WmsProductStock> selectProductStockPercentage();
+
+    List<WmsProductStock> totalStock();
+
+    BigDecimal todayInstockAmount();
+
+    int selectOneWeek();
+
+    int selectTwoWeek();
+
+    int selectOneMonth();
+
+    int selectHalfYear();
+
+    List<WmsProductInstock> selectInStock();
+
+    List<WmsProductOutstock> selectOutStock();
+
+    List<WmsProductOutstockDetail> tableInfo();
+
+    int selectAvailibleLocation();
+
+    int selectTotalLocation();
+
+    int selectOpplyLocation();
 }

hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawInstockMapper.java

@@ -1,6 +1,9 @@
 package com.hw.wms.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
+
+import com.hw.wms.domain.WmsProductInstock;
 import com.hw.wms.domain.WmsRawInstock;
 
 /**
@@ -84,4 +87,9 @@ public interface WmsRawInstockMapper
      * @return
      */
     public List<WmsRawInstock> selectWmsRawInstockERPNotSynchronized(WmsRawInstock wmsRawInstock);
+
+    List<WmsProductInstock> locationCount();
+
+
+    BigDecimal monthRawInAmount();
 }

hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawOutstockMapper.java

@@ -1,5 +1,6 @@
 package com.hw.wms.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import com.hw.wms.domain.WmsRawOutstock;
 import com.hw.wms.domain.WmsRawOutstockDetail;
@@ -153,4 +154,10 @@ public interface WmsRawOutstockMapper
      * @return
      */
     List<WmsRawOutstock> selectWmsRawOutstockERPNotSynchronized(WmsRawOutstock rawOutstock);
+
+    List<WmsRawOutstock> locationCount();
+
+    BigDecimal monthRawOutAmount();
+
+    List<WmsRawOutstock> productPlan();
 }

hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawStockMapper.java

@@ -127,4 +127,5 @@ public interface WmsRawStockMapper {
      */
     public List<WmsRawStock> selectAutoOutstockRawStockList(@Param("materialId") Long materialId, @Param("poNo") String poNo);
 
+    List<WmsRawStock> selectRawLocationPercentage();
 }

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml

@@ -299,6 +299,25 @@
         </where>
         order by location_code
     </select>
+    <select id="locationStatus" resultType="com.hw.wms.domain.WmsBaseLocation">
+        select * from wms_base_location
+    </select>
+    <select id="selectEmptyLocation" resultType="java.lang.Integer">
+        select
+            count(1)
+        from
+            `hwjy-cloud`.wms_base_location
+        where
+        warehouse_id = 512 and container_code is null
+    </select>
+    <select id="selectAllLocation" resultType="java.lang.Integer">
+        select
+            count(1)
+        from
+            `hwjy-cloud`.wms_base_location
+        where
+            warehouse_id = 512
+    </select>
 
 
 </mapper>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductInstockMapper.xml

@@ -296,4 +296,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by wpi.apply_date desc
     </select>
+    <select id="locationCount" resultType="com.hw.wms.domain.WmsProductInstock">
+        select
+            warehouse_id warehouse_id ,
+            sum(instock_amount) instock_amount
+        from
+            wms_product_instock
+        where
+            apply_date > now() - interval 1 month
+          and warehouse_id = 531
+    </select>
 </mapper>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml

@@ -398,6 +398,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join mes_base_material_info mbmi on wro.product_id = mbmi.material_id
         where wro.product_outstock_id = #{productOutstockId}
     </select>
+    <select id="locationCount" resultType="com.hw.wms.domain.WmsProductOutstock">
+        select
+            warehouse_id warehouse_id ,
+            sum(outstock_qty) outstock_qty
+        from
+            wms_product_outstock
+        where
+            apply_date > now() - interval 1 month
+          and warehouse_id = 531
+    </select>
 
     <update id="auditWmsProductOutstockByTaskCode" parameterType="WmsProductOutstock">
         update wms_product_outstock

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml

@@ -340,6 +340,68 @@
         </where>
         order by wbl.loc_column asc, wbl.loc_deep desc limit #{params.limit}
     </select>
+    <select id="totalStock" resultType="com.hw.wms.domain.WmsProductStock">
+        SELECT product_id,sum(total_amount) total_amount FROM `hwjy-cloud`.wms_product_stock where warehouse_id = 231 group by product_id
+    </select>
+    <select id="selectAvailibleLocation" resultType="java.lang.Integer">
+        select count(1) FROM `hwjy-cloud`.wms_base_location where container_code is null and location_status =1 and warehouse_id =231
+    </select>
+    <select id="selectTotalLocation" resultType="java.lang.Integer">
+        select count(1) FROM `hwjy-cloud`.wms_base_location where warehouse_id =231
+    </select>
+    <select id="selectOpplyLocation" resultType="java.lang.Integer">
+        select count(1) FROM `hwjy-cloud`.wms_base_location where warehouse_id =231 and container_code is not null
+    </select>
+    <select id="tableInfo" resultType="com.hw.wms.domain.WmsProductOutstockDetail">
+        select * from wms_product_outstock_detail where begin_time > now() - interval 1 month and execute_status = 3 order by begin_time asc
+    </select>
+    <select id="selectInStock" resultType="com.hw.wms.domain.WmsProductInstock">
+        SELECT product_id,sum(instock_amount) instock_amount FROM `hwjy-cloud`.wms_product_instock where begin_time > now() - interval 1 week and warehouse_id = 231 group by product_id
+    </select>
+    <select id="selectOutStock" resultType="com.hw.wms.domain.WmsProductOutstock">
+        select
+            product_id,
+            sum(outstock_qty) outstock_qty
+        from
+            `hwjy-cloud`.wms_product_outstock
+        where
+            begin_time > now() - interval 1 week
+          and warehouse_id = 231
+        group by
+            product_id
+    </select>
+    <select id="selectOneWeek" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_product_stock  where instock_date > now() - interval 1 week
+    </select>
+    <select id="selectTwoWeek" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_product_stock  where instock_date > now() - interval 2 week
+    </select>
+    <select id="selectOneMonth" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_product_stock  where instock_date > now() - interval 1 month
+    </select>
+    <select id="selectHalfYear" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_product_stock  where instock_date > now() - interval 6 month
+    </select>
+    <select id="todayInstockAmount" resultType="java.math.BigDecimal">
+        select
+            *
+        from
+            `hwjy-cloud`.wms_product_instock
+        where
+            warehouse_id = 231
+          and date_format(end_time, '%Y-%m-%D') = curdate()
+    </select>
+    <select id="selectProductStockPercentage" resultType="com.hw.wms.domain.WmsProductStock">
+        select
+            product_id ,
+            sum(total_amount) total_amount
+        from
+            `hwjy-cloud`.wms_product_stock
+        where
+            warehouse_id = 531
+        group by
+            product_id
+    </select>
 
 
     <!--select id="selectWmsProductStocksBySaleorder" parameterType="WmsProductStock" resultMap="WmsProductStockResult">

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml

@@ -233,6 +233,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and wri.purchase_order_id is not null and wri.purchase_order_id !=0
           and mbmi.material_classfication = '1'
     </select>
+    <select id="monthRawInAmount" resultType="java.math.BigDecimal">
+        select sum(instock_amount) inStock from wms_raw_instock  where  DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+    </select>
+    <select id="locationStatus" resultType="com.hw.wms.domain.WmsBaseLocation">
+        select * from wms_base_location
+    </select>
+    <select id="locationCount" resultType="com.hw.wms.domain.WmsProductInstock">
+        select
+            warehouse_id warehouse_id,
+            sum(instock_amount) instock_amount
+        from
+            wms_raw_instock
+        where
+            apply_date > now() - interval 1 month
+          and (warehouse_id = 511
+           or warehouse_id = 512)
+        group by
+            warehouse_id
+    </select>
 
 
 </mapper>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml

@@ -388,5 +388,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
 
     </select>
+    <select id="monthRawOutAmount" resultType="java.math.BigDecimal">
+        select
+            sum(real_outstock_amount) outStock
+        from
+            wms_raw_outstock
+        where
+            DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+    </select>
+    <select id="productPlan" resultType="com.hw.wms.domain.WmsRawOutstock">
+        select * from wms_raw_outstock where warehouse_id = 311 order by apply_date desc limit 100
+    </select>
+    <select id="locationCount" resultType="com.hw.wms.domain.WmsRawOutstock">
+        select
+            warehouse_id warehouse_id ,
+            sum(real_outstock_amount) real_outstock_amount
+        from
+            wms_raw_outstock
+        where
+            apply_date > now() - interval 1 month
+          and warehouse_id = 512
+    </select>
 
 </mapper>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml

@@ -372,6 +372,17 @@
         select wrs.raw_stock_id,wrs.warehouse_id,wrs.sale_order_id,wrs.material_id,wrs.instock_batch,wrs.total_amount from wms_raw_stock wrs where wrs.material_id=#{materialId}
         and exists (select 1 from mes_base_barcode_info mbbi where wrs.instock_batch = mbbi.barcode_info and mbbi.po_no=#{poNo} )
     </select>
+    <select id="selectRawLocationPercentage" resultType="com.hw.wms.domain.WmsRawStock">
+        select
+            material_id,
+            sum(total_amount) total_amount
+        from
+            `hwjy-cloud`.wms_raw_stock
+        where
+            warehouse_id = 511
+        group by
+            material_id
+    </select>
 
 
 </mapper>