change - 铝内胆成型线

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

@@ -146,7 +146,7 @@ public class AluminumLinerkController {
     @ResponseBody
     public String getInventoryStatistics() {
         List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList =
-                iMesProductionDataService.getMesMaterialStoreStatisticsList("L001");
+                iMesProductionDataService.getMesMaterialStoreStatisticsList("1001");
         return JSONArray.toJSONString(mesMaterialStoreStatisticsList);
 
     }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.productionboard.entity.MesProduction.DeviceFault;
 import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * MES物料库存统计
  * @author WenJY
@@ -14,4 +17,8 @@ import org.springframework.stereotype.Repository;
 @Mapper
 @Repository
 public interface DeviceFaultMapper extends BaseMapper<DeviceFault>{
+
+    //select * from table ( scada_adsorb_fault(#{in_id}) ),DeviceFault
+    @Select("select NAME as STATION,VALUE from table ( scada_adsorb_fault(#{in_id}) )")
+    List<DeviceFault> selectScadaAdsorbFault(int in_id);
 }

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

@@ -162,7 +162,7 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
     public List<DeviceFault> selectDeviceFaultByType(String type) {
         QueryWrapper<DeviceFault> wrapper = new QueryWrapper<>();
         wrapper.eq("TYPE",type);
-        return deviceFaultMapper.selectList(wrapper);
+        return deviceFaultMapper.selectScadaAdsorbFault(this.in_id);
     }
 
     @Override

productionboard/target/classes/static/js/aluminumLiner/index.js

@@ -42,7 +42,7 @@ $(() => {
             console.log(res)
 
             Res.data=res.map(val => {
-                return [val.spe,val.aq,val.oq,val.cha,val.round,]
+                return [val.spe,val.oq,val.aq,val.cha,val.round,]
             })
             Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度']
             console.log(Res)