一，四，五楼仓储和生产的看板

hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java

@@ -28,5 +28,27 @@ public class FifthMesBorderController {
     public AjaxResult workOrderProgress(){
         return AjaxResult.success(fifthMesBorderService.workOrderProgress());
     }
+    /**
+     * 生产合格
+     */
+    @GetMapping("/productionQualified")
+    public AjaxResult productionQualified(){
+        return AjaxResult.success(fifthMesBorderService.productionQualified());
+    }
+
+    /**
+     * 工单生产时长
+     */
+    @GetMapping("/orderTime")
+    public AjaxResult orderTime(){
+        return AjaxResult.success(fifthMesBorderService.orderTime());
+    }
+    /**
+     * 工位生产效率
+     */
+    @GetMapping("/orderEfficiency")
+    public AjaxResult orderEfficiency(){
+        return AjaxResult.success(fifthMesBorderService.orderEfficiency());
+    }
 
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/ThirdMesBorderController.java

@@ -59,4 +59,13 @@ public class ThirdMesBorderController {
         return AjaxResult.success(thirdMesBorderService.rawInstock());
     }
 
+    /**
+     * 获取三楼风机状态
+     * @return
+     */
+    @GetMapping("/getLineStatus")
+    public AjaxResult getLineStatus(){
+        return AjaxResult.success(thirdMesBorderService.getLineStatus());
+    }
+
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/FifthMesBorderService.java

@@ -1,7 +1,9 @@
 package com.hw.mes.board.service;
 
 
+import com.hw.mes.domain.MesProduceStatisticsDetail;
 import com.hw.mes.domain.MesProductOrder;
+import com.hw.mes.domain.MesProductionQualified;
 
 import java.util.List;
 import java.util.Map;
@@ -11,4 +13,10 @@ public interface FifthMesBorderService {
     MesProductOrder productProgress();
 
     List<MesProductOrder> workOrderProgress();
+
+    List<MesProductionQualified> productionQualified();
+
+    List<MesProduceStatisticsDetail> orderTime();
+
+    List<MesProduceStatisticsDetail> orderEfficiency();
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/SecondMesBorderService.java

@@ -16,7 +16,7 @@ public interface SecondMesBorderService {
 
     MesProductOrder selectLatestWorkOrder();
 
-    Boolean getLineStatus();
+    String getLineStatus();
 
     List<Map<Date, BigDecimal>> getHourProduction();
 

hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java

@@ -19,4 +19,6 @@ public interface ThirdMesBorderService{
     List<RawAmount>  productCompleteCount();
 
     List<RawAmount> rawInstock();
+
+    String getLineStatus();
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/FifthMesBoardServiceImpl.java

@@ -2,8 +2,11 @@ package com.hw.mes.board.service.impl;
 
 
 import com.hw.mes.board.service.FifthMesBorderService;
+import com.hw.mes.domain.MesProduceStatisticsDetail;
 import com.hw.mes.domain.MesProductOrder;
+import com.hw.mes.domain.MesProductionQualified;
 import com.hw.mes.mapper.MesProductOrderMapper;
+import com.hw.mes.mapper.MesProductionQualifiedDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +17,8 @@ import java.util.List;
 public class FifthMesBoardServiceImpl implements FifthMesBorderService {
     @Autowired
     private MesProductOrderMapper mesProductOrderMapper;
+    @Autowired
+    private MesProductionQualifiedDao mesProductionQualifiedDao;
 
     @Override
     public MesProductOrder productProgress() {
@@ -24,4 +29,19 @@ public class FifthMesBoardServiceImpl implements FifthMesBorderService {
     public List<MesProductOrder> workOrderProgress() {
         return mesProductOrderMapper.selectFifthWorkorder();
     }
+
+    @Override
+    public List<MesProductionQualified> productionQualified() {
+        return mesProductionQualifiedDao.productionQualified();
+    }
+
+    @Override
+    public List<MesProduceStatisticsDetail> orderEfficiency() {
+        return mesProductOrderMapper.orderEfficiency();
+    }
+
+    @Override
+    public List<MesProduceStatisticsDetail> orderTime() {
+        return mesProductOrderMapper.orderTime();
+    }
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/SecondMesBoardServiceImpl.java

@@ -29,7 +29,7 @@ public class SecondMesBoardServiceImpl implements SecondMesBorderService {
     }
 
     @Override
-    public Boolean getLineStatus() {
+    public String getLineStatus() {
         return mesProductOrderMapper.getLineStatus();
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java

@@ -46,6 +46,11 @@ public class ThirdMesBorderServiceImpl implements ThirdMesBorderService {
 
     }
 
+    @Override
+    public String getLineStatus() {
+        return mesProductOrderMapper.getLineThirdStatus();
+    }
+
     @Override
     public List<RawAmount> rawInstock() {
         List<RawAmount> list = mesProductOrderMapper.rawInstock();

hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import com.hw.mes.board.domain.DmsRealtimeStatusHistory;
 import com.hw.mes.board.domain.RawAmount;
 import com.hw.mes.board.domain.RecordIotenvInstant;
+import com.hw.mes.domain.MesProduceStatisticsDetail;
 import com.hw.mes.domain.MesProductOrder;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -20,6 +21,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface MesProductOrderMapper
 {
+    List<MesProduceStatisticsDetail> orderEfficiency();
+
     /**
      * 查询生产工单
      *
@@ -97,7 +100,7 @@ public interface MesProductOrderMapper
 
     MesProductOrder selectLatestWorkOrder();
 
-    Boolean getLineStatus();
+    String getLineStatus();
 
     List<Map<Date, BigDecimal>> getHourProduction();
 
@@ -122,4 +125,8 @@ public interface MesProductOrderMapper
     List<Map<String, Object>> productAmount();
 
     List<MesProductOrder> thirdOrderPlan();
+
+    List<MesProduceStatisticsDetail> orderTime();
+
+    String getLineThirdStatus();
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java

@@ -1,6 +1,7 @@
 package com.hw.mes.mapper;
 
 import com.hw.mes.domain.MesProductionQualified;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 
@@ -12,7 +13,9 @@ import java.util.List;
  * @author makejava
  * @since 2024-11-25 11:14:21
  */
+@Mapper
 public interface MesProductionQualifiedDao {
+    List<MesProductionQualified> productionQualified();
 
     /**
      * 通过ID查询单条数据

hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml

@@ -395,7 +395,7 @@
         FROM mes_product_order
         WHERE plan_begin_time = (select max(plan_begin_time) FROM mes_product_order) order by product_order_id desc limit 1
     </select>
-    <select id="getLineStatus" resultType="java.lang.Boolean">
+    <select id="getLineStatus" resultType="java.lang.String">
         SELECT x.status_value FROM `hwjy-cloud`.dms_realtime_status x where x.status_name = '烘干机风机状态'
     </select>
     <select id="getHourProduction" resultType="java.util.Map">
@@ -405,7 +405,7 @@
         from
             wms_product_instock
         where
-            begin_time > now() -interval 6 hour and warehouse_id = 231
+            begin_time > now() -interval 24 hour and warehouse_id = 231
         group by hour order by hour asc
     </select>
     <select id="getDayProduction" resultType="java.util.Map">
@@ -423,7 +423,7 @@
     </select>
     <select id="deviceTimeCount" resultType="com.hw.mes.board.domain.DmsRealtimeStatusHistory">
         select
-            DATE_FORMAT(sync_time , '%Y-%m-%d %H:00:00') hour,count(1)*10 timeCount
+            DATE_FORMAT(sync_time , '%Y-%m-%d %H:00:00') hour,count(1) timeCount
         from
             dms_realtime_status_history
         where
@@ -503,6 +503,40 @@
     <select id="thirdOrderPlan" resultType="com.hw.mes.domain.MesProductOrder">
         SELECT x.* FROM `hwjy-cloud`.mes_product_order x where x.plan_begin_time > now() - interval 1 month order by plan_begin_time asc
     </select>
+    <select id="orderTime" resultType="com.hw.mes.domain.MesProduceStatisticsDetail">
+        select
+            a.product_order_id,
+            a.process_id,
+            sum(a.produce_time) produce_time,b.process_name,a.real_begin_time ,a.real_end_time
+        from
+            mes_produce_statistics_detail a left join mes_base_process_info b on a.process_id = b.process_id
+        where
+                a.product_order_id in (
+                select
+                    product_order_id
+                from
+                    mes_produce_statistics_detail
+                where
+                        real_begin_time =
+                        (
+                            select
+                                max(real_begin_time) real_begin_time
+                            from  mes_produce_statistics_detail) group by product_order_id) group by a.real_begin_time ,a.real_end_time,a.process_id ,a.product_order_id
+    </select>
+    <select id="orderEfficiency" resultType="com.hw.mes.domain.MesProduceStatisticsDetail">
+        select
+            a.plan_code ,
+            a.product_order_id,
+            a.process_id,
+            ifnull(sum(timediff(a.plan_end_time, a.plan_begin_time)),0) / sum(a.produce_time) efficiency,b.process_name
+        from
+            mes_produce_statistics_detail a join mes_base_process_info b on a.process_id = b.process_id
+        where
+            a.real_begin_time > now() - interval 1 month and a.dispatch_id = 4 group by a.process_id ,a.product_order_id,a.plan_code
+    </select>
+    <select id="getLineThirdStatus" resultType="java.lang.String">
+        SELECT x.status_value FROM `hwjy-cloud`.dms_realtime_status x where x.status_name = '烘干机螺旋状态'
+    </select>
     <!--查询24小时内每小时的最新一条数据-->
 <!--    SELECT-->
 <!--    mes_product_order.*-->

hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             parameterType="java.lang.Long">
         select * from mes_production_qualified where qualified_id = #{qualifiedId}
     </select>
+    <select id="productionQualified" resultType="com.hw.mes.domain.MesProductionQualified">
+        SELECT x.* FROM `hwjy-cloud`.mes_production_qualified x where DATE(X.create_time) = curdate()
+    </select>
 
     <insert id="insertMesAlarmInfo" parameterType="MesAlarmInfo" useGeneratedKeys="true" keyProperty="alarmInfoId">
         insert into mes_alarm_info

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

@@ -0,0 +1,51 @@
+package com.hw.wms.board.controller;
+
+import com.hw.common.core.web.domain.AjaxResult;
+import com.hw.wms.board.service.FirstWmsBorderService;
+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("FirstWmsBorder")
+public class FirstWmsBorderController {
+    @Autowired
+    private FirstWmsBorderService firstWmsBorderService;
+    /**
+     * 当日出、入库详情
+     */
+    @GetMapping("/inAndOutInfo")
+    public AjaxResult inAndOutInfo(){
+        return AjaxResult.success(firstWmsBorderService.inAndOutInfo());
+    }
+    /**
+     * 原材料库存占比
+     */
+    @GetMapping("stockPercentage")
+    public AjaxResult stockPercentage(){
+        return AjaxResult.success(firstWmsBorderService.stockPercentage());
+    }
+    /**
+     * 采购订单
+     */
+    @GetMapping("purchaseInfo")
+    public AjaxResult purchaseInfo(){
+        return AjaxResult.success(firstWmsBorderService.purchaseInfo());
+    }
+    /**
+     * 生产订单物料需求
+     */
+    @GetMapping("/bomInfo")
+    public AjaxResult bomInfo(){
+        return AjaxResult.success(firstWmsBorderService.bomInfo());
+    }
+    /**
+     * 成品出入库
+     */
+    @GetMapping("/productInAndOutInfo")
+    public AjaxResult productInAndOutInfo(){
+        return AjaxResult.success(firstWmsBorderService.productInAndOutInfo());
+    }
+
+}

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

@@ -0,0 +1,52 @@
+package com.hw.wms.board.controller;
+
+import com.hw.common.core.web.domain.AjaxResult;
+import com.hw.wms.board.service.FirstWmsBorderService;
+import com.hw.wms.board.service.FourthWmsBorderService;
+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("FourthWmsBorder")
+public class FourthWmsBorderController {
+    @Autowired
+    private FourthWmsBorderService fouthWmsBorderService;
+    /**
+     * 当日原材料出、入库详情
+     */
+    @GetMapping("/inAndOutInfo")
+    public AjaxResult inAndOutInfo(){
+        return AjaxResult.success(fouthWmsBorderService.inAndOutInfo());
+    }
+    /**
+     * 原材料库存占比
+     */
+    @GetMapping("stockPercentage")
+    public AjaxResult stockPercentage(){
+        return AjaxResult.success(fouthWmsBorderService.stockPercentage());
+    }
+    /**
+     * 成品出入库
+     */
+    @GetMapping("/productInAndOutInfo")
+    public AjaxResult productInAndOutInfo(){
+        return AjaxResult.success(fouthWmsBorderService.productInAndOutInfo());
+    }
+    /**
+     * 采购订单
+     */
+    @GetMapping("purchaseInfo")
+    public AjaxResult purchaseInfo(){
+        return AjaxResult.success(fouthWmsBorderService.purchaseInfo());
+    }
+    /**
+     * 生产订单物料需求
+     */
+    @GetMapping("/bomInfo")
+    public AjaxResult bomInfo(){
+        return AjaxResult.success(fouthWmsBorderService.bomInfo());
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.hw.wms.board.service;
+
+
+import com.hw.wms.domain.MesProductOrder;
+import com.hw.wms.domain.WmsBaseLocation;
+import com.hw.wms.domain.WmsProductInstock;
+import com.hw.wms.domain.WmsRawInstock;
+
+import java.util.List;
+import java.util.Map;
+
+public interface FirstWmsBorderService {
+
+
+    Map inAndOutInfo();
+
+    Map stockPercentage();
+
+    List<WmsRawInstock> purchaseInfo();
+
+    List<MesProductOrder> bomInfo();
+
+    List<WmsProductInstock> productInAndOutInfo();
+}

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

@@ -0,0 +1,23 @@
+package com.hw.wms.board.service;
+
+
+import com.hw.wms.domain.MesProductOrder;
+import com.hw.wms.domain.WmsProductInstock;
+import com.hw.wms.domain.WmsRawInstock;
+
+import java.util.List;
+import java.util.Map;
+
+public interface FourthWmsBorderService {
+
+
+    Map inAndOutInfo();
+
+    Map stockPercentage();
+
+    List<WmsProductInstock> productInAndOutInfo();
+
+    List<WmsRawInstock> purchaseInfo();
+
+    List<MesProductOrder> bomInfo();
+}

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

@@ -22,5 +22,5 @@ public interface SecondWmsBorderService {
 
     Map<String,Integer> instockTimeCount();
 
-    BigDecimal todayInstockAmount();
+    Map<String, BigDecimal> todayInstockAmount();
 }

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

@@ -0,0 +1,74 @@
+package com.hw.wms.board.service.impl;
+
+import com.hw.wms.board.service.FifthWmsBorderService;
+import com.hw.wms.board.service.FirstWmsBorderService;
+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;
+
+@Service
+public class FirstWmsBoardServiceImpl implements FirstWmsBorderService {
+    @Autowired
+    private WmsRawOutstockMapper wmsRawOutstockMapper;
+    @Autowired
+    private WmsRawInstockMapper wmsRawInstockMapper;
+    @Autowired
+    private WmsBaseLocationMapper wmsBaseLocationMapper;
+    @Autowired
+    private WmsProductInstockMapper wmsProductInstockMapper;
+    @Override
+    public Map inAndOutInfo() {
+        List<WmsRawOutstock> rawOutstocks = wmsRawOutstockMapper.selectInAndOutInfo();
+        List<WmsRawOutstock> inStocks = wmsRawInstockMapper.selectInAndOutInfo();
+        HashMap<String, List<WmsRawOutstock>> map = new HashMap<>();
+        map.put("rawOutstocks",rawOutstocks);
+        map.put("inStocks",inStocks);
+        return map;
+    }
+
+    @Override
+    public Map stockPercentage() {
+        int stockAmount = wmsBaseLocationMapper.stockAmount();
+        int nostockAmount = wmsBaseLocationMapper.nostockAmount();
+        int productstockAmount = wmsBaseLocationMapper.productstockAmount();
+        int noProductstockAmount = wmsBaseLocationMapper.noProductstockAmount();
+        HashMap<String, Integer> map = new HashMap<>();
+        map.put("stockAmount",stockAmount);
+        map.put("nostockAmount",nostockAmount);
+        map.put("productstockAmount",productstockAmount);
+        map.put("noProductstockAmount",noProductstockAmount);
+        return map;
+
+    }
+
+    @Override
+    public List<WmsProductInstock> productInAndOutInfo() {
+        List<WmsProductInstock> instocks = wmsProductInstockMapper.productFirstInInfo();
+        List<WmsProductInstock> outstocks = wmsRawOutstockMapper.productFirstOutInfo();
+        for (WmsProductInstock instock : instocks) {
+            for (WmsProductInstock outstock : outstocks) {
+                if (instock.getDay().equals(outstock.getDay())){
+                    instock.setOutStockAmount(outstock.getInstockAmount());
+                }
+            }
+        }
+        return instocks;
+    }
+
+    @Override
+    public List<MesProductOrder> bomInfo() {
+        return wmsRawInstockMapper.bomInfo(1);
+
+    }
+
+    @Override
+    public List<WmsRawInstock> purchaseInfo() {
+        return wmsRawInstockMapper.purchaseInfo();
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.hw.wms.board.service.impl;
+
+import com.hw.wms.board.service.FirstWmsBorderService;
+import com.hw.wms.board.service.FourthWmsBorderService;
+import com.hw.wms.domain.MesProductOrder;
+import com.hw.wms.domain.WmsProductInstock;
+import com.hw.wms.domain.WmsRawInstock;
+import com.hw.wms.domain.WmsRawOutstock;
+import com.hw.wms.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class FouthWmsBoardServiceImpl implements FourthWmsBorderService {
+    @Autowired
+    private WmsRawOutstockMapper wmsRawOutstockMapper;
+    @Autowired
+    private WmsRawInstockMapper wmsRawInstockMapper;
+    @Autowired
+    private WmsBaseLocationMapper wmsBaseLocationMapper;
+    @Autowired
+    private WmsProductInstockMapper wmsProductInstockMapper;
+    @Autowired
+    private WmsProductOutstockMapper wmsProductOutstockMapper;
+
+    @Override
+    public Map inAndOutInfo() {
+        List<WmsRawOutstock> rawOutstock = wmsRawOutstockMapper.fourthOutstockList();
+        List<WmsRawOutstock> inStocks = wmsRawInstockMapper.fourthInstockList();
+        HashMap<String, List<WmsRawOutstock>> map = new HashMap<>();
+        map.put("rawOutstock",rawOutstock);
+        map.put("inStocks",inStocks);
+        return map;
+    }
+
+    @Override
+    public Map stockPercentage() {
+        Integer stockAmount = wmsBaseLocationMapper.selectFourthLocation();
+        Integer nostockAmount = wmsBaseLocationMapper.selectFourthNostockLocation();
+        Integer fustockLocation = wmsBaseLocationMapper.selectFourthFustockLocation();
+        Integer noFustockLocation = wmsBaseLocationMapper.selectFourthNoFustockLocation();
+        HashMap<String, Integer> map = new HashMap<>();
+        map.put("stockAmount",stockAmount);
+        map.put("nostockAmount",nostockAmount);
+        map.put("fustockLocation",fustockLocation);
+        map.put("noFustockLocation",noFustockLocation);
+        return map;
+    }
+
+    @Override
+    public List<MesProductOrder> bomInfo() {
+        return wmsRawInstockMapper.bomInfo(3);
+    }
+
+    @Override
+    public List<WmsRawInstock> purchaseInfo() {
+        return wmsRawInstockMapper.purchaseFirstInfo();
+    }
+
+    @Override
+    public List<WmsProductInstock> productInAndOutInfo() {
+        List<WmsProductInstock> instocks = wmsProductInstockMapper.productInInfo();
+        List<WmsProductInstock> outstocks = wmsRawOutstockMapper.productOutInfo();
+        for (WmsProductInstock instock : instocks) {
+            for (WmsProductInstock outstock : outstocks) {
+                if (instock.getDay().equals(outstock.getDay())){
+                    instock.setOutStockAmount(outstock.getInstockAmount());
+                }
+            }
+        }
+        return instocks;
+    }
+}

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

@@ -5,6 +5,8 @@ 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.WmsProductInstockMapper;
+import com.hw.wms.mapper.WmsProductOutstockMapper;
 import com.hw.wms.mapper.WmsProductStockMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,8 @@ import java.util.stream.Collectors;
 public class SecondWmsBoardServiceImpl implements SecondWmsBorderService {
     @Autowired
     private WmsProductStockMapper wmsProductStockMapper;
+    @Autowired
+    private WmsProductOutstockMapper wmsProductOutstockMapper;
 
     @Override
     public List<WmsProductStock> totalStock() {
@@ -27,9 +31,17 @@ public class SecondWmsBoardServiceImpl implements SecondWmsBorderService {
     }
 
     @Override
-    public BigDecimal todayInstockAmount() {
-        BigDecimal result = wmsProductStockMapper.todayInstockAmount();
-        return result;
+    public Map<String, BigDecimal> todayInstockAmount() {
+        BigDecimal dayInstockAmount = wmsProductStockMapper.todayInstockAmount();
+        BigDecimal dayOutstockAmount = wmsProductOutstockMapper.todayOutstockAmount();
+        BigDecimal monthInstockAmount = wmsProductStockMapper.monthInstockAmount();
+        BigDecimal monthOutstockAmount = wmsProductOutstockMapper.monthOutstockAmount();
+        HashMap<String, BigDecimal> map = new HashMap<>();
+        map.put("dayInstockAmount",dayInstockAmount);
+        map.put("dayOutstockAmount",dayOutstockAmount);
+        map.put("monthInstockAmount",monthInstockAmount);
+        map.put("monthOutstockAmount",monthOutstockAmount);
+        return map;
     }
 
     @Override

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

@@ -27,9 +27,13 @@ public class ThirdWmsBorderServiceImpl implements ThirdWmsBorderService {
     public Map monthRawAmount() {
         BigDecimal monthRawInAmount = wmsRawInstockMapper.monthRawInAmount();
         BigDecimal monthRawOutAmount = wmsRawOutstockMapper.monthRawOutAmount();
+        BigDecimal dayRawInAmount = wmsRawInstockMapper.dayRawInAmount();
+        BigDecimal dayRawOutAmount = wmsRawOutstockMapper.dayRawOutAmount();
         HashMap hashMap = new HashMap();
         hashMap.put("monthRawInAmount",monthRawInAmount);
         hashMap.put("monthRawOutAmount",monthRawOutAmount);
+        hashMap.put("dayRawInAmount",dayRawInAmount);
+        hashMap.put("dayRawOutAmount",dayRawOutAmount);
         return hashMap;
     }
 

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

@@ -0,0 +1,609 @@
+package com.hw.wms.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hw.common.core.annotation.Excel;
+import com.hw.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 生产工单对象 mes_product_order
+ *
+ * @author Yinq
+ * @date 2024-02-20
+ */
+public class MesProductOrder extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    private Long productOrderId;
+
+    /**
+     * 工单编号
+     */
+    @Excel(name = "工单编号")
+    private String orderCode;
+
+    /**
+     * 销售订单ID,关联mes_sale_order的order_id;一个销售订单可以有多个生产工单
+     */
+    @Excel(name = "销售订单ID")
+    private Long saleOrderId;
+
+    /**
+     * 销售订单编号
+     */
+    @Excel(name = "销售订单编号")
+    private String saleorderCode;
+
+    /**
+     * 销售订单行号
+     */
+    @Excel(name = "销售订单行号")
+    private String saleorderLinenumber;
+
+    /**
+     * 项目编号
+     */
+    @Excel(name = "项目编号")
+    private String projectNo;
+
+    /**
+     * 销售类型
+     */
+    @Excel(name = "销售类型（1外部销售 2对内生产 3集装箱生产)")
+    private String saleType;
+
+    /**
+     * 物料ID,关联mes_base_material_info的material_id;成品信息
+     */
+    @Excel(name = "物料ID")
+    private Long materialId;
+
+    /**
+     * 物料bomID，关联mes_material_bom的material_bom_id;默认选择最新的正常状态的bom，可修改
+     */
+    @Excel(name = "物料bomID")
+    private Long materialBomId;
+
+    /**对内生产生产的实际物料信息*/
+    private Long produceMaterialId;
+
+    /**
+     * BOM说明
+     */
+    @Excel(name = "BOM说明")
+    private String materialBomDesc;
+
+    /**
+     * 派工类型(1产线 2工艺路线)
+     */
+    @Excel(name = "派工类型")
+    private String dispatchType;
+
+    /**
+     * 派工ID（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）
+     */
+    @Excel(name = "派工ID")
+    private Long dispatchId;
+
+
+    /**
+     * 柜体渠道
+     */
+    private String cabinetChannel;
+
+
+    /**
+     * 销售数量;销售订单的销售数量
+     */
+    @Excel(name = "销售数量")
+    private BigDecimal saleAmount;
+
+    /**
+     * 计划数量
+     */
+    @Excel(name = "计划数量")
+    private BigDecimal planAmount;
+
+    /**
+     * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的
+     */
+    @Excel(name = "已派工数量")
+    private BigDecimal dispatchAmount;
+
+    /**
+     * 完成数量
+     */
+    @Excel(name = "完成数量")
+    private BigDecimal completeAmount;
+
+    /**
+     * 发布时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date releaseTime;
+
+    /**
+     * 计划开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date planBeginTime;
+
+    /**
+     * 计划结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date planEndTime;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date realBeginTime;
+
+    /**
+     * 完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date realEndTime;
+
+    /**
+     * 计划交货日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "计划交货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date planDeliveryDate;
+
+    /**
+     * 工单状态：0-待发布；1-已发布；2-已完成；3-已开始；4-暂停；8-已撤回；9-已删除
+     */
+    @Excel(name = "工单状态")
+    private String orderStatus;
+
+    /**
+     * 库存锁定标识：1-是；0-否
+     */
+    @Excel(name = "库存锁定标识")
+    private String stockLockFlag;
+
+    /**
+     * 是否销售订单创建生产工单（1=是;0=否）
+     */
+    private String saleOrderFlag;
+
+    /**
+     * 工艺路线名称
+     */
+    @Excel(name = "工艺路线名称")
+    private String dispatchName;
+
+    /**
+     * 成品编号
+     */
+    @Excel(name = "成品编号")
+    private String materialCode;
+
+    /**
+     * 成品名称
+     */
+    @Excel(name = "成品名称")
+    private String materialName;
+
+    /**
+     * 成品规格
+     */
+    private String materialSpec;
+
+    /**
+     * 生产物料编号
+     */
+    private String produceMaterialCode;
+
+    /**
+     * 生产物料名称
+     */
+    private String produceMaterialName;
+
+    /**
+     * 生产物料规格
+     */
+    private String produceMaterialSpec;
+
+    /**
+     * 单位时间
+     */
+    @Excel(name = "单位时间")
+    private Long productionTime;
+
+    /**
+     * 前置生产工单ID
+     */
+    @Excel(name = "前置生产工单ID")
+    private Long preOrderId;
+
+    /**
+     * 前置生产工单编号
+     */
+    @Excel(name = "前置生产工单编号")
+    private String preOrderCode;
+
+    /** MesProductPlan主键标识 */
+    private Long planId;
+
+    /**
+     * MesProductPlan计划编号
+     */
+    private String planCode;
+
+    /**
+     * 时间范围-计划开始结束时间
+     */
+    private List<String> planDateRange;
+
+    public List<String> getPlanDateRange() {
+        return planDateRange;
+    }
+
+    public void setPlanDateRange(List<String> planDateRange) {
+        this.planDateRange = planDateRange;
+    }
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public String getPlanCode() {
+        return planCode;
+    }
+
+    public void setPlanCode(String planCode) {
+        this.planCode = planCode;
+    }
+
+    public String getPreOrderCode() {
+        return preOrderCode;
+    }
+
+    public void setPreOrderCode(String preOrderCode) {
+        this.preOrderCode = preOrderCode;
+    }
+
+    public Long getPreOrderId() {
+        return preOrderId;
+    }
+
+    public void setPreOrderId(Long preOrderId) {
+        this.preOrderId = preOrderId;
+    }
+
+    public Long getProductionTime() {
+        return productionTime;
+    }
+
+    public void setProductionTime(Long productionTime) {
+        this.productionTime = productionTime;
+    }
+
+    public String getMaterialBomDesc() {
+        return materialBomDesc;
+    }
+
+    public void setMaterialBomDesc(String materialBomDesc) {
+        this.materialBomDesc = materialBomDesc;
+    }
+
+    public String getDispatchName() {
+        return dispatchName;
+    }
+
+    public void setDispatchName(String dispatchName) {
+        this.dispatchName = dispatchName;
+    }
+
+
+
+    public Date getPlanDeliveryDate() {
+        return planDeliveryDate;
+    }
+
+    public void setPlanDeliveryDate(Date planDeliveryDate) {
+        this.planDeliveryDate = planDeliveryDate;
+    }
+
+    public String getSaleOrderFlag() {
+        return saleOrderFlag;
+    }
+
+    public void setSaleOrderFlag(String saleOrderFlag) {
+        this.saleOrderFlag = saleOrderFlag;
+    }
+
+    public void setProductOrderId(Long productOrderId) {
+        this.productOrderId = productOrderId;
+    }
+
+    public Long getProductOrderId() {
+        return productOrderId;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setSaleOrderId(Long saleOrderId) {
+        this.saleOrderId = saleOrderId;
+    }
+
+    public Long getSaleOrderId() {
+        return saleOrderId;
+    }
+
+    public void setSaleorderCode(String saleorderCode) {
+        this.saleorderCode = saleorderCode;
+    }
+
+    public String getSaleorderCode() {
+        return saleorderCode;
+    }
+
+    public void setSaleorderLinenumber(String saleorderLinenumber) {
+        this.saleorderLinenumber = saleorderLinenumber;
+    }
+
+    public String getSaleorderLinenumber() {
+        return saleorderLinenumber;
+    }
+
+    public void setProjectNo(String projectNo) {
+        this.projectNo = projectNo;
+    }
+
+    public String getProjectNo() {
+        return projectNo;
+    }
+
+    public String getSaleType() {
+        return saleType;
+    }
+
+    public void setSaleType(String saleType) {
+        this.saleType = saleType;
+    }
+
+    public void setMaterialId(Long materialId) {
+        this.materialId = materialId;
+    }
+
+    public Long getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialBomId(Long materialBomId) {
+        this.materialBomId = materialBomId;
+    }
+
+    public Long getMaterialBomId() {
+        return materialBomId;
+    }
+
+    public Long getProduceMaterialId() {
+        return produceMaterialId;
+    }
+
+    public void setProduceMaterialId(Long produceMaterialId) {
+        this.produceMaterialId = produceMaterialId;
+    }
+
+    public void setDispatchType(String dispatchType) {
+        this.dispatchType = dispatchType;
+    }
+
+    public String getDispatchType() {
+        return dispatchType;
+    }
+
+    public void setDispatchId(Long dispatchId) {
+        this.dispatchId = dispatchId;
+    }
+
+    public Long getDispatchId() {
+        return dispatchId;
+    }
+
+    public String getCabinetChannel() {
+        return cabinetChannel;
+    }
+
+    public void setCabinetChannel(String cabinetChannel) {
+        this.cabinetChannel = cabinetChannel;
+    }
+
+    public void setSaleAmount(BigDecimal saleAmount) {
+        this.saleAmount = saleAmount;
+    }
+
+    public BigDecimal getSaleAmount() {
+        return saleAmount;
+    }
+
+    public void setPlanAmount(BigDecimal planAmount) {
+        this.planAmount = planAmount;
+    }
+
+    public BigDecimal getPlanAmount() {
+        return planAmount;
+    }
+
+    public void setDispatchAmount(BigDecimal dispatchAmount) {
+        this.dispatchAmount = dispatchAmount;
+    }
+
+    public BigDecimal getDispatchAmount() {
+        return dispatchAmount;
+    }
+
+    public void setCompleteAmount(BigDecimal completeAmount) {
+        this.completeAmount = completeAmount;
+    }
+
+    public BigDecimal getCompleteAmount() {
+        return completeAmount;
+    }
+
+    public void setReleaseTime(Date releaseTime) {
+        this.releaseTime = releaseTime;
+    }
+
+    public Date getReleaseTime() {
+        return releaseTime;
+    }
+
+    public void setPlanBeginTime(Date planBeginTime) {
+        this.planBeginTime = planBeginTime;
+    }
+
+    public Date getPlanBeginTime() {
+        return planBeginTime;
+    }
+
+    public void setPlanEndTime(Date planEndTime) {
+        this.planEndTime = planEndTime;
+    }
+
+    public Date getPlanEndTime() {
+        return planEndTime;
+    }
+
+    public void setRealBeginTime(Date realBeginTime) {
+        this.realBeginTime = realBeginTime;
+    }
+
+    public Date getRealBeginTime() {
+        return realBeginTime;
+    }
+
+    public void setRealEndTime(Date realEndTime) {
+        this.realEndTime = realEndTime;
+    }
+
+    public Date getRealEndTime() {
+        return realEndTime;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setStockLockFlag(String stockLockFlag) {
+        this.stockLockFlag = stockLockFlag;
+    }
+
+    public String getStockLockFlag() {
+        return stockLockFlag;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+
+    public String getMaterialSpec() {
+        return materialSpec;
+    }
+
+    public void setMaterialSpec(String materialSpec) {
+        this.materialSpec = materialSpec;
+    }
+
+    public String getProduceMaterialCode() {
+        return produceMaterialCode;
+    }
+
+    public void setProduceMaterialCode(String produceMaterialCode) {
+        this.produceMaterialCode = produceMaterialCode;
+    }
+
+    public String getProduceMaterialName() {
+        return produceMaterialName;
+    }
+
+    public void setProduceMaterialName(String produceMaterialName) {
+        this.produceMaterialName = produceMaterialName;
+    }
+
+    public String getProduceMaterialSpec() {
+        return produceMaterialSpec;
+    }
+
+    public void setProduceMaterialSpec(String produceMaterialSpec) {
+        this.produceMaterialSpec = produceMaterialSpec;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("productOrderId", getProductOrderId())
+                .append("orderCode", getOrderCode())
+                .append("saleOrderId", getSaleOrderId())
+                .append("saleorderCode", getSaleorderCode())
+                .append("saleorderLinenumber", getSaleorderLinenumber())
+                .append("projectNo", getProjectNo())
+                .append("materialId", getMaterialId())
+                .append("materialBomId", getMaterialBomId())
+                .append("dispatchType", getDispatchType())
+                .append("dispatchId", getDispatchId())
+                .append("saleAmount", getSaleAmount())
+                .append("planAmount", getPlanAmount())
+                .append("dispatchAmount", getDispatchAmount())
+                .append("completeAmount", getCompleteAmount())
+                .append("releaseTime", getReleaseTime())
+                .append("planBeginTime", getPlanBeginTime())
+                .append("planEndTime", getPlanEndTime())
+                .append("realBeginTime", getRealBeginTime())
+                .append("realEndTime", getRealEndTime())
+                .append("orderStatus", getOrderStatus())
+                .append("stockLockFlag", getStockLockFlag())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

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

@@ -163,6 +163,7 @@ public class WmsProductInstock extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "结束时间;agv处理结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
+    private Date day;
 
     /** 同步ERP状态(0:失败,1成功) */
     @Excel(name = "同步ERP状态(0:失败,1成功)")
@@ -453,6 +454,13 @@ public class WmsProductInstock extends BaseEntity {
     public Date getEndTime() {
         return endTime;
     }
+    public void setDay(Date day) {
+        this.day = day;
+    }
+
+    public Date getDay() {
+        return day;
+    }
 
     public String getErpStatus() {
         return erpStatus;

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

@@ -101,4 +101,20 @@ public interface WmsBaseLocationMapper
     int selectAllProductLocation();
 
     int selectAllProductEmptyLocation();
+
+    int stockAmount();
+
+    int nostockAmount();
+
+    Integer selectFourthLocation();
+
+    Integer selectFourthNostockLocation();
+
+    int productstockAmount();
+
+    int noProductstockAmount();
+
+    Integer selectFourthFustockLocation();
+
+    Integer selectFourthNoFustockLocation();
 }

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

@@ -100,4 +100,8 @@ public interface WmsProductInstockMapper
     List<WmsProductInstock> selectWmsProductInstockJoinList(WmsProductInstock wmsProductInstock);
 
     List<WmsProductInstock> locationCount();
+
+    List<WmsProductInstock> productInInfo();
+
+    List<WmsProductInstock> productFirstInInfo();
 }

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

@@ -1,5 +1,6 @@
 package com.hw.wms.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import com.hw.wms.domain.WmsProductOutstock;
 import com.hw.wms.domain.WmsProductOutstockDetail;
@@ -145,4 +146,8 @@ public interface WmsProductOutstockMapper
     List<WmsProductOutstock> locationCount();
 
     List<WmsProductOutstockDetail> scheduleTask();
+
+    BigDecimal todayOutstockAmount();
+
+    BigDecimal monthOutstockAmount();
 }

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

@@ -157,4 +157,6 @@ public interface WmsProductStockMapper
     int selectTotalLocation();
 
     int selectOpplyLocation();
+
+    BigDecimal monthInstockAmount();
 }

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

@@ -3,8 +3,11 @@ package com.hw.wms.mapper;
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.hw.wms.domain.MesProductOrder;
 import com.hw.wms.domain.WmsProductInstock;
 import com.hw.wms.domain.WmsRawInstock;
+import com.hw.wms.domain.WmsRawOutstock;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 原材料入库记录Mapper接口
@@ -92,4 +95,16 @@ public interface WmsRawInstockMapper
 
 
     BigDecimal monthRawInAmount();
+
+    List<WmsRawOutstock> selectInAndOutInfo();
+
+    List<WmsRawOutstock> fourthInstockList();
+
+    List<WmsRawInstock> purchaseInfo();
+
+    List<MesProductOrder> bomInfo(@Param("dispatchId") int dispatchId);
+
+    List<WmsRawInstock> purchaseFirstInfo();
+
+    BigDecimal dayRawInAmount();
 }

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

@@ -2,6 +2,8 @@ package com.hw.wms.mapper;
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import com.hw.wms.domain.WmsProductInstock;
 import com.hw.wms.domain.WmsRawOutstock;
 import com.hw.wms.domain.WmsRawOutstockDetail;
 
@@ -160,4 +162,16 @@ public interface WmsRawOutstockMapper
     BigDecimal monthRawOutAmount();
 
     List<WmsRawOutstock> productPlan();
+
+    List<WmsRawOutstock> selectInAndOutInfo();
+
+    List<WmsRawOutstock> fourthOutstockList();
+
+    List<WmsProductInstock> productOutInfo();
+
+    List<WmsProductInstock> productFirstOutInfo();
+
+    BigDecimal dayRawInAmount();
+
+    BigDecimal dayRawOutAmount();
 }

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

@@ -300,7 +300,8 @@
         order by location_code
     </select>
     <select id="locationStatus" resultType="com.hw.wms.domain.WmsBaseLocation">
-        select * from wms_base_location
+        SELECT x.* FROM `hwjy-cloud`.wms_base_location x
+        where x.warehouse_id = 311
     </select>
     <select id="selectEmptyLocation" resultType="java.lang.Integer">
         select
@@ -329,6 +330,30 @@
     <select id="selectAllProductEmptyLocation" resultType="java.lang.Integer">
         SELECT x.* FROM `hwjy-cloud`.wms_base_location x where x.warehouse_id = 531
     </select>
+    <select id="stockAmount" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is not null and x.warehouse_id = 111
+    </select>
+    <select id="nostockAmount" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is null and x.warehouse_id = 111
+    </select>
+    <select id="selectFourthLocation" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is not null and x.warehouse_id = 411
+    </select>
+    <select id="selectFourthNostockLocation" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is null and x.warehouse_id = 411
+    </select>
+    <select id="productstockAmount" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is not null and x.warehouse_id = 131
+    </select>
+    <select id="noProductstockAmount" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is null and x.warehouse_id = 131
+    </select>
+    <select id="selectFourthFustockLocation" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is not null and x.warehouse_id = 412
+    </select>
+    <select id="selectFourthNoFustockLocation" resultType="java.lang.Integer">
+        SELECT count(1) FROM `hwjy-cloud`.wms_base_location x where x.container_code is null and x.warehouse_id = 412
+    </select>
 
 
 </mapper>

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

@@ -306,4 +306,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             apply_date > now() - interval 1 month
           and warehouse_id = 531
     </select>
+    <select id="productInInfo" resultType="com.hw.wms.domain.WmsProductInstock">
+        select
+            date_format(apply_date, '%Y-%m-%d 00:00:00') day,sum(instock_amount) instock_amount
+        from
+            `hwjy-cloud`.wms_product_instock
+        where
+            apply_date > now() - interval 7 day and warehouse_id = 431
+        group by
+            day
+    </select>
+    <select id="productFirstInInfo" resultType="com.hw.wms.domain.WmsProductInstock">
+        select
+            date_format(apply_date, '%Y-%m-%d 00:00:00') day,sum(instock_amount) instock_amount
+        from
+            `hwjy-cloud`.wms_product_instock
+        where
+            apply_date > now() - interval 7 day and warehouse_id = 131
+        group by
+            day
+    </select>
 </mapper>

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

@@ -413,6 +413,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="scheduleTask" resultType="com.hw.wms.domain.WmsProductOutstockDetail">
         SELECT x.* FROM `hwjy-cloud`.wms_product_outstock_detail x where x.begin_time > now() - interval 1 month
     </select>
+    <select id="todayOutstockAmount" resultType="java.math.BigDecimal">
+        select
+            ifnull(sum(outstock_qty),0) outstock_qty
+        from
+            wms_product_outstock
+        where
+            apply_date > now() - interval 24 hour
+          and warehouse_id = 231
+    </select>
+    <select id="monthOutstockAmount" resultType="java.math.BigDecimal">
+        select
+            ifnull(sum(outstock_qty),0) outstock_qty
+        from
+            wms_product_outstock
+        where
+            apply_date > now() - interval 1 month
+          and warehouse_id = 231
+    </select>
 
     <update id="auditWmsProductOutstockByTaskCode" parameterType="WmsProductOutstock">
         update wms_product_outstock

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

@@ -384,7 +384,7 @@
     </select>
     <select id="todayInstockAmount" resultType="java.math.BigDecimal">
         select
-            *
+            sum(instock_amount) instock_amount
         from
             `hwjy-cloud`.wms_product_instock
         where
@@ -402,6 +402,15 @@
         group by
             product_id
     </select>
+    <select id="monthInstockAmount" resultType="java.math.BigDecimal">
+        select
+            sum(instock_amount) instock_amount
+        from
+            `hwjy-cloud`.wms_product_instock
+        where
+            warehouse_id = 231
+          and end_time > now() - interval 1 month
+    </select>
 
 
     <!--select id="selectWmsProductStocksBySaleorder" parameterType="WmsProductStock" resultMap="WmsProductStockResult">

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

@@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           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 sum(instock_amount) inStock from wms_raw_instock  where  DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' ) and warehouse_id = 311
     </select>
     <select id="locationStatus" resultType="com.hw.wms.domain.WmsBaseLocation">
         select * from wms_base_location
@@ -252,6 +252,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by
             warehouse_id
     </select>
+    <select id="selectInAndOutInfo" resultType="com.hw.wms.domain.WmsRawOutstock">
+        SELECT x.warehouse_id,sum(x.instock_amount) outstock_amount FROM `hwjy-cloud`.wms_raw_instock x where
+            (x.warehouse_id = 111
+                or x.warehouse_id = 132) and DATE(x.apply_date) = curdate() group by x.warehouse_id
+    </select>
+    <select id="fourthInstockList" resultType="com.hw.wms.domain.WmsRawOutstock">
+        SELECT x.warehouse_id,sum(x.instock_amount) outstock_amount FROM `hwjy-cloud`.wms_raw_instock x where
+            x.warehouse_id = 431
+                 and DATE(x.apply_date) = curdate()
+    </select>
+    <select id="purchaseInfo" resultType="com.hw.wms.domain.WmsRawInstock">
+        select
+            a.*,b.material_name
+        from
+            wms_raw_instock a left join mes_base_material_info b on a.material_id = b.material_id
+        where
+            a.warehouse_id = 111
+          and a.apply_date > now() - interval 1 month
+          and a.instock_type = '1'
+    </select>
+    <select id="bomInfo" resultType="com.hw.wms.domain.MesProductOrder">
+        select
+            x.*,a.material_name
+        from
+            `hwjy-cloud`.mes_product_order x
+                left join mes_base_material_info a on
+                x.material_id = a.material_id
+        where
+            X.dispatch_id = #{dispatchId}
+          and X.sale_type = 1 and X.create_time > now() - interval 1 MONTH
+    </select>
+    <select id="purchaseFirstInfo" resultType="com.hw.wms.domain.WmsRawInstock">
+        select
+            a.*,b.material_name
+        from
+            wms_raw_instock a left join mes_base_material_info b on a.material_id = b.material_id
+        where
+            a.warehouse_id = 411
+          and a.apply_date > now() - interval 1 month
+          and a.instock_type = '1'
+    </select>
+    <select id="dayRawInAmount" resultType="java.math.BigDecimal">
+        select
+            sum(instock_amount) inStock
+        from
+            wms_raw_instock
+        where
+            DATE_FORMAT( apply_date, '%Y%m%d' ) = DATE_FORMAT( CURDATE( ) , '%Y%m%d' ) and warehouse_id = 311
+    </select>
 
 
 </mapper>

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

@@ -396,7 +396,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from
             wms_raw_outstock
         where
-            DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+            DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' ) and warehouse_id = 311
     </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
@@ -411,5 +411,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             apply_date > now() - interval 1 month
           and warehouse_id = 512
     </select>
+    <select id="selectInAndOutInfo" resultType="com.hw.wms.domain.WmsRawOutstock">
+        select
+            x.warehouse_id ,sum(x.outstock_amount) outstock_amount
+        from
+            `hwjy-cloud`.wms_raw_outstock x
+        where
+            (x.warehouse_id = 111
+                or x.warehouse_id = 132)
+          and DATE(x.apply_date) = curdate() group by x.warehouse_id
+    </select>
+    <select id="fourthOutstockList" resultType="com.hw.wms.domain.WmsRawOutstock">
+        select
+            x.warehouse_id ,sum(x.outstock_amount) outstock_amount
+        from
+            `hwjy-cloud`.wms_raw_outstock x
+        where
+            (x.warehouse_id = 411
+                or x.warehouse_id = 412)
+          and DATE(x.apply_date) = curdate() group by x.warehouse_id
+    </select>
+    <select id="productOutInfo" resultType="com.hw.wms.domain.WmsProductInstock">
+        select
+            date_format(apply_date, '%Y-%m-%d 00:00:00') day,sum(outstock_qty) instock_amount
+        from
+            `hwjy-cloud`.wms_product_outstock
+        where
+            apply_date > now() - interval 7 day and warehouse_id = 431
+        group by
+            day
+    </select>
+    <select id="productFirstOutInfo" resultType="com.hw.wms.domain.WmsProductInstock">
+        select
+            date_format(apply_date, '%Y-%m-%d 00:00:00') day,sum(outstock_qty) instock_amount
+        from
+            `hwjy-cloud`.wms_product_outstock
+        where
+            apply_date > now() - interval 7 day and warehouse_id = 131
+        group by
+            day
+    </select>
+    <select id="dayRawInAmount" resultType="java.math.BigDecimal">
+
+    </select>
+    <select id="dayRawOutAmount" 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' ) and warehouse_id = 311
+    </select>
 
 </mapper>