change - 吸附内胆数据监控平台产量、库存统计

productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java

@@ -98,7 +98,7 @@ public class AdsorptionTankController {
     @GetMapping("/getMaterialStoreJson")
     @ResponseBody
     public String getMesMaterialStoreStatisticsJson(){
-        List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001");
+        List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1001");
         return JSONArray.toJSONString(mesMaterialStoreStatisticsList);
     }
 

productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.java

@@ -20,11 +20,11 @@ import java.io.Serializable;
 public class MesMaterialProductionStatistics implements Serializable {
 
     /** 物料名称 */
-    @TableField("materialname")
+    @TableField("name")
     private String xValue;
 
     /** 产量数 */
-    @TableField("productionamount")
+    @TableField("value")
     private String yValue;
 
     /** 工位编号 */

productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.java

@@ -20,15 +20,15 @@ import java.io.Serializable;
 public class MesMaterialStoreStatistics implements Serializable {
 
     /** 物料名称 */
-    @TableField("MATERIALNAME")
+    @TableField("materialName")
     private String materialName;
 
     /** 内胆库库存 */
-    @TableField("LINERSTOREAMOUNT")
+    @TableField("lineStoreAmount")
     private String lineStoreAmount;
 
     /** 箱壳库库存 */
-    @TableField("HULLSTOREAMOUNT")
+    @TableField("hullStoreAmount")
     private String hullStoreAmount;
 
     /** 工位编号 */

productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java

@@ -2,9 +2,14 @@ package com.productionboard.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics;
+import com.productionboard.entity.MesProduction.MesTeamStatistics;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author WenJY
  * @date 2022年06月09日 17:02
@@ -12,4 +17,7 @@ import org.springframework.stereotype.Repository;
 @Mapper
 @Repository
 public interface MesMaterialProductionStatisticsMapper extends BaseMapper<MesMaterialProductionStatistics> {
+
+    @Select("select * from table ( absorb_xfnd_xhcl(#{in_id}) )")
+    List<MesMaterialProductionStatistics> getMesMaterialProductionStatisticsList(@Param("in_id") Integer in_id);
 }

productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java

@@ -2,9 +2,14 @@ package com.productionboard.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics;
+import com.productionboard.entity.MesProduction.MesTeamStatistics;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * MES物料库存统计
  * @author WenJY
@@ -13,4 +18,14 @@ import org.springframework.stereotype.Repository;
 @Mapper
 @Repository
 public interface MesMaterialStoreStatisticsMapper extends BaseMapper<MesMaterialStoreStatistics>{
+
+    /**
+     * 吸附内胆库存统计
+     * @author WenJY
+     * @date 2022-10-01 17:27
+     * @param in_id
+     * @return java.util.List<com.productionboard.entity.MesProduction.MesTeamStatistics>
+     */
+    @Select("select materialName,LINERSTOREAMOUNT as lineStoreAmount,hullStoreAmount from table ( scada_absorb_kctj(#{in_id}) )")
+    List<MesMaterialStoreStatistics> getAdsorptionTankStoreStatistics(@Param("in_id") Integer in_id);
 }

productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java

@@ -19,6 +19,13 @@ import java.util.List;
 @Repository
 public interface MesTeamStatisticsMapper extends BaseMapper<MesTeamStatistics> {
 
+    /**
+     * 吸附内胆班组统计
+     * @author WenJY
+     * @date 2022-10-01 17:27
+     * @param in_id
+     * @return java.util.List<com.productionboard.entity.MesProduction.MesTeamStatistics>
+     */
     @Select("select * from table ( scada_xfnd_bztj(#{in_id}) )")
     List<MesTeamStatistics> getAdsorptionTankTeamStatistics(@Param("in_id") Integer in_id);
 }

productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -46,7 +47,16 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
      */
     @Override
     public List<MesTeamStatistics> getMesTeamStatisticsList(String locationNumber) {
-        List<MesTeamStatistics> adsorptionTankTeamStatistics = teamStatisticsMapper.getAdsorptionTankTeamStatistics(this.in_id);
+        List<MesTeamStatistics> adsorptionTankTeamStatistics = new ArrayList<>();
+        switch (locationNumber) {
+            case "1001":
+                adsorptionTankTeamStatistics = teamStatisticsMapper.getAdsorptionTankTeamStatistics(this.in_id);
+                break;
+            case "1003":
+                break;
+            default:
+                break;
+        }
         return adsorptionTankTeamStatistics;
     }
 
@@ -75,9 +85,16 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
      */
     @Override
     public List<MesMaterialProductionStatistics> getMesMaterialProductionStatisticsList(String locationNumber) {
-        QueryWrapper<MesMaterialProductionStatistics> wrapper = new QueryWrapper<>();
-        wrapper.eq("POSIONID",locationNumber);
-        List<MesMaterialProductionStatistics> mesMaterialProductionStatistics = materialProductionStatisticsMapper.selectList(wrapper);
+        List<MesMaterialProductionStatistics> mesMaterialProductionStatistics = new ArrayList<>();
+        switch (locationNumber) {
+            case "1001":
+                mesMaterialProductionStatistics = materialProductionStatisticsMapper.getMesMaterialProductionStatisticsList(this.in_id);
+                break;
+            case "1003":
+                break;
+            default:
+                break;
+        }
         return mesMaterialProductionStatistics;
     }
 
@@ -90,9 +107,19 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
      */
     @Override
     public List<MesMaterialStoreStatistics> getMesMaterialStoreStatisticsList(String locationNumber) {
-        QueryWrapper<MesMaterialStoreStatistics> wrapper = new QueryWrapper<>();
-        wrapper.eq("POSIONID",locationNumber);
-        List<MesMaterialStoreStatistics> mesMaterialStoreStatistics = materialStoreStatisticsMapper.selectList(wrapper);
+
+        List<MesMaterialStoreStatistics> mesMaterialStoreStatistics = new ArrayList<>();
+
+        switch (locationNumber) {
+            case "1001":
+                mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics(this.in_id);
+                break;
+            case "1003":
+                break;
+            default:
+                break;
+        }
+
         return mesMaterialStoreStatistics;
     }
 

productionboard/target/classes/application.yml

@@ -13,3 +13,5 @@ mybatis-plus:
 
 server:
   port: 6069
+
+in_id: 1