From 577322e4c15aa5528ddc3148a30a04b506943c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E9=9B=AA=E4=BC=9F?= <maxw@mesnac.com>
Date: Thu, 21 Nov 2024 16:12:51 +0800
Subject: [PATCH] =?UTF-8?q?2,3,5=E6=A5=BC=E7=9C=8B=E6=9D=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=8A5=E6=A5=BC?=
 =?UTF-8?q?=E4=BB=93=E5=82=A8=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=8D=A0=E7=94=A8=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/board/domain/DmsRealtimeStatusHistory.java | 13 +++++++++++++
 .../mes/board/service/ThirdMesBorderService.java   |  2 --
 .../service/impl/ThirdMesBorderServiceImpl.java    |  6 +++---
 .../com/hw/mes/mapper/MesProductOrderMapper.java   |  2 ++
 .../resources/mapper/mes/MesProductOrderMapper.xml |  6 +++---
 .../board/controller/FifthWmsBorderController.java | 14 ++++++++++++++
 .../java/com/hw/wms/board/domain/RawAmount.java    | 13 +++++++++++++
 .../wms/board/service/FifthWmsBorderService.java   |  4 ++++
 .../wms/board/service/ThirdWmsBorderService.java   |  3 +++
 .../service/impl/FifthWmsBoardServiceImpl.java     | 13 +++++++++++++
 .../service/impl/SecondWmsBoardServiceImpl.java    |  8 ++++++--
 .../service/impl/ThirdWmsBorderServiceImpl.java    |  5 ++++-
 .../com/hw/wms/mapper/WmsBaseLocationMapper.java   |  4 ++++
 .../hw/wms/mapper/WmsProductOutstockMapper.java    |  2 ++
 .../resources/mapper/wms/WmsBaseLocationMapper.xml | 11 +++++++++++
 .../mapper/wms/WmsProductOutstockMapper.xml        |  6 ++++--
 16 files changed, 99 insertions(+), 13 deletions(-)
 create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/RawAmount.java

diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/domain/DmsRealtimeStatusHistory.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/domain/DmsRealtimeStatusHistory.java
index b7980eb..db7119c 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/domain/DmsRealtimeStatusHistory.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/domain/DmsRealtimeStatusHistory.java
@@ -45,7 +45,13 @@ public class DmsRealtimeStatusHistory implements Serializable {
     private Date syncTime;
     private Date hour;
     private Long timeCount;
+    public Long getTimeCount() {
+        return timeCount;
+    }
 
+    public void setTimeCount(Long timeCount) {
+        this.timeCount = timeCount;
+    }
 
     public Long getHistoryId() {
         return historyId;
@@ -118,6 +124,13 @@ public class DmsRealtimeStatusHistory implements Serializable {
     public void setSyncTime(Date syncTime) {
         this.syncTime = syncTime;
     }
+    public Date getHour() {
+        return hour;
+    }
+
+    public void setHour(Date hour) {
+        this.hour = hour;
+    }
 
 }
 
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java
index fd299bb..9daabc6 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java
@@ -1,11 +1,9 @@
 package com.hw.mes.board.service;
 
-import com.hw.common.core.web.domain.AjaxResult;
 import com.hw.mes.board.domain.RawAmount;
 import com.hw.mes.board.domain.RecordIotenvInstant;
 import com.hw.mes.domain.MesProductOrder;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java
index dcdcdb7..5dbea4d 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java
@@ -5,14 +5,13 @@ import com.hw.mes.board.domain.RecordIotenvInstant;
 import com.hw.mes.board.service.ThirdMesBorderService;
 import com.hw.mes.domain.MesProductOrder;
 import com.hw.mes.mapper.MesProductOrderMapper;
-import com.hw.wms.api.domain.vo.WmsRawStockVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
+@Service
 public class ThirdMesBorderServiceImpl implements ThirdMesBorderService {
     @Autowired
     private MesProductOrderMapper mesProductOrderMapper;
@@ -39,6 +38,7 @@ public class ThirdMesBorderServiceImpl implements ThirdMesBorderService {
                 rawAmount.setInStock(map.getInStock());
                 if (map.getMaterialId().equals(decimalMap.getMaterialId())){
                     rawAmount.setOutStock(decimalMap.getOutStock());
+                    rawAmounts.add(rawAmount);
                 }
             }
         }
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java
index 424dde6..3c1cb85 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java
@@ -9,6 +9,7 @@ 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.MesProductOrder;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 生产工单Mapper接口
@@ -16,6 +17,7 @@ import com.hw.mes.domain.MesProductOrder;
  * @author Yinq
  * @date 2024-02-20
  */
+@Mapper
 public interface MesProductOrderMapper
 {
     /**
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml
index 9b6d70c..17bdc59 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml
@@ -416,19 +416,19 @@
             wms_product_instock
         where
             begin_time > now() -interval 7 day and warehouse_id = 231
-        group by hour order by hour desc
+        group by day order by day desc
     </select>
     <select id="dustAnalysis" resultType="com.hw.mes.board.domain.RecordIotenvInstant">
         SELECT x.* FROM `hwjy-cloud`.record_iotenv_instant x order by x.collectTime desc limit 10
     </select>
     <select id="deviceTimeCount" resultType="com.hw.mes.board.domain.DmsRealtimeStatusHistory">
         select
-            DATE_FORMAT(sync_time , '%Y-%m-%d %H:00:00') as hour,count(1)*10 timeCount
+            DATE_FORMAT(sync_time , '%Y-%m-%d %H:00:00') hour,count(1)*10 timeCount
         from
             dms_realtime_status_history
         where
             sync_time > now() - interval 7 hour
-          and status_value = true
+          and status_value = 'True'
           and status_name = '烘干机风机状态'
         group by hour
 
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java
index 13606d5..b3c55da 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java
@@ -29,6 +29,20 @@ public class FifthWmsBorderController {
     public AjaxResult fifthPanake(){
         return AjaxResult.success(fifthWmsBorderService.fifthPanake());
     }
+    /**
+     * 成品库可用库存占比
+     */
+    @GetMapping("/locationPercentage")
+    public AjaxResult locationPercentage(){
+        return AjaxResult.success(fifthWmsBorderService.locationPercentage());
+    }
+    /**
+     * 调度任务
+     */
+    @GetMapping("scheduleTask")
+    public AjaxResult scheduleTask(){
+        return AjaxResult.success(fifthWmsBorderService.scheduleTask());
+    }
 
 
 }
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/RawAmount.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/RawAmount.java
new file mode 100644
index 0000000..405d4ea
--- /dev/null
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/RawAmount.java
@@ -0,0 +1,13 @@
+package com.hw.wms.board.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class RawAmount {
+    private String materialId;
+    private BigDecimal inStock;
+    private BigDecimal outStock;
+    private String week;
+}
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java
index 9320815..4245faa 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java
@@ -15,4 +15,8 @@ public interface FifthWmsBorderService {
     Map locationCount();
 
     Map fifthPanake();
+
+    BigDecimal locationPercentage();
+
+    List<WmsProductOutstockDetail> scheduleTask();
 }
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/ThirdWmsBorderService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/ThirdWmsBorderService.java
index 712e5d5..3cf3bb2 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/ThirdWmsBorderService.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/ThirdWmsBorderService.java
@@ -1,5 +1,6 @@
 package com.hw.wms.board.service;
 
+import com.hw.wms.board.domain.RawAmount;
 import com.hw.wms.domain.WmsBaseLocation;
 import com.hw.wms.domain.WmsRawOutstock;
 
@@ -12,4 +13,6 @@ public interface ThirdWmsBorderService {
     List<WmsBaseLocation> locationStatus();
 
     List<WmsRawOutstock> productPlan();
+
+
 }
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java
index cec2f26..fd73f01 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java
@@ -31,6 +31,11 @@ public class FifthWmsBoardServiceImpl implements FifthWmsBorderService {
     private WmsBaseLocationMapper wmsBaseLocationMapper;
 
 
+    @Override
+    public List<WmsProductOutstockDetail> scheduleTask() {
+        return wmsProductOutstockMapper.scheduleTask();
+    }
+
     @Override
     public Map locationCount() {
         HashMap map = new HashMap<>();
@@ -52,6 +57,14 @@ public class FifthWmsBoardServiceImpl implements FifthWmsBorderService {
         return map;
     }
 
+    @Override
+    public BigDecimal locationPercentage() {
+        int allProductLocation = wmsBaseLocationMapper.selectAllProductLocation();
+        int productEmptyLocation = wmsBaseLocationMapper.selectAllProductEmptyLocation();
+        BigDecimal decimal = new BigDecimal(productEmptyLocation).divide(new BigDecimal(allProductLocation), 2, BigDecimal.ROUND_HALF_UP);
+        return decimal;
+    }
+
     @Override
     public Map fifthPanake() {
         List<WmsRawStock> wmsRawStocks = wmsRawStockMapper.selectRawLocationPercentage();
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java
index d801a8e..e240b80 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java
@@ -52,8 +52,12 @@ public class SecondWmsBoardServiceImpl implements SecondWmsBorderService {
         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());
+            if (map != null&&map.keySet().size()>0) {
+                WmsProductOutstock wmsProductOutstock = map.get(instock.getProductId()).get(0);
+                instock.setOutStockAmount(wmsProductOutstock.getOutstockQty());
+            }else {
+                instock.setOutStockAmount(new BigDecimal(0));
+            }
         }
         return instocks;
     }
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java
index 70f1762..91e3e30 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.hw.wms.board.service.impl;
 
+import com.hw.wms.board.domain.RawAmount;
 import com.hw.wms.board.service.ThirdWmsBorderService;
 import com.hw.wms.domain.WmsBaseLocation;
 import com.hw.wms.domain.WmsRawOutstock;
@@ -7,12 +8,13 @@ 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 org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+@Service
 public class ThirdWmsBorderServiceImpl implements ThirdWmsBorderService {
     @Autowired
     private WmsRawInstockMapper wmsRawInstockMapper;
@@ -31,6 +33,7 @@ public class ThirdWmsBorderServiceImpl implements ThirdWmsBorderService {
         return hashMap;
     }
 
+
     @Override
     public List<WmsRawOutstock> productPlan() {
         return wmsRawOutstockMapper.productPlan();
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java
index 15feba8..632367e 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java
@@ -97,4 +97,8 @@ public interface WmsBaseLocationMapper
     int selectAllLocation();
 
     List<WmsBaseLocation> locationStatus();
+
+    int selectAllProductLocation();
+
+    int selectAllProductEmptyLocation();
 }
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java
index af4356d..0350250 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java
@@ -143,4 +143,6 @@ public interface WmsProductOutstockMapper
     WmsProductOutstock selectGetProductOutstockAuditByProductOutstockId(Long productOutstockId);
 
     List<WmsProductOutstock> locationCount();
+
+    List<WmsProductOutstockDetail> scheduleTask();
 }
diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml
index 492469a..e65748c 100644
--- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml
+++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml
@@ -318,6 +318,17 @@
         where
             warehouse_id = 512
     </select>
+    <select id="selectAllProductLocation" resultType="java.lang.Integer">
+        select
+            count(1)
+        from
+            `hwjy-cloud`.wms_base_location
+        where
+            warehouse_id = 531
+    </select>
+    <select id="selectAllProductEmptyLocation" resultType="java.lang.Integer">
+        SELECT x.* FROM `hwjy-cloud`.wms_base_location x where x.warehouse_id = 531
+    </select>
 
 
 </mapper>
diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml
index 565238e..42e29d5 100644
--- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml
+++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml
@@ -400,14 +400,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="locationCount" resultType="com.hw.wms.domain.WmsProductOutstock">
         select
-            warehouse_id warehouse_id ,
-            sum(outstock_qty) outstock_qty
+            ifnull(sum(outstock_qty),0) outstock_qty
         from
             wms_product_outstock
         where
             apply_date > now() - interval 1 month
           and warehouse_id = 531
     </select>
+    <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>
 
     <update id="auditWmsProductOutstockByTaskCode" parameterType="WmsProductOutstock">
         update wms_product_outstock